aboutsummaryrefslogtreecommitdiff
path: root/applets
diff options
context:
space:
mode:
authorGravatar Rob Landley <rob@landley.net>2006-04-27 23:34:46 +0000
committerGravatar Rob Landley <rob@landley.net>2006-04-27 23:34:46 +0000
commit7e21d5f6b1bdac9c20139e8bef82b17559e548a0 (patch)
tree08c1b12a37d2ef74b4471e154fe4227d3b6ae917 /applets
parentd5b9428bb6e9d7524f6ef24868ce6394ade08255 (diff)
downloadbusybox-7e21d5f6b1bdac9c20139e8bef82b17559e548a0.tar.gz
busybox-7e21d5f6b1bdac9c20139e8bef82b17559e548a0.tar.bz2
Patch from Dennis Vlasenko to add the option to compress help text.
Diffstat (limited to 'applets')
-rw-r--r--applets/applets.c84
1 files changed, 61 insertions, 23 deletions
diff --git a/applets/applets.c b/applets/applets.c
index 77e4fdbfe..387ddce84 100644
--- a/applets/applets.c
+++ b/applets/applets.c
@@ -32,24 +32,20 @@
#include <assert.h>
#include "busybox.h"
-#if ENABLE_SHOW_USAGE
-const char usage_messages[] =
-
+#if ENABLE_SHOW_USAGE && !ENABLE_FEATURE_COMPRESS_USAGE
+static const char usage_messages[] =
#define MAKE_USAGE
#include "usage.h"
-
#include "applets.h"
-
;
-
#undef MAKE_USAGE
#endif /* ENABLE_SHOW_USAGE */
+
#undef APPLET
#undef APPLET_NOUSAGE
#undef PROTOTYPES
#include "applets.h"
-
static struct BB_applet *applet_using;
/* The -1 arises because of the {0,NULL,0,-1} entry above. */
@@ -405,27 +401,69 @@ static void check_suid (struct BB_applet *applet)
+#if ENABLE_FEATURE_COMPRESS_USAGE
+#include "usage_compressed.h"
+#include "unarchive.h"
-void bb_show_usage (void)
+static const char *unpack_usage_messages(void)
{
-#if ENABLE_SHOW_USAGE
- const char *format_string;
- const char *usage_string = usage_messages;
- int i;
-
- for (i = applet_using - applets; i > 0;) {
- if (!*usage_string++) {
- --i;
+ int input[2], output[2], pid;
+ char *buf;
+
+ if(pipe(input) < 0 || pipe(output) < 0)
+ exit(1);
+
+ pid = fork();
+ switch (pid) {
+ case -1: /* error */
+ exit(1);
+ case 0: /* child */
+ close(input[1]);
+ close(output[0]);
+ uncompressStream(input[0], output[1]);
+ exit(0);
}
- }
+ /* parent */
+
+ close(input[0]);
+ close(output[1]);
+ pid = fork();
+ switch (pid) {
+ case -1: /* error */
+ exit(1);
+ case 0: /* child */
+ bb_full_write(input[1], packed_usage, sizeof(packed_usage));
+ exit(0);
+ }
+ /* parent */
+ close(input[1]);
- format_string = "%s\n\nUsage: %s %s\n\n";
- if (*usage_string == '\b')
- format_string = "%s\n\nNo help available.\n\n";
- fprintf (stderr, format_string, bb_msg_full_version, applet_using->name,
- usage_string);
-#endif /* ENABLE_SHOW_USAGE */
+ buf = xmalloc(SIZEOF_usage_messages);
+ bb_full_read(output[0], buf, SIZEOF_usage_messages);
+ return buf;
+}
+
+#else
+#define unpack_usage_messages() usage_messages;
+#endif /* ENABLE_FEATURE_COMPRESS_USAGE */
+
+void bb_show_usage (void)
+{
+ if (ENABLE_SHOW_USAGE) {
+ const char *format_string;
+ const char *usage_string = unpack_usage_messages();
+ int i;
+
+ for (i = applet_using - applets; i > 0;)
+ if (!*usage_string++) --i;
+
+ format_string = "%s\n\nUsage: %s %s\n\n";
+ if (*usage_string == '\b')
+ format_string = "%s\n\nNo help available.\n\n";
+ fprintf (stderr, format_string, bb_msg_full_version,
+ applet_using->name, usage_string);
+ }
exit (bb_default_error_retval);
}