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

- replace _PATH_DEVNULL with bb_dev_null

Browse Source
This commit is contained in:
Bernhard Reutner-Fischer 2006-05-19 13:12:21 +00:00
parent 14aa06f29c
commit 0a8812bdc5
3 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libbb/vfork_daemon_rexec.c
View File

@ -1,3 +1,4 @@
/* vi: set sw=4 ts=4: */
/* /*
* Rexec program for system have fork() as vfork() with foreground option * Rexec program for system have fork() as vfork() with foreground option
* *
@ -11,19 +12,7 @@
* *
* Modified for uClibc by Erik Andersen <andersee@debian.org> * Modified for uClibc by Erik Andersen <andersee@debian.org>
* *
* This program is free software; you can redistribute it and/or modify * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include <unistd.h> #include <unistd.h>
@ -46,7 +35,7 @@ void vfork_daemon_rexec(int nochdir, int noclose,
if (!nochdir) if (!nochdir)
chdir("/"); chdir("/");
if (!noclose && (fd = open(_PATH_DEVNULL, O_RDWR, 0)) != -1) { if (!noclose && (fd = open(bb_dev_null, O_RDWR, 0)) != -1) {
dup2(fd, STDIN_FILENO); dup2(fd, STDIN_FILENO);
dup2(fd, STDOUT_FILENO); dup2(fd, STDOUT_FILENO);
dup2(fd, STDERR_FILENO); dup2(fd, STDERR_FILENO);

10
networking/udhcp/common.c
View File

@ -42,8 +42,10 @@ long uptime(void)
static inline void sanitize_fds(void) static inline void sanitize_fds(void)
{ {
int zero; int zero;
if ((zero = open(_PATH_DEVNULL, O_RDWR, 0)) < 0) return; if ((zero = open(bb_dev_null, O_RDWR, 0)) < 0)
while (zero < 3) zero = dup(zero); return;
while (zero < 3)
zero = dup(zero);
close(zero); close(zero);
} }
@ -76,7 +78,7 @@ void udhcp_logging(int level, const char *fmt, ...)
va_start(p, fmt); va_start(p, fmt);
__va_copy(p2, p); __va_copy(p2, p);
if(!daemonized) { if (!daemonized) {
vprintf(fmt, p); vprintf(fmt, p);
putchar('\n'); putchar('\n');
} }
@ -103,7 +105,7 @@ void udhcp_logging(int level, const char *fmt, ...)
va_list p; va_list p;
va_start(p, fmt); va_start(p, fmt);
if(!daemonized) { if (!daemonized) {
printf("%s, ", syslog_level_msg[level]); printf("%s, ", syslog_level_msg[level]);
vprintf(fmt, p); vprintf(fmt, p);
putchar('\n'); putchar('\n');

4
shell/ash.c
View File

@ -7147,8 +7147,8 @@ forkchild(struct job *jp, union node *n, int mode)
ignoresig(SIGQUIT); ignoresig(SIGQUIT);
if (jp->nprocs == 0) { if (jp->nprocs == 0) {
close(0); close(0);
if (open(_PATH_DEVNULL, O_RDONLY) != 0) if (open(bb_dev_null, O_RDONLY) != 0)
sh_error("Can't open %s", _PATH_DEVNULL); sh_error("Can't open %s", bb_dev_null);
} }
} }
if (!oldlvl && iflag) { if (!oldlvl && iflag) {