080 release

[elogind.git] / udev_utils_run.c

diff --git a/udev_utils_run.c b/udev_utils_run.c
index 0ee36d68488f441afb21174fbb01a4380413249b..b6020b0ab6baea9f1f0d22e24385c3d213aad13f 100644 (file)
--- a/udev_utils_run.c
+++ b/udev_utils_run.c
@@ -31,11 +31,7 @@
 #include <sys/wait.h>
 #include <sys/select.h>
 
-#include "udev_libc_wrapper.h"
 #include "udev.h"
-#include "logging.h"
-#include "udev_utils.h"
-#include "list.h"
 
 
 int pass_env_to_socket(const char *sockname, const char *devpath, const char *action)
@@ -82,6 +78,7 @@ int run_program(const char *command, const char *subsystem,
        int errpipe[2] = {-1, -1};
        pid_t pid;
        char arg[PATH_SIZE];
+       char program[PATH_SIZE];
        char *argv[(sizeof(arg) / 2) + 1];
        int devnull;
        int i;
@@ -115,72 +112,79 @@ int run_program(const char *command, const char *subsystem,
        /* prepare pipes from child to parent */
        if (result || log) {
                if (pipe(outpipe) != 0) {
-                       err("pipe failed");
+                       err("pipe failed: %s", strerror(errno));
                        return -1;
                }
        }
        if (log) {
                if (pipe(errpipe) != 0) {
-                       err("pipe failed");
+                       err("pipe failed: %s", strerror(errno));
                        return -1;
                }
        }
 
+       /* allow programs in /lib/udev called without the path */
+       if (strchr(argv[0], '/') == NULL) {
+               strlcpy(program, "/lib/udev/", sizeof(program));
+               strlcat(program, argv[0], sizeof(program));
+               argv[0] = program;
+       }
+
        pid = fork();
        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);
+                       err("open /dev/null failed: %s", strerror(errno));
+               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 */
-               err("exec of program failed");
+               err("exec of program '%s' failed", argv[0]);
                _exit(1);
        case -1:
-               err("fork of '%s' failed", argv[0]);
+               err("fork of '%s' failed: %s", argv[0], strerror(errno));
                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,17 +193,17 @@ 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));
+                                                       err("stdin read failed: %s", strerror(errno));
                                                        retval = -1;
                                                }
                                                continue;
@@ -223,17 +227,17 @@ 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));
+                                                       err("stderr read failed: %s", strerror(errno));
                                                continue;
                                        }
                                        errbuf[count] = '\0';
@@ -243,10 +247,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) {