shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-03-11 04:58:19 +03:00
Code

[PATCH] udev - trivial style cleanup

Browse Source 
Trivial style cleanup, to be consistent.

And add chdir("/") to the daemon so one can umout its filesystem,
while we are running :)
This commit is contained in:
kay.sievers@vrfy.org 2004-01-27 00:40:12 -08:00 committed by Greg KH
parent 8af67a67c2
commit 2a25816ff0
3 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
namedev.c
View File

@ -332,12 +332,8 @@ static int execute_program(char *path, char *value, int len)
return -1; return -1;
} }
pid = fork(); pid = fork();
if (pid == -1) { switch(pid) {
dbg("fork failed"); case 0:
return -1;
}
if (pid == 0) {
/* child */ /* child */
close(STDOUT_FILENO); close(STDOUT_FILENO);
dup(fds[1]); /* dup write side of pipe to STDOUT */ dup(fds[1]); /* dup write side of pipe to STDOUT */
@ -353,16 +349,16 @@ static int execute_program(char *path, char *value, int len)
dbg("too many args - %d", i); dbg("too many args - %d", i);
args[i] = NULL; args[i] = NULL;
} }
retval = execve(args[0], args, main_envp); retval = execv(args[0], args);
} else { } else {
retval = execve(path, main_argv, main_envp); retval = execv(path, main_argv);
} }
if (retval != 0) { dbg("child execve failed");
dbg("child execve failed"); exit(1);
exit(1); case -1:
} dbg("fork failed");
return -1; /* avoid compiler warning */ return -1;
} else { default:
/* parent reads from fds[0] */ /* parent reads from fds[0] */
close(fds[1]); close(fds[1]);
retval = 0; retval = 0;

2
udevinfo.c
View File

@ -397,7 +397,7 @@ help:
" -n NAME node name used for query\n" " -n NAME node name used for query\n"
"\n" "\n"
" -r print udev root\n" " -r print udev root\n"
" -a print all attributes along the chain of the device\n" " -a print all SYSFS_attributes along the device chain\n"
" -d dump whole database\n" " -d dump whole database\n"
" -V print udev version\n" " -V print udev version\n"
" -h print this help text\n" " -h print this help text\n"

1
udevsend.c
View File

@ -87,6 +87,7 @@ static int start_daemon(void)
case 0: case 0:
/* daemon */ /* daemon */
setsid(); setsid();
chdir("/");
execl(UDEVD_EXEC, "udevd", NULL); execl(UDEVD_EXEC, "udevd", NULL);
dbg("exec of daemon failed"); dbg("exec of daemon failed");
exit(1); exit(1);