aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Denis Vlasenko <vda.linux@googlemail.com>2007-06-14 07:53:06 +0000
committerGravatar Denis Vlasenko <vda.linux@googlemail.com>2007-06-14 07:53:06 +0000
commitd8540f71ac8d17ef461e2d52b3f63bd78b3c2c7e (patch)
tree2ab2ac263ef155ec9ea142ff297f89e634297bcf
parent1adf681e87f5cd81841f8a3d84a8d9bdf83c7406 (diff)
downloadbusybox-d8540f71ac8d17ef461e2d52b3f63bd78b3c2c7e.tar.gz
busybox-d8540f71ac8d17ef461e2d52b3f63bd78b3c2c7e.tar.bz2
init: make sure fd 0,1,2 are not closed, + related optimizations.
init_main 929 920 -9 bb_daemonize_or_rexec 145 127 -18
-rw-r--r--init/init.c22
-rw-r--r--libbb/vfork_daemon_rexec.c12
-rw-r--r--loginutils/login.c5
3 files changed, 19 insertions, 20 deletions
diff --git a/init/init.c b/init/init.c
index da79d101d..5c7efe210 100644
--- a/init/init.c
+++ b/init/init.c
@@ -273,6 +273,9 @@ static void console_init(void)
while (fd > 2) close(fd--);
}
messageD(L_LOG, "console='%s'", s);
+ } else {
+ /* Make sure fd 0,1,2 are not closed */
+ bb_sanitize_stdio();
}
s = getenv("TERM");
@@ -288,20 +291,14 @@ static void console_init(void)
putenv((char*)"TERM=linux");
}
-static void fixup_argv(int argc, char **argv, const char *new_argv0)
+static void fixup_argv(char **argv)
{
- int len;
-
/* Fix up argv[0] to be certain we claim to be init */
- len = strlen(argv[0]);
- strncpy(argv[0], new_argv0, len);
+ strncpy(argv[0], "init", strlen(argv[0]));
/* Wipe argv[1]-argv[N] so they don't clutter the ps listing */
- len = 1;
- while (argc > len) {
- memset(argv[len], 0, strlen(argv[len]));
- len++;
- }
+ while (*++argv)
+ memset(*argv, 0, strlen(*argv));
}
/* Open the new terminal device */
@@ -919,6 +916,7 @@ int init_main(int argc, char **argv)
init_reboot(RB_DISABLE_CAD);
#endif
+
/* Figure out where the default console should be */
console_init();
set_sane_term();
@@ -972,7 +970,7 @@ int init_main(int argc, char **argv)
if (getenv("SELINUX_INIT") == NULL) {
int enforce = 0;
- putenv("SELINUX_INIT=YES");
+ putenv((char*)"SELINUX_INIT=YES");
if (selinux_init_load_policy(&enforce) == 0) {
BB_EXECVP(argv[0], argv);
} else if (enforce > 0) {
@@ -986,7 +984,7 @@ int init_main(int argc, char **argv)
#endif /* CONFIG_SELINUX */
/* Make the command line just say "init" -- thats all, nothing else */
- fixup_argv(argc, argv, "init");
+ fixup_argv(argv);
/* Now run everything that needs to be run */
diff --git a/libbb/vfork_daemon_rexec.c b/libbb/vfork_daemon_rexec.c
index cb4dee799..ea7b475eb 100644
--- a/libbb/vfork_daemon_rexec.c
+++ b/libbb/vfork_daemon_rexec.c
@@ -202,7 +202,6 @@ int spawn_and_wait(char **argv)
return wait4pid(rc);
}
-
#if !BB_MMU
void forkexit_or_rexec(char **argv)
{
@@ -261,17 +260,18 @@ void bb_daemonize_or_rexec(int flags, char **argv)
if (!(flags & DAEMON_ONLY_SANITIZE)) {
forkexit_or_rexec(argv);
- /* if daemonizing, make sure we detach from stdio */
+ /* if daemonizing, make sure we detach from stdio & ctty */
setsid();
dup2(fd, 0);
dup2(fd, 1);
dup2(fd, 2);
}
- if (fd > 2)
+ while (fd > 2) {
close(fd--);
- if (flags & DAEMON_CLOSE_EXTRA_FDS)
- while (fd > 2)
- close(fd--); /* close everything after fd#2 */
+ if (!(flags & DAEMON_CLOSE_EXTRA_FDS))
+ return;
+ /* else close everything after fd#2 */
+ }
}
void bb_sanitize_stdio(void)
diff --git a/loginutils/login.c b/loginutils/login.c
index 0f71a2aa9..d69e3ce51 100644
--- a/loginutils/login.c
+++ b/loginutils/login.c
@@ -160,10 +160,11 @@ static ALWAYS_INLINE int check_securetty(void) { return 1; }
static void get_username_or_die(char *buf, int size_buf)
{
int c, cntdown;
+
cntdown = EMPTY_USERNAME_COUNT;
-prompt:
- /* skip whitespace */
+ prompt:
print_login_prompt();
+ /* skip whitespace */
do {
c = getchar();
if (c == EOF) exit(1);