emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

A few more string duplicates found & eliminated

Browse Source 
# size busybox_old busybox_unstripped
   text    data     bss     dec     hex filename
 679693    2700   15632  698025   aa6a9 busybox_old
 679523    2700   15632  697855   aa5ff busybox_unstripped
This commit is contained in:
Denis Vlasenko
2007-06-12 08:52:02 +00:00
parent 16d58d75ee
commit 15611bb958
6 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libbb/setup_environment.c
View File

@ -30,11 +30,6 @@
#include "libbb.h"
/* util-linux manpage says /sbin:/bin:/usr/sbin:/usr/bin,
* but I want to save a few bytes here */
static const char DEFAULT_ROOT_LOGIN_PATH[] = "/sbin:/usr/sbin:/bin:/usr/bin";
#define DEFAULT_LOGIN_PATH (DEFAULT_ROOT_LOGIN_PATH + sizeof("/sbin:/usr/sbin"))
void setup_environment(const char *shell, int loginshell, int changeenv, const struct passwd *pw)
{
if (loginshell) {
@ -61,7 +56,7 @@ void setup_environment(const char *shell, int loginshell, int changeenv, const s
xsetenv("SHELL", shell);
xsetenv("USER", pw->pw_name);
xsetenv("LOGNAME", pw->pw_name);
xsetenv("PATH", (pw->pw_uid ? DEFAULT_LOGIN_PATH : DEFAULT_ROOT_LOGIN_PATH));
xsetenv("PATH", (pw->pw_uid ? bb_default_login_path : bb_default_root_login_path));
}
else if (changeenv) {
/* Set HOME, SHELL, and if not becoming a super-user,