diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2011-05-29 04:24:13 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2011-05-29 04:24:52 +0200 |
commit | 488dd7086925b83bb36568965558221e04d2cc91 (patch) | |
tree | 2c4ee47019880b24cb308eef3eb6f9fd211fbafb /docs | |
parent | 217a7f4bf95339a93a217c5806c5b9a48c0027d5 (diff) | |
download | busybox-w32-488dd7086925b83bb36568965558221e04d2cc91.tar.gz busybox-w32-488dd7086925b83bb36568965558221e04d2cc91.tar.bz2 busybox-w32-488dd7086925b83bb36568965558221e04d2cc91.zip |
fix !ENABLE_FEATURE_GETOPT_LONG build. Closes 3775
When compiling with !ENABLE_FEATURE_GETOPT_LONG, busybox still tries
to include getopt.h which is not available; for example with uClibc
when !UCLIBC_HAS_GETOPT_LONG. getopt.h is only required
for the _long set of functions.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'docs')
-rw-r--r-- | docs/style-guide.txt | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/docs/style-guide.txt b/docs/style-guide.txt index fdf6cfe4d..10ed893dc 100644 --- a/docs/style-guide.txt +++ b/docs/style-guide.txt | |||
@@ -679,11 +679,10 @@ line in the midst of your #includes, if you need to parse long options: | |||
679 | 679 | ||
680 | Then have long options defined: | 680 | Then have long options defined: |
681 | 681 | ||
682 | static const struct option <applet>_long_options[] = { | 682 | static const char <applet>_longopts[] ALIGN1 = |
683 | { "list", 0, NULL, 't' }, | 683 | "list\0" No_argument "t" |
684 | { "extract", 0, NULL, 'x' }, | 684 | "extract\0" No_argument "x" |
685 | { NULL, 0, NULL, 0 } | 685 | ; |
686 | }; | ||
687 | 686 | ||
688 | And a code block similar to the following near the top of your applet_main() | 687 | And a code block similar to the following near the top of your applet_main() |
689 | routine: | 688 | routine: |
@@ -691,7 +690,7 @@ routine: | |||
691 | char *str_b; | 690 | char *str_b; |
692 | 691 | ||
693 | opt_complementary = "cryptic_string"; | 692 | opt_complementary = "cryptic_string"; |
694 | applet_long_options = <applet>_long_options; /* if you have them */ | 693 | applet_long_options = <applet>_longopts; /* if you have them */ |
695 | opt = getopt32(argc, argv, "ab:c", &str_b); | 694 | opt = getopt32(argc, argv, "ab:c", &str_b); |
696 | if (opt & 1) { | 695 | if (opt & 1) { |
697 | handle_option_a(); | 696 | handle_option_a(); |