diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-07-16 14:31:34 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-07-16 14:31:34 +0200 |
| commit | 771f1995a99e63600a513f97ce35cbb9f6865138 (patch) | |
| tree | bcf36201ace3b73e8158fe3f248539bd155718dc /include | |
| parent | 29082231d0cb1a5b327de5d515b16f332d4dbdaf (diff) | |
| download | busybox-w32-771f1995a99e63600a513f97ce35cbb9f6865138.tar.gz busybox-w32-771f1995a99e63600a513f97ce35cbb9f6865138.tar.bz2 busybox-w32-771f1995a99e63600a513f97ce35cbb9f6865138.zip | |
ash: move config stuff into ash.c, no code chages
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/applets.src.h | 3 | ||||
| -rw-r--r-- | include/usage.src.h | 7 |
2 files changed, 0 insertions, 10 deletions
diff --git a/include/applets.src.h b/include/applets.src.h index 5d84597b0..6ca0c3230 100644 --- a/include/applets.src.h +++ b/include/applets.src.h | |||
| @@ -72,10 +72,8 @@ IF_ADJTIMEX(APPLET(adjtimex, _BB_DIR_SBIN, _BB_SUID_DROP)) | |||
| 72 | IF_AR(APPLET(ar, _BB_DIR_USR_BIN, _BB_SUID_DROP)) | 72 | IF_AR(APPLET(ar, _BB_DIR_USR_BIN, _BB_SUID_DROP)) |
| 73 | IF_ARP(APPLET(arp, _BB_DIR_SBIN, _BB_SUID_DROP)) | 73 | IF_ARP(APPLET(arp, _BB_DIR_SBIN, _BB_SUID_DROP)) |
| 74 | IF_ARPING(APPLET(arping, _BB_DIR_USR_BIN, _BB_SUID_DROP)) | 74 | IF_ARPING(APPLET(arping, _BB_DIR_USR_BIN, _BB_SUID_DROP)) |
| 75 | IF_ASH(APPLET(ash, _BB_DIR_BIN, _BB_SUID_DROP)) | ||
| 76 | IF_AWK(APPLET_NOEXEC(awk, awk, _BB_DIR_USR_BIN, _BB_SUID_DROP, awk)) | 75 | IF_AWK(APPLET_NOEXEC(awk, awk, _BB_DIR_USR_BIN, _BB_SUID_DROP, awk)) |
| 77 | IF_BASENAME(APPLET_NOFORK(basename, basename, _BB_DIR_USR_BIN, _BB_SUID_DROP, basename)) | 76 | IF_BASENAME(APPLET_NOFORK(basename, basename, _BB_DIR_USR_BIN, _BB_SUID_DROP, basename)) |
| 78 | IF_FEATURE_BASH_IS_ASH(APPLET_ODDNAME(bash, ash, _BB_DIR_BIN, _BB_SUID_DROP, bash)) | ||
| 79 | IF_BBCONFIG(APPLET(bbconfig, _BB_DIR_BIN, _BB_SUID_DROP)) | 77 | IF_BBCONFIG(APPLET(bbconfig, _BB_DIR_BIN, _BB_SUID_DROP)) |
| 80 | //IF_BBSH(APPLET(bbsh, _BB_DIR_BIN, _BB_SUID_DROP)) | 78 | //IF_BBSH(APPLET(bbsh, _BB_DIR_BIN, _BB_SUID_DROP)) |
| 81 | IF_BEEP(APPLET(beep, _BB_DIR_USR_BIN, _BB_SUID_DROP)) | 79 | IF_BEEP(APPLET(beep, _BB_DIR_USR_BIN, _BB_SUID_DROP)) |
| @@ -344,7 +342,6 @@ IF_SETLOGCONS(APPLET(setlogcons, _BB_DIR_USR_SBIN, _BB_SUID_DROP)) | |||
| 344 | IF_SETSEBOOL(APPLET(setsebool, _BB_DIR_USR_SBIN, _BB_SUID_DROP)) | 342 | IF_SETSEBOOL(APPLET(setsebool, _BB_DIR_USR_SBIN, _BB_SUID_DROP)) |
| 345 | IF_SETSID(APPLET(setsid, _BB_DIR_USR_BIN, _BB_SUID_DROP)) | 343 | IF_SETSID(APPLET(setsid, _BB_DIR_USR_BIN, _BB_SUID_DROP)) |
| 346 | IF_SETUIDGID(APPLET_ODDNAME(setuidgid, chpst, _BB_DIR_USR_BIN, _BB_SUID_DROP, setuidgid)) | 344 | IF_SETUIDGID(APPLET_ODDNAME(setuidgid, chpst, _BB_DIR_USR_BIN, _BB_SUID_DROP, setuidgid)) |
| 347 | IF_FEATURE_SH_IS_ASH(APPLET_ODDNAME(sh, ash, _BB_DIR_BIN, _BB_SUID_DROP, sh)) | ||
| 348 | IF_SHA1SUM(APPLET_ODDNAME(sha1sum, md5_sha1_sum, _BB_DIR_USR_BIN, _BB_SUID_DROP, sha1sum)) | 345 | IF_SHA1SUM(APPLET_ODDNAME(sha1sum, md5_sha1_sum, _BB_DIR_USR_BIN, _BB_SUID_DROP, sha1sum)) |
| 349 | IF_SHA256SUM(APPLET_ODDNAME(sha256sum, md5_sha1_sum, _BB_DIR_USR_BIN, _BB_SUID_DROP, sha256sum)) | 346 | IF_SHA256SUM(APPLET_ODDNAME(sha256sum, md5_sha1_sum, _BB_DIR_USR_BIN, _BB_SUID_DROP, sha256sum)) |
| 350 | IF_SHA512SUM(APPLET_ODDNAME(sha512sum, md5_sha1_sum, _BB_DIR_USR_BIN, _BB_SUID_DROP, sha512sum)) | 347 | IF_SHA512SUM(APPLET_ODDNAME(sha512sum, md5_sha1_sum, _BB_DIR_USR_BIN, _BB_SUID_DROP, sha512sum)) |
diff --git a/include/usage.src.h b/include/usage.src.h index b3396006f..46d64c135 100644 --- a/include/usage.src.h +++ b/include/usage.src.h | |||
| @@ -115,13 +115,6 @@ INSERT | |||
| 115 | "\n -s SRC_IP Sender IP address" \ | 115 | "\n -s SRC_IP Sender IP address" \ |
| 116 | "\n DST_IP Target IP address" \ | 116 | "\n DST_IP Target IP address" \ |
| 117 | 117 | ||
| 118 | #define sh_trivial_usage NOUSAGE_STR | ||
| 119 | #define sh_full_usage "" | ||
| 120 | #define ash_trivial_usage NOUSAGE_STR | ||
| 121 | #define ash_full_usage "" | ||
| 122 | #define bash_trivial_usage NOUSAGE_STR | ||
| 123 | #define bash_full_usage "" | ||
| 124 | |||
| 125 | #define awk_trivial_usage \ | 118 | #define awk_trivial_usage \ |
| 126 | "[OPTIONS] [AWK_PROGRAM] [FILE]..." | 119 | "[OPTIONS] [AWK_PROGRAM] [FILE]..." |
| 127 | #define awk_full_usage "\n\n" \ | 120 | #define awk_full_usage "\n\n" \ |