diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2010-09-14 14:09:23 +1000 |
|---|---|---|
| committer | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2010-09-14 14:09:23 +1000 |
| commit | ee7c9b2c212fc7db80cce945e094fc2601092283 (patch) | |
| tree | 24e51b27dbc3e9ab0b00c5839a6822604c02187c /include | |
| parent | f28d4b20905b5b1f52ffa52060a0c6caf4b055ba (diff) | |
| parent | 99862cbfad9c36b4f8f4378c3a7a9f077c239f20 (diff) | |
| download | busybox-w32-ee7c9b2c212fc7db80cce945e094fc2601092283.tar.gz busybox-w32-ee7c9b2c212fc7db80cce945e094fc2601092283.tar.bz2 busybox-w32-ee7c9b2c212fc7db80cce945e094fc2601092283.zip | |
Merge remote branch 'origin/master'
Diffstat (limited to 'include')
| -rw-r--r-- | include/applets.src.h | 1 | ||||
| -rw-r--r-- | include/libbb.h | 4 | ||||
| -rw-r--r-- | include/usage.src.h | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/include/applets.src.h b/include/applets.src.h index 195598fee..0e4f966de 100644 --- a/include/applets.src.h +++ b/include/applets.src.h | |||
| @@ -75,7 +75,6 @@ IF_ARPING(APPLET(arping, _BB_DIR_USR_BIN, _BB_SUID_DROP)) | |||
| 75 | 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)) |
| 76 | 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)) |
| 77 | IF_BBCONFIG(APPLET(bbconfig, _BB_DIR_BIN, _BB_SUID_DROP)) | 77 | IF_BBCONFIG(APPLET(bbconfig, _BB_DIR_BIN, _BB_SUID_DROP)) |
| 78 | //IF_BBSH(APPLET(bbsh, _BB_DIR_BIN, _BB_SUID_DROP)) | ||
| 79 | IF_BEEP(APPLET(beep, _BB_DIR_USR_BIN, _BB_SUID_DROP)) | 78 | IF_BEEP(APPLET(beep, _BB_DIR_USR_BIN, _BB_SUID_DROP)) |
| 80 | IF_BLKID(APPLET(blkid, _BB_DIR_SBIN, _BB_SUID_DROP)) | 79 | IF_BLKID(APPLET(blkid, _BB_DIR_SBIN, _BB_SUID_DROP)) |
| 81 | IF_BOOTCHARTD(APPLET(bootchartd, _BB_DIR_SBIN, _BB_SUID_DROP)) | 80 | IF_BOOTCHARTD(APPLET(bootchartd, _BB_DIR_SBIN, _BB_SUID_DROP)) |
diff --git a/include/libbb.h b/include/libbb.h index 75f12467e..31e733d77 100644 --- a/include/libbb.h +++ b/include/libbb.h | |||
| @@ -897,9 +897,9 @@ int spawn_and_wait(char **argv) FAST_FUNC; | |||
| 897 | struct nofork_save_area { | 897 | struct nofork_save_area { |
| 898 | jmp_buf die_jmp; | 898 | jmp_buf die_jmp; |
| 899 | const char *applet_name; | 899 | const char *applet_name; |
| 900 | int xfunc_error_retval; | ||
| 901 | uint32_t option_mask32; | 900 | uint32_t option_mask32; |
| 902 | int die_sleep; | 901 | int die_sleep; |
| 902 | uint8_t xfunc_error_retval; | ||
| 903 | smallint saved; | 903 | smallint saved; |
| 904 | }; | 904 | }; |
| 905 | void save_nofork_data(struct nofork_save_area *save) FAST_FUNC; | 905 | void save_nofork_data(struct nofork_save_area *save) FAST_FUNC; |
| @@ -1010,7 +1010,7 @@ enum { | |||
| 1010 | extern const char *msg_eol; | 1010 | extern const char *msg_eol; |
| 1011 | extern smallint logmode; | 1011 | extern smallint logmode; |
| 1012 | extern int die_sleep; | 1012 | extern int die_sleep; |
| 1013 | extern int xfunc_error_retval; | 1013 | extern uint8_t xfunc_error_retval; |
| 1014 | extern jmp_buf die_jmp; | 1014 | extern jmp_buf die_jmp; |
| 1015 | extern void xfunc_die(void) NORETURN FAST_FUNC; | 1015 | extern void xfunc_die(void) NORETURN FAST_FUNC; |
| 1016 | extern void bb_show_usage(void) NORETURN FAST_FUNC; | 1016 | extern void bb_show_usage(void) NORETURN FAST_FUNC; |
diff --git a/include/usage.src.h b/include/usage.src.h index 0eff1b129..2866bdbba 100644 --- a/include/usage.src.h +++ b/include/usage.src.h | |||
| @@ -4544,7 +4544,7 @@ INSERT | |||
| 4544 | ) \ | 4544 | ) \ |
| 4545 | 4545 | ||
| 4546 | #define udhcpd_trivial_usage \ | 4546 | #define udhcpd_trivial_usage \ |
| 4547 | "[-fS]" IF_FEATURE_UDHCP_PORT(" [-P N]") " [configfile]" \ | 4547 | "[-fS]" IF_FEATURE_UDHCP_PORT(" [-P N]") " [CONFFILE]" \ |
| 4548 | 4548 | ||
| 4549 | #define udhcpd_full_usage "\n\n" \ | 4549 | #define udhcpd_full_usage "\n\n" \ |
| 4550 | "DHCP server\n" \ | 4550 | "DHCP server\n" \ |