diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2014-09-18 00:47:05 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2014-09-18 00:47:05 +0200 |
commit | cd7a38a87d54f5421b379870ff866676f31923b2 (patch) | |
tree | ddc2a3e74dcbf1cd0486e01c4f0e6c48bb445988 /applets/applet_tables.c | |
parent | d0cdacafa98ec0e73e58c2e5a8ba9dded18006df (diff) | |
download | busybox-w32-cd7a38a87d54f5421b379870ff866676f31923b2.tar.gz busybox-w32-cd7a38a87d54f5421b379870ff866676f31923b2.tar.bz2 busybox-w32-cd7a38a87d54f5421b379870ff866676f31923b2.zip |
false: make "false --help" exit with 1
function old new delta
run_applet_no_and_exit 447 445 -2
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'applets/applet_tables.c')
-rw-r--r-- | applets/applet_tables.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/applets/applet_tables.c b/applets/applet_tables.c index 94b974e09..92bf1e447 100644 --- a/applets/applet_tables.c +++ b/applets/applet_tables.c | |||
@@ -14,6 +14,7 @@ | |||
14 | #include <string.h> | 14 | #include <string.h> |
15 | #include <stdio.h> | 15 | #include <stdio.h> |
16 | #include <unistd.h> | 16 | #include <unistd.h> |
17 | #include <ctype.h> | ||
17 | 18 | ||
18 | #undef ARRAY_SIZE | 19 | #undef ARRAY_SIZE |
19 | #define ARRAY_SIZE(x) ((unsigned)(sizeof(x) / sizeof((x)[0]))) | 20 | #define ARRAY_SIZE(x) ((unsigned)(sizeof(x) / sizeof((x)[0]))) |
@@ -49,6 +50,16 @@ static int cmp_name(const void *a, const void *b) | |||
49 | return strcmp(aa->name, bb->name); | 50 | return strcmp(aa->name, bb->name); |
50 | } | 51 | } |
51 | 52 | ||
53 | static int str_isalnum_(const char *s) | ||
54 | { | ||
55 | while (*s) { | ||
56 | if (!isalnum(*s) && *s != '_') | ||
57 | return 0; | ||
58 | s++; | ||
59 | } | ||
60 | return 1; | ||
61 | } | ||
62 | |||
52 | int main(int argc, char **argv) | 63 | int main(int argc, char **argv) |
53 | { | 64 | { |
54 | int i; | 65 | int i; |
@@ -94,6 +105,12 @@ int main(int argc, char **argv) | |||
94 | } | 105 | } |
95 | printf(";\n\n"); | 106 | printf(";\n\n"); |
96 | 107 | ||
108 | for (i = 0; i < NUM_APPLETS; i++) { | ||
109 | if (str_isalnum_(applets[i].name)) | ||
110 | printf("#define APPLET_NO_%s %d\n", applets[i].name, i); | ||
111 | } | ||
112 | printf("\n"); | ||
113 | |||
97 | printf("#ifndef SKIP_applet_main\n"); | 114 | printf("#ifndef SKIP_applet_main\n"); |
98 | printf("int (*const applet_main[])(int argc, char **argv) = {\n"); | 115 | printf("int (*const applet_main[])(int argc, char **argv) = {\n"); |
99 | for (i = 0; i < NUM_APPLETS; i++) { | 116 | for (i = 0; i < NUM_APPLETS; i++) { |