svn commit: trunk/busybox: init libbb loginutils
vda at busybox.net
vda at busybox.net
Thu Jun 14 07:53:07 UTC 2007
Author: vda
Date: 2007-06-14 00:53:06 -0700 (Thu, 14 Jun 2007)
New Revision: 18820
Log:
init: make sure fd 0,1,2 are not closed, + related optimizations.
init_main 929 920 -9
bb_daemonize_or_rexec 145 127 -18
Modified:
trunk/busybox/init/init.c
trunk/busybox/libbb/vfork_daemon_rexec.c
trunk/busybox/loginutils/login.c
Changeset:
Modified: trunk/busybox/init/init.c
===================================================================
--- trunk/busybox/init/init.c 2007-06-14 07:47:52 UTC (rev 18819)
+++ trunk/busybox/init/init.c 2007-06-14 07:53:06 UTC (rev 18820)
@@ -273,6 +273,9 @@
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 @@
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 @@
init_reboot(RB_DISABLE_CAD);
#endif
+
/* Figure out where the default console should be */
console_init();
set_sane_term();
@@ -972,7 +970,7 @@
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 @@
#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 */
Modified: trunk/busybox/libbb/vfork_daemon_rexec.c
===================================================================
--- trunk/busybox/libbb/vfork_daemon_rexec.c 2007-06-14 07:47:52 UTC (rev 18819)
+++ trunk/busybox/libbb/vfork_daemon_rexec.c 2007-06-14 07:53:06 UTC (rev 18820)
@@ -202,7 +202,6 @@
return wait4pid(rc);
}
-
#if !BB_MMU
void forkexit_or_rexec(char **argv)
{
@@ -261,17 +260,18 @@
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)
Modified: trunk/busybox/loginutils/login.c
===================================================================
--- trunk/busybox/loginutils/login.c 2007-06-14 07:47:52 UTC (rev 18819)
+++ trunk/busybox/loginutils/login.c 2007-06-14 07:53:06 UTC (rev 18820)
@@ -160,10 +160,11 @@
static void get_username_or_die(char *buf, int size_buf)
{
int c, cntdown;
+
cntdown = EMPTY_USERNAME_COUNT;
-prompt:
+ prompt:
+ print_login_prompt();
/* skip whitespace */
- print_login_prompt();
do {
c = getchar();
if (c == EOF) exit(1);
More information about the busybox-cvs
mailing list