087 release

[elogind.git] / udev_utils_run.c

diff --git a/udev_utils_run.c b/udev_utils_run.c
index 20aaa4ab05e386951a8d445d592553c5786f725e..76a704c52cb19b93db15fe517f2b3171043708b8 100644 (file)
--- a/udev_utils_run.c
+++ b/udev_utils_run.c
@@ -31,12 +31,9 @@
 #include <sys/wait.h>
 #include <sys/select.h>
 
 #include <sys/wait.h>
 #include <sys/select.h>
 

-#include "udev_libc_wrapper.h"

 #include "udev.h"
 #include "udev.h"

-#include "logging.h"
-#include "udev_utils.h"
-#include "list.h"

 
 

+extern char **environ;

 
 int pass_env_to_socket(const char *sockname, const char *devpath, const char *action)
 {
 
 int pass_env_to_socket(const char *sockname, const char *devpath, const char *action)
 {


@@ -53,7 +50,7 @@ int pass_env_to_socket(const char *sockname, const char *devpath, const char *ac
        sock = socket(AF_LOCAL, SOCK_DGRAM, 0);
        memset(&saddr, 0x00, sizeof(struct sockaddr_un));
        saddr.sun_family = AF_LOCAL;
        sock = socket(AF_LOCAL, SOCK_DGRAM, 0);
        memset(&saddr, 0x00, sizeof(struct sockaddr_un));
        saddr.sun_family = AF_LOCAL;

-       /* only abstract namespace is supported */
+       /* abstract namespace only */

        strcpy(&saddr.sun_path[1], sockname);
        addrlen = offsetof(struct sockaddr_un, sun_path) + strlen(saddr.sun_path+1) + 1;
 
        strcpy(&saddr.sun_path[1], sockname);
        addrlen = offsetof(struct sockaddr_un, sun_path) + strlen(saddr.sun_path+1) + 1;
 


@@ -82,20 +79,23 @@ int run_program(const char *command, const char *subsystem,
        int errpipe[2] = {-1, -1};
        pid_t pid;
        char arg[PATH_SIZE];
        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;
 
        char *argv[(sizeof(arg) / 2) + 1];
        int devnull;
        int i;
 

+       /* build argv from comand */

        strlcpy(arg, command, sizeof(arg));
        i = 0;
        strlcpy(arg, command, sizeof(arg));
        i = 0;

-       if (strchr(arg, ' ')) {
+       if (strchr(arg, ' ') != NULL) {

                char *pos = arg;
                char *pos = arg;

+

                while (pos != NULL) {
                        if (pos[0] == '\'') {
                                /* don't separate if in apostrophes */
                                pos++;
                                argv[i] = strsep(&pos, "\'");
                while (pos != NULL) {
                        if (pos[0] == '\'') {
                                /* don't separate if in apostrophes */
                                pos++;
                                argv[i] = strsep(&pos, "\'");

-                               while (pos && pos[0] == ' ')
+                               while (pos != NULL && pos[0] == ' ')

                                        pos++;
                        } else {
                                argv[i] = strsep(&pos, " ");
                                        pos++;
                        } else {
                                argv[i] = strsep(&pos, " ");


@@ -104,13 +104,11 @@ int run_program(const char *command, const char *subsystem,
                        i++;
                }
                argv[i] = NULL;
                        i++;
                }
                argv[i] = NULL;

-               info("'%s'", command);

        } else {
                argv[0] = arg;
        } else {
                argv[0] = arg;

-               argv[1] = (char *) subsystem;
-               argv[2] = NULL;
-               info("'%s' '%s'", arg, argv[1]);
+               argv[1] = NULL;

        }
        }

+       info("'%s'", command);

 
        /* prepare pipes from child to parent */
        if (result || log) {
 
        /* prepare pipes from child to parent */
        if (result || log) {


@@ -126,6 +124,13 @@ int run_program(const char *command, const char *subsystem,
                }
        }
 
                }
        }
 

+       /* 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:
        pid = fork();
        switch(pid) {
        case 0: