keymap: make USB keyboards really work

[elogind.git] / libudev / libudev-util-private.c

diff --git a/libudev/libudev-util-private.c b/libudev/libudev-util-private.c
index dfde5a998d3413109239eb93cf77e0bf006eaed2..585dfc6a41004f08f5fe1dfd6b4a37760d702af1 100644 (file)
--- a/libudev/libudev-util-private.c
+++ b/libudev/libudev-util-private.c
@@ -251,7 +251,7 @@ int util_run_program(struct udev *udev, const char *command, char **envp,
        pid_t pid;
        char arg[UTIL_PATH_SIZE];
        char program[UTIL_PATH_SIZE];
-       char *argv[(sizeof(arg) / 2) + 1];
+       char *argv[((sizeof(arg) + 1) / 2) + 1];
        int devnull;
        int i;
        int err = 0;
@@ -269,10 +269,14 @@ int util_run_program(struct udev *udev, const char *command, char **envp,
                                /* do not separate quotes */
                                pos++;
                                argv[i] = strsep(&pos, "\'");
-                               while (pos != NULL && pos[0] == ' ')
-                                       pos++;
+                               if (pos != NULL)
+                                       while (pos[0] == ' ')
+                                               pos++;
                        } else {
                                argv[i] = strsep(&pos, " ");
+                               if (pos != NULL)
+                                       while (pos[0] == ' ')
+                                               pos++;
                        }
                        dbg(udev, "arg[%i] '%s'\n", i, argv[i]);
                        i++;
@@ -333,7 +337,7 @@ int util_run_program(struct udev *udev, const char *command, char **envp,
                }
 
                if (sigmask)
-                       sigprocmask(SIG_BLOCK, sigmask, NULL);
+                       sigprocmask(SIG_SETMASK, sigmask, NULL);
 
                execve(argv[0], argv, envp);
                if (errno == ENOENT || errno == ENOTDIR) {