mirror of
https://github.com/systemd/systemd.git
synced 2024-10-28 11:55:44 +03:00
use WRITE_END/READ_END for the pipe index
Signed-off-by: Kay Sievers <kay.sievers@suse.de>
This commit is contained in:
parent
764ce7f2ab
commit
f1ff8d7b4a
@ -26,6 +26,10 @@
|
||||
|
||||
#define UDEV_MAX(a,b) ((a) > (b) ? (a) : (b))
|
||||
|
||||
/* pipes */
|
||||
#define READ_END 0
|
||||
#define WRITE_END 1
|
||||
|
||||
struct name_entry {
|
||||
struct list_head node;
|
||||
char name[PATH_SIZE];
|
||||
|
@ -130,26 +130,26 @@ int run_program(const char *command, const char *subsystem,
|
||||
switch(pid) {
|
||||
case 0:
|
||||
/* child closes parent ends of pipes */
|
||||
if (outpipe[0] > 0)
|
||||
close(outpipe[0]);
|
||||
if (errpipe[0] > 0)
|
||||
close(errpipe[0]);
|
||||
if (outpipe[READ_END] > 0)
|
||||
close(outpipe[READ_END]);
|
||||
if (errpipe[READ_END] > 0)
|
||||
close(errpipe[READ_END]);
|
||||
|
||||
/* discard child output or connect to pipe */
|
||||
devnull = open("/dev/null", O_RDWR);
|
||||
if (devnull > 0) {
|
||||
dup2(devnull, STDIN_FILENO);
|
||||
if (outpipe[1] < 0)
|
||||
if (outpipe[WRITE_END] < 0)
|
||||
dup2(devnull, STDOUT_FILENO);
|
||||
if (errpipe[1] < 0)
|
||||
if (errpipe[WRITE_END] < 0)
|
||||
dup2(devnull, STDERR_FILENO);
|
||||
close(devnull);
|
||||
} else
|
||||
err("open /dev/null failed");
|
||||
if (outpipe[1] > 0)
|
||||
dup2(outpipe[1], STDOUT_FILENO);
|
||||
if (errpipe[1] > 0)
|
||||
dup2(errpipe[1], STDERR_FILENO);
|
||||
if (outpipe[WRITE_END] > 0)
|
||||
dup2(outpipe[WRITE_END], STDOUT_FILENO);
|
||||
if (errpipe[WRITE_END] > 0)
|
||||
dup2(errpipe[WRITE_END], STDERR_FILENO);
|
||||
execv(argv[0], argv);
|
||||
|
||||
/* we should never reach this */
|
||||
@ -160,27 +160,27 @@ int run_program(const char *command, const char *subsystem,
|
||||
return -1;
|
||||
default:
|
||||
/* read from child if requested */
|
||||
if (outpipe[0] > 0 || errpipe[0] > 0) {
|
||||
if (outpipe[READ_END] > 0 || errpipe[READ_END] > 0) {
|
||||
ssize_t count;
|
||||
size_t respos = 0;
|
||||
|
||||
/* parent closes child ends of pipes */
|
||||
if (outpipe[1] > 0)
|
||||
close(outpipe[1]);
|
||||
if (errpipe[1] > 0)
|
||||
close(errpipe[1]);
|
||||
if (outpipe[WRITE_END] > 0)
|
||||
close(outpipe[WRITE_END]);
|
||||
if (errpipe[WRITE_END] > 0)
|
||||
close(errpipe[WRITE_END]);
|
||||
|
||||
/* read child output */
|
||||
while (outpipe[0] > 0 || errpipe[0] > 0) {
|
||||
while (outpipe[READ_END] > 0 || errpipe[READ_END] > 0) {
|
||||
int fdcount;
|
||||
fd_set readfds;
|
||||
|
||||
FD_ZERO(&readfds);
|
||||
if (outpipe[0] > 0)
|
||||
FD_SET(outpipe[0], &readfds);
|
||||
if (errpipe[0] > 0)
|
||||
FD_SET(errpipe[0], &readfds);
|
||||
fdcount = select(UDEV_MAX(outpipe[0], errpipe[0])+1, &readfds, NULL, NULL, NULL);
|
||||
if (outpipe[READ_END] > 0)
|
||||
FD_SET(outpipe[READ_END], &readfds);
|
||||
if (errpipe[READ_END] > 0)
|
||||
FD_SET(errpipe[READ_END], &readfds);
|
||||
fdcount = select(UDEV_MAX(outpipe[READ_END], errpipe[READ_END])+1, &readfds, NULL, NULL, NULL);
|
||||
if (fdcount < 0) {
|
||||
if (errno == EINTR)
|
||||
continue;
|
||||
@ -189,15 +189,15 @@ int run_program(const char *command, const char *subsystem,
|
||||
}
|
||||
|
||||
/* get stdout */
|
||||
if (outpipe[0] > 0 && FD_ISSET(outpipe[0], &readfds)) {
|
||||
if (outpipe[READ_END] > 0 && FD_ISSET(outpipe[READ_END], &readfds)) {
|
||||
char inbuf[1024];
|
||||
char *pos;
|
||||
char *line;
|
||||
|
||||
count = read(outpipe[0], inbuf, sizeof(inbuf)-1);
|
||||
count = read(outpipe[READ_END], inbuf, sizeof(inbuf)-1);
|
||||
if (count <= 0) {
|
||||
close(outpipe[0]);
|
||||
outpipe[0] = -1;
|
||||
close(outpipe[READ_END]);
|
||||
outpipe[READ_END] = -1;
|
||||
if (count < 0) {
|
||||
err("stdin read failed with '%s'", strerror(errno));
|
||||
retval = -1;
|
||||
@ -223,15 +223,15 @@ int run_program(const char *command, const char *subsystem,
|
||||
}
|
||||
|
||||
/* get stderr */
|
||||
if (errpipe[0] > 0 && FD_ISSET(errpipe[0], &readfds)) {
|
||||
if (errpipe[READ_END] > 0 && FD_ISSET(errpipe[READ_END], &readfds)) {
|
||||
char errbuf[1024];
|
||||
char *pos;
|
||||
char *line;
|
||||
|
||||
count = read(errpipe[0], errbuf, sizeof(errbuf)-1);
|
||||
count = read(errpipe[READ_END], errbuf, sizeof(errbuf)-1);
|
||||
if (count <= 0) {
|
||||
close(errpipe[0]);
|
||||
errpipe[0] = -1;
|
||||
close(errpipe[READ_END]);
|
||||
errpipe[READ_END] = -1;
|
||||
if (count < 0)
|
||||
err("stderr read failed with '%s'", strerror(errno));
|
||||
continue;
|
||||
@ -243,10 +243,10 @@ int run_program(const char *command, const char *subsystem,
|
||||
info("'%s' (stderr) '%s'", argv[0], line);
|
||||
}
|
||||
}
|
||||
if (outpipe[0] > 0)
|
||||
close(outpipe[0]);
|
||||
if (errpipe[0] > 0)
|
||||
close(errpipe[0]);
|
||||
if (outpipe[READ_END] > 0)
|
||||
close(outpipe[READ_END]);
|
||||
if (errpipe[READ_END] > 0)
|
||||
close(errpipe[READ_END]);
|
||||
|
||||
/* return the childs stdout string */
|
||||
if (result) {
|
||||
|
28
udevd.c
28
udevd.c
@ -55,7 +55,7 @@ static int udevd_sock;
|
||||
static int uevent_netlink_sock;
|
||||
static pid_t sid;
|
||||
|
||||
static int pipefds[2] = {-1, -1};
|
||||
static int signal_pipe[2] = {-1, -1};
|
||||
static volatile int sigchilds_waiting;
|
||||
static volatile int run_msg_q;
|
||||
static volatile int sig_flag;
|
||||
@ -657,7 +657,7 @@ static void asmlinkage sig_handler(int signum)
|
||||
* which will wakeup our mainloop
|
||||
*/
|
||||
if (!sig_flag) {
|
||||
rc = write(pipefds[1], &signum, sizeof(signum));
|
||||
rc = write(signal_pipe[1], &signum, sizeof(signum));
|
||||
if (rc >= 0)
|
||||
sig_flag = 1;
|
||||
}
|
||||
@ -842,25 +842,25 @@ int main(int argc, char *argv[], char *envp[])
|
||||
setpriority(PRIO_PROCESS, 0, UDEVD_PRIORITY);
|
||||
|
||||
/* setup signal handler pipe */
|
||||
retval = pipe(pipefds);
|
||||
retval = pipe(signal_pipe);
|
||||
if (retval < 0) {
|
||||
err("error getting pipes: %s", strerror(errno));
|
||||
goto exit;
|
||||
}
|
||||
retval = fcntl(pipefds[0], F_SETFL, O_NONBLOCK);
|
||||
retval = fcntl(signal_pipe[READ_END], F_SETFL, O_NONBLOCK);
|
||||
if (retval < 0) {
|
||||
err("error fcntl on read pipe: %s", strerror(errno));
|
||||
goto exit;
|
||||
}
|
||||
retval = fcntl(pipefds[0], F_SETFD, FD_CLOEXEC);
|
||||
retval = fcntl(signal_pipe[READ_END], F_SETFD, FD_CLOEXEC);
|
||||
if (retval < 0)
|
||||
err("error fcntl on read pipe: %s", strerror(errno));
|
||||
retval = fcntl(pipefds[1], F_SETFL, O_NONBLOCK);
|
||||
retval = fcntl(signal_pipe[WRITE_END], F_SETFL, O_NONBLOCK);
|
||||
if (retval < 0) {
|
||||
err("error fcntl on write pipe: %s", strerror(errno));
|
||||
goto exit;
|
||||
}
|
||||
retval = fcntl(pipefds[1], F_SETFD, FD_CLOEXEC);
|
||||
retval = fcntl(signal_pipe[WRITE_END], F_SETFD, FD_CLOEXEC);
|
||||
if (retval < 0)
|
||||
err("error fcntl on write pipe: %s", strerror(errno));
|
||||
|
||||
@ -934,7 +934,7 @@ int main(int argc, char *argv[], char *envp[])
|
||||
int fdcount;
|
||||
|
||||
FD_ZERO(&readfds);
|
||||
FD_SET(pipefds[0], &readfds);
|
||||
FD_SET(signal_pipe[READ_END], &readfds);
|
||||
FD_SET(udevd_sock, &readfds);
|
||||
if (uevent_netlink_sock > 0)
|
||||
FD_SET(uevent_netlink_sock, &readfds);
|
||||
@ -974,12 +974,12 @@ int main(int argc, char *argv[], char *envp[])
|
||||
}
|
||||
|
||||
/* received a signal, clear our notification pipe */
|
||||
if (FD_ISSET(pipefds[0], &readfds)) {
|
||||
if (FD_ISSET(signal_pipe[0], &readfds)) {
|
||||
int sig;
|
||||
ssize_t rlen;
|
||||
|
||||
while(1) {
|
||||
rlen = read(pipefds[0], &sig, sizeof(sig));
|
||||
rlen = read(signal_pipe[0], &sig, sizeof(sig));
|
||||
if (rlen <= 0)
|
||||
break;
|
||||
}
|
||||
@ -1011,10 +1011,10 @@ int main(int argc, char *argv[], char *envp[])
|
||||
}
|
||||
|
||||
exit:
|
||||
if (pipefds[0] > 0)
|
||||
close(pipefds[0]);
|
||||
if (pipefds[1] > 0)
|
||||
close(pipefds[1]);
|
||||
if (signal_pipe[READ_END] > 0)
|
||||
close(signal_pipe[READ_END]);
|
||||
if (signal_pipe[WRITE_END] > 0)
|
||||
close(signal_pipe[WRITE_END]);
|
||||
|
||||
if (udevd_sock > 0)
|
||||
close(udevd_sock);
|
||||
|
Loading…
Reference in New Issue
Block a user