diff options
| -rw-r--r-- | applets/busybox.c | 4 | ||||
| -rw-r--r-- | applets/usage.c | 19 | ||||
| -rw-r--r-- | busybox.c | 4 | ||||
| -rw-r--r-- | busybox.h | 1 | ||||
| -rw-r--r-- | getopt.c | 16 | ||||
| -rw-r--r-- | include/busybox.h | 1 | ||||
| -rw-r--r-- | usage.c | 19 | ||||
| -rw-r--r-- | util-linux/getopt.c | 16 |
8 files changed, 44 insertions, 36 deletions
diff --git a/applets/busybox.c b/applets/busybox.c index d25ddc185..21b8a110e 100644 --- a/applets/busybox.c +++ b/applets/busybox.c @@ -110,7 +110,7 @@ const struct BB_applet applets[] = { {"fsck.minix", fsck_minix_main, _BB_DIR_SBIN, fsck_minix_usage}, #endif #ifdef BB_GETOPT - {"getopt", getopt_main, _BB_DIR_BIN}, + {"getopt", getopt_main, _BB_DIR_BIN, getopt_usage}, #endif #ifdef BB_GREP {"grep", grep_main, _BB_DIR_BIN, grep_usage}, @@ -245,7 +245,7 @@ const struct BB_applet applets[] = { {"reboot", reboot_main, _BB_DIR_SBIN, reboot_usage}, #endif #ifdef BB_RENICE - {"renice", renice_main, _BB_DIR_USR_BIN}, + {"renice", renice_main, _BB_DIR_USR_BIN, renice_usage}, #endif #ifdef BB_RESET {"reset", reset_main, _BB_DIR_USR_BIN, reset_usage}, diff --git a/applets/usage.c b/applets/usage.c index 11326432c..7e3ea8191 100644 --- a/applets/usage.c +++ b/applets/usage.c @@ -375,6 +375,24 @@ const char fsck_minix_usage[] = ; #endif +#if defined BB_GETOPT +const char getopt_usage[] = +"getopt [OPTIONS]...\n" +#ifndef BB_FEATURE_TRIVIAL_HELP +"Parse command options\n" +" -a, --alternative Allow long options starting with single -\n" +" -l, --longoptions=longopts Long options to be recognized\n" +" -n, --name=progname The name under which errors are reported\n" +" -o, --options=optstring Short options to be recognized\n" +" -q, --quiet Disable error reporting by getopt(3)\n" +" -Q, --quiet-output No normal output\n" +" -s, --shell=shell Set shell quoting conventions\n" +" -T, --test Test for getopt(1) version\n" +" -u, --unqote Do not quote the output\n" +#endif +; +#endif + #if defined BB_GREP const char grep_usage[] = "grep [-ihHnqvs] pattern [files...]\n" @@ -1472,3 +1490,4 @@ const char yes_usage[] = #endif ; #endif + @@ -110,7 +110,7 @@ const struct BB_applet applets[] = { {"fsck.minix", fsck_minix_main, _BB_DIR_SBIN, fsck_minix_usage}, #endif #ifdef BB_GETOPT - {"getopt", getopt_main, _BB_DIR_BIN}, + {"getopt", getopt_main, _BB_DIR_BIN, getopt_usage}, #endif #ifdef BB_GREP {"grep", grep_main, _BB_DIR_BIN, grep_usage}, @@ -245,7 +245,7 @@ const struct BB_applet applets[] = { {"reboot", reboot_main, _BB_DIR_SBIN, reboot_usage}, #endif #ifdef BB_RENICE - {"renice", renice_main, _BB_DIR_USR_BIN}, + {"renice", renice_main, _BB_DIR_USR_BIN, renice_usage}, #endif #ifdef BB_RESET {"reset", reset_main, _BB_DIR_USR_BIN, reset_usage}, @@ -257,6 +257,7 @@ extern const char find_usage[]; extern const char free_usage[]; extern const char freeramdisk_usage[]; extern const char fsck_minix_usage[]; +extern const char getopt_usage[]; extern const char grep_usage[]; extern const char gunzip_usage[]; extern const char gzip_usage[]; @@ -306,22 +306,6 @@ static struct option longopts[]= /* Stop scanning as soon as a non-option argument is found! */ static const char *shortopts="+ao:l:n:qQs:Tu"; -static const char getopt_usage[] = -"getopt [OPTIONS]...\n" -#ifndef BB_FEATURE_TRIVIAL_HELP -"Parse command options\n" -" -a, --alternative Allow long options starting with single -\n" -" -l, --longoptions=longopts Long options to be recognized\n" -" -n, --name=progname The name under which errors are reported\n" -" -o, --options=optstring Short options to be recognized\n" -" -q, --quiet Disable error reporting by getopt(3)\n" -" -Q, --quiet-output No normal output\n" -" -s, --shell=shell Set shell quoting conventions\n" -" -T, --test Test for getopt(1) version\n" -" -u, --unqote Do not quote the output\n" -#endif -; - int getopt_main(int argc, char *argv[]) { diff --git a/include/busybox.h b/include/busybox.h index 84d0ddad8..7f4d55f3d 100644 --- a/include/busybox.h +++ b/include/busybox.h @@ -257,6 +257,7 @@ extern const char find_usage[]; extern const char free_usage[]; extern const char freeramdisk_usage[]; extern const char fsck_minix_usage[]; +extern const char getopt_usage[]; extern const char grep_usage[]; extern const char gunzip_usage[]; extern const char gzip_usage[]; @@ -375,6 +375,24 @@ const char fsck_minix_usage[] = ; #endif +#if defined BB_GETOPT +const char getopt_usage[] = +"getopt [OPTIONS]...\n" +#ifndef BB_FEATURE_TRIVIAL_HELP +"Parse command options\n" +" -a, --alternative Allow long options starting with single -\n" +" -l, --longoptions=longopts Long options to be recognized\n" +" -n, --name=progname The name under which errors are reported\n" +" -o, --options=optstring Short options to be recognized\n" +" -q, --quiet Disable error reporting by getopt(3)\n" +" -Q, --quiet-output No normal output\n" +" -s, --shell=shell Set shell quoting conventions\n" +" -T, --test Test for getopt(1) version\n" +" -u, --unqote Do not quote the output\n" +#endif +; +#endif + #if defined BB_GREP const char grep_usage[] = "grep [-ihHnqvs] pattern [files...]\n" @@ -1472,3 +1490,4 @@ const char yes_usage[] = #endif ; #endif + diff --git a/util-linux/getopt.c b/util-linux/getopt.c index 919ae6c68..8c94bb4c1 100644 --- a/util-linux/getopt.c +++ b/util-linux/getopt.c @@ -306,22 +306,6 @@ static struct option longopts[]= /* Stop scanning as soon as a non-option argument is found! */ static const char *shortopts="+ao:l:n:qQs:Tu"; -static const char getopt_usage[] = -"getopt [OPTIONS]...\n" -#ifndef BB_FEATURE_TRIVIAL_HELP -"Parse command options\n" -" -a, --alternative Allow long options starting with single -\n" -" -l, --longoptions=longopts Long options to be recognized\n" -" -n, --name=progname The name under which errors are reported\n" -" -o, --options=optstring Short options to be recognized\n" -" -q, --quiet Disable error reporting by getopt(3)\n" -" -Q, --quiet-output No normal output\n" -" -s, --shell=shell Set shell quoting conventions\n" -" -T, --test Test for getopt(1) version\n" -" -u, --unqote Do not quote the output\n" -#endif -; - int getopt_main(int argc, char *argv[]) { |