diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-09-20 16:28:59 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-09-20 16:28:59 +0000 |
commit | b8d1a4cd5f686ee95f6cf13634cba1f96e382f26 (patch) | |
tree | 86423f82c3593245aedae65e2e4c8f7e0c4d6482 /miscutils | |
parent | b61dc1c1cea7aaef3cd2aa016a9c7d4d1ffd71bf (diff) | |
download | busybox-w32-b8d1a4cd5f686ee95f6cf13634cba1f96e382f26.tar.gz busybox-w32-b8d1a4cd5f686ee95f6cf13634cba1f96e382f26.tar.bz2 busybox-w32-b8d1a4cd5f686ee95f6cf13634cba1f96e382f26.zip |
init: set stderr to NONBLOCK
*: s/setenv(a,b,1)/xsetenv(a,b)/
function old new delta
init_main 856 895 +39
message 146 144 -2
crond_main 1418 1416 -2
run 661 658 -3
zcip_main 1409 1403 -6
edit_file 910 901 -9
environment 20 - -20
Diffstat (limited to 'miscutils')
-rw-r--r-- | miscutils/crond.c | 6 | ||||
-rw-r--r-- | miscutils/crontab.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/miscutils/crond.c b/miscutils/crond.c index 2f0bf6ea8..7d1908c63 100644 --- a/miscutils/crond.c +++ b/miscutils/crond.c | |||
@@ -187,7 +187,7 @@ int crond_main(int argc UNUSED_PARAM, char **argv) | |||
187 | 187 | ||
188 | xchdir(CDir); | 188 | xchdir(CDir); |
189 | //signal(SIGHUP, SIG_IGN); /* ? original crond dies on HUP... */ | 189 | //signal(SIGHUP, SIG_IGN); /* ? original crond dies on HUP... */ |
190 | setenv("SHELL", DEFAULT_SHELL, 1); /* once, for all future children */ | 190 | xsetenv("SHELL", DEFAULT_SHELL); /* once, for all future children */ |
191 | crondlog(LVL9 "crond (busybox "BB_VER") started, log level %d", LogLevel); | 191 | crondlog(LVL9 "crond (busybox "BB_VER") started, log level %d", LogLevel); |
192 | SynchronizeDir(); | 192 | SynchronizeDir(); |
193 | 193 | ||
@@ -275,8 +275,8 @@ static void SetEnv(struct passwd *pas) | |||
275 | /* if we want to set user's shell instead: */ | 275 | /* if we want to set user's shell instead: */ |
276 | /*safe_setenv(env_var_user, "SHELL", pas->pw_shell, 5);*/ | 276 | /*safe_setenv(env_var_user, "SHELL", pas->pw_shell, 5);*/ |
277 | #else | 277 | #else |
278 | setenv("USER", pas->pw_name, 1); | 278 | xsetenv("USER", pas->pw_name); |
279 | setenv("HOME", pas->pw_dir, 1); | 279 | xsetenv("HOME", pas->pw_dir); |
280 | #endif | 280 | #endif |
281 | /* currently, we use constant one: */ | 281 | /* currently, we use constant one: */ |
282 | /*setenv("SHELL", DEFAULT_SHELL, 1); - done earlier */ | 282 | /*setenv("SHELL", DEFAULT_SHELL, 1); - done earlier */ |
diff --git a/miscutils/crontab.c b/miscutils/crontab.c index f8662babb..ef6d94375 100644 --- a/miscutils/crontab.c +++ b/miscutils/crontab.c | |||
@@ -21,9 +21,9 @@ | |||
21 | 21 | ||
22 | static void change_user(const struct passwd *pas) | 22 | static void change_user(const struct passwd *pas) |
23 | { | 23 | { |
24 | setenv("USER", pas->pw_name, 1); | 24 | xsetenv("USER", pas->pw_name); |
25 | setenv("HOME", pas->pw_dir, 1); | 25 | xsetenv("HOME", pas->pw_dir); |
26 | setenv("SHELL", DEFAULT_SHELL, 1); | 26 | xsetenv("SHELL", DEFAULT_SHELL); |
27 | 27 | ||
28 | /* initgroups, setgid, setuid */ | 28 | /* initgroups, setgid, setuid */ |
29 | change_identity(pas); | 29 | change_identity(pas); |