shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-25 01:34:28 +03:00
Code

don't fail too bad, if /dev/null does not exist

Browse Source 
Signed-off-by: Kay Sievers <kay.sievers@suse.de>
This commit is contained in:
Kay Sievers 2005-08-13 02:36:12 +02:00
parent 7d38d2287c
commit af5461f72f
2 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
udev_utils_run.c
View File

@ -136,23 +136,19 @@ int run_program(const char *command, const char *subsystem,
/* discard child output or connect to pipe */
devnull = open("/dev/null", O_RDWR);
if (devnull < 0) {
if (devnull > 0) {
dup2(devnull, STDIN_FILENO);
if (outpipe[1] < 0)
dup2(devnull, STDOUT_FILENO);
if (errpipe[1] < 0)
dup2(devnull, STDERR_FILENO);
close(devnull);
} else
err("open /dev/null failed");
exit(1);
}
dup2(devnull, STDIN_FILENO);
if (outpipe[1] > 0)
dup2(outpipe[1], STDOUT_FILENO);
else
dup2(devnull, STDOUT_FILENO);
if (errpipe[1] > 0)
dup2(errpipe[1], STDERR_FILENO);
else
dup2(devnull, STDERR_FILENO);
close(devnull);
execv(arg, argv);
/* we should never reach this */

14
udevd.c
View File

@ -785,7 +785,7 @@ int main(int argc, char *argv[], char *envp[])
{
int maxsockplus;
int retval;
int fd;
int devnull;
struct sigaction act;
fd_set readfds;
const char *value;
@ -841,12 +841,12 @@ int main(int argc, char *argv[], char *envp[])
setpriority(PRIO_PROCESS, 0, UDEVD_PRIORITY);
/* Set fds to dev/null */
fd = open( "/dev/null", O_RDWR );
if (fd >= 0) {
dup2(fd, STDIN_FILENO);
dup2(fd, STDOUT_FILENO);
dup2(fd, STDERR_FILENO);
close(fd);
devnull = open( "/dev/null", O_RDWR );
if (devnull > 0) {
dup2(devnull, STDIN_FILENO);
dup2(devnull, STDOUT_FILENO);
dup2(devnull, STDERR_FILENO);
close(devnull);
} else
err("error opening /dev/null %s", strerror(errno));