Merge remote branch 'origin/master'

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))
 IF_AWK(APPLET_NOEXEC(awk, awk, _BB_DIR_USR_BIN, _BB_SUID_DROP, awk))
 IF_BASENAME(APPLET_NOFORK(basename, basename, _BB_DIR_USR_BIN, _BB_SUID_DROP, basename))
 IF_BBCONFIG(APPLET(bbconfig, _BB_DIR_BIN, _BB_SUID_DROP))
-//IF_BBSH(APPLET(bbsh, _BB_DIR_BIN, _BB_SUID_DROP))
 IF_BEEP(APPLET(beep, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_BLKID(APPLET(blkid, _BB_DIR_SBIN, _BB_SUID_DROP))
 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;
 struct nofork_save_area {
         jmp_buf die_jmp;
         const char *applet_name;
-        int xfunc_error_retval;
         uint32_t option_mask32;
         int die_sleep;
+        uint8_t xfunc_error_retval;
         smallint saved;
 };
 void save_nofork_data(struct nofork_save_area *save) FAST_FUNC;
@@ -1010,7 +1010,7 @@ enum {
 extern const char *msg_eol;
 extern smallint logmode;
 extern int die_sleep;
-extern int xfunc_error_retval;
+extern uint8_t xfunc_error_retval;
 extern jmp_buf die_jmp;
 extern void xfunc_die(void) NORETURN FAST_FUNC;
 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
         ) \
 
 #define udhcpd_trivial_usage \
-       "[-fS]" IF_FEATURE_UDHCP_PORT(" [-P N]") " [configfile]" \
+       "[-fS]" IF_FEATURE_UDHCP_PORT(" [-P N]") " [CONFFILE]" \
 
 #define udhcpd_full_usage "\n\n" \
        "DHCP server\n" \