summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorDenis Vlasenko2008-07-06 07:00:11 +0000
committerDenis Vlasenko2008-07-06 07:00:11 +0000
commitd48e81f0cda73aca49cd852212a62e879cf35b86 (patch)
treebc7f639f139f1fe5d65dd20b5819d41a5acf2cea /init
parentff182a3d68462cb7ec38affa1afb04a06031862f (diff)
downloadbusybox-d48e81f0cda73aca49cd852212a62e879cf35b86.zip
busybox-d48e81f0cda73aca49cd852212a62e879cf35b86.tar.gz
mdev: do not follow symlinks in /sys (as was intended prior to rev 18811).
If this breaks things, please document why! mdev,init: use shared code for fd sanitization function old new delta bb_daemonize_or_rexec 155 172 +17 mdev_main 500 505 +5 init_main 907 856 -51 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 2/1 up/down: 22/-51) Total: -29 bytes
Diffstat (limited to 'init')
-rw-r--r--init/init.c15
1 files changed, 1 insertions, 14 deletions
diff --git a/init/init.c b/init/init.c
index 2328967..4b2bd9c 100644
--- a/init/init.c
+++ b/init/init.c
@@ -221,20 +221,7 @@ static void console_init(void)
} else {
/* Make sure fd 0,1,2 are not closed
* (so that they won't be used by future opens) */
-
- /* bb_sanitize_stdio(); - WRONG.
- * It fails if "/dev/null" doesnt exist, and for init
- * this is a real possibility! Open code it instead. */
-
- int fd = open(bb_dev_null, O_RDWR);
- if (fd < 0) {
- /* Give me _ANY_ open descriptor! */
- fd = xopen("/", O_RDONLY); /* we don't believe this can fail */
- }
- while ((unsigned)fd < 2)
- fd = dup(fd);
- if (fd > 2)
- close(fd);
+ bb_sanitize_stdio();
}
s = getenv("TERM");