udevd: improve timeout handling

[elogind.git] / udev_utils.c

diff --git a/udev_utils.c b/udev_utils.c
index 2b5683fda65b5801207fb8a878cac167fe32a758..74b55ed40697ef05e3f84366b864304bfb0093c4 100644 (file)
--- a/udev_utils.c
+++ b/udev_utils.c
@@ -27,6 +27,7 @@
 #include <errno.h>
 #include <ctype.h>
 #include <dirent.h>
+#include <sys/wait.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
 #include <sys/utsname.h>
@@ -38,19 +39,23 @@
 #include "list.h"
 
 
-int udev_init_device(struct udevice *udev, const char* devpath, const char *subsystem)
+int udev_init_device(struct udevice *udev, const char* devpath, const char *subsystem, const char *action)
 {
        char *pos;
 
        memset(udev, 0x00, sizeof(struct udevice));
        INIT_LIST_HEAD(&udev->symlink_list);
+       INIT_LIST_HEAD(&udev->run_list);
 
        if (subsystem)
                strlcpy(udev->subsystem, subsystem, sizeof(udev->subsystem));
 
+       if (action)
+               strlcpy(udev->action, action, sizeof(udev->action));
+
        if (devpath) {
                strlcpy(udev->devpath, devpath, sizeof(udev->devpath));
-               no_trailing_slash(udev->devpath);
+               remove_trailing_char(udev->devpath, '/');
 
                if (strncmp(udev->devpath, "/block/", 7) == 0)
                        udev->type = DEV_BLOCK;
@@ -84,9 +89,11 @@ int udev_init_device(struct udevice *udev, const char* devpath, const char *subs
                }
        }
 
-       udev->mode = 0660;
-       strcpy(udev->owner, "root");
-       strcpy(udev->group, "root");
+       if (udev->type == DEV_BLOCK || udev->type == DEV_CLASS) {
+               udev->mode = 0660;
+               strcpy(udev->owner, "root");
+               strcpy(udev->group, "root");
+       }
 
        return 0;
 }
@@ -228,12 +235,24 @@ size_t buf_get_line(const char *buf, size_t buflen, size_t cur)
        return count - cur;
 }
 
-void no_trailing_slash(char *path)
+void replace_untrusted_chars(char *string)
+{
+       size_t len;
+
+       for (len = 0; string[len] != '\0'; len++) {
+               if (strchr(";,~\\()\'", string[len])) {
+                       info("replace '%c' in '%s'", string[len], string);
+                       string[len] = '_';
+               }
+       }
+}
+
+void remove_trailing_char(char *path, char c)
 {
        size_t len;
 
        len = strlen(path);
-       while (len > 0 && path[len-1] == '/')
+       while (len > 0 && path[len-1] == c)
                path[--len] = '\0';
 }
 
@@ -305,3 +324,64 @@ int add_matching_files(struct list_head *name_list, const char *dirname, const c
        closedir(dir);
        return 0;
 }
+
+int execute_command(const char *command, const char *subsystem)
+{
+       int retval;
+       pid_t pid;
+       char arg[PATH_SIZE];
+       char *argv[(PATH_SIZE / 2) + 1];
+       char *pos;
+       int devnull;
+       int i;
+
+       strlcpy(arg, command, sizeof(arg));
+       i = 0;
+       if (strchr(arg, ' ')) {
+               pos = arg;
+               while (pos != NULL) {
+                       if (pos[0] == '\'') {
+                               /* don't separate if in apostrophes */
+                               pos++;
+                               argv[i] = strsep(&pos, "\'");
+                               while (pos && pos[0] == ' ')
+                                       pos++;
+                       } else {
+                               argv[i] = strsep(&pos, " ");
+                       }
+                       dbg("arg[%i] '%s'", i, argv[i]);
+                       i++;
+               }
+               argv[i] =  NULL;
+               dbg("execute '%s' with parsed arguments", arg);
+       } else {
+               argv[0] = arg;
+               argv[1] = (char *) subsystem;
+               argv[2] = NULL;
+               dbg("execute '%s' with subsystem '%s' argument", arg, argv[1]);
+       }
+
+       pid = fork();
+       switch (pid) {
+       case 0:
+               /* child */
+               devnull = open("/dev/null", O_RDWR);
+               if (devnull >= 0) {
+                       dup2(devnull, STDIN_FILENO);
+                       dup2(devnull, STDOUT_FILENO);
+                       dup2(devnull, STDERR_FILENO);
+                       close(devnull);
+               }
+               retval = execv(arg, argv);
+               err("exec of child failed");
+               _exit(1);
+       case -1:
+               dbg("fork of child failed");
+               break;
+               return -1;
+       default:
+               waitpid(pid, NULL, 0);
+       }
+
+       return 0;
+}