new NOFORKs: pwdx,kill[all5],ttysize,realpath,readlink NOEXECs: date,resize

function                                             old     new   delta
run_nofork_applet                                    258     280     +22
readlink_main                                        112     123     +11
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 2/0 up/down: 33/0)               Total: 33 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

2 files changed, 6 insertions, 3 deletions

diff --git a/libbb/bb_pwd.c b/libbb/bb_pwd.c
index 4829b723a..dca0a150b 100644
--- a/libbb/bb_pwd.c
+++ b/libbb/bb_pwd.c
@@ -31,9 +31,9 @@ struct group* FAST_FUNC xgetgrnam(const char *name)
         return gr;
 }
 
-
 struct passwd* FAST_FUNC xgetpwuid(uid_t uid)
 {
+        /* Note: used in nofork applets (whoami), be careful not to leak anything */
         struct passwd *pw = getpwuid(uid);
         if (!pw)
                 bb_error_msg_and_die("unknown uid %u", (unsigned)uid);
@@ -50,6 +50,7 @@ struct group* FAST_FUNC xgetgrgid(gid_t gid)
 
 char* FAST_FUNC xuid2uname(uid_t uid)
 {
+        /* Note: used in nofork applets (whoami), be careful not to leak anything */
         struct passwd *pw = xgetpwuid(uid);
         return pw->pw_name;
 }
diff --git a/libbb/vfork_daemon_rexec.c b/libbb/vfork_daemon_rexec.c
index 576534ee5..487ecb0e4 100644
--- a/libbb/vfork_daemon_rexec.c
+++ b/libbb/vfork_daemon_rexec.c
@@ -92,6 +92,7 @@ struct nofork_save_area {
         void (*die_func)(void);
         const char *applet_name;
         uint32_t option_mask32;
+        smallint logmode;
         uint8_t xfunc_error_retval;
 };
 static void save_nofork_data(struct nofork_save_area *save)
@@ -100,6 +101,7 @@ static void save_nofork_data(struct nofork_save_area *save)
         save->die_func = die_func;
         save->applet_name = applet_name;
         save->option_mask32 = option_mask32;
+        save->logmode = logmode;
         save->xfunc_error_retval = xfunc_error_retval;
 }
 static void restore_nofork_data(struct nofork_save_area *save)
@@ -108,6 +110,7 @@ static void restore_nofork_data(struct nofork_save_area *save)
         die_func = save->die_func;
         applet_name = save->applet_name;
         option_mask32 = save->option_mask32;
+        logmode = save->logmode;
         xfunc_error_retval = save->xfunc_error_retval;
 }
 
@@ -118,8 +121,8 @@ int FAST_FUNC run_nofork_applet(int applet_no, char **argv)
 
         save_nofork_data(&old);
 
+        logmode = LOGMODE_STDIO;
         xfunc_error_retval = EXIT_FAILURE;
-
         /* In case getopt() or getopt32() was already called:
          * reset the libc getopt() function, which keeps internal state.
          */
@@ -146,7 +149,6 @@ int FAST_FUNC run_nofork_applet(int applet_no, char **argv)
 
         /* Restoring some globals */
         restore_nofork_data(&old);
-
         /* Other globals can be simply reset to defaults */
         GETOPT_RESET();