while (1) -> for (;;)

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

diff --git a/libudev/libudev-util-private.c b/libudev/libudev-util-private.c
index 5b3e337643d13a0c1cdaf38f9bb39a76a18a153f..7d28b23b389e6d3c6fc11dba6d75678a5760ba79 100644 (file)
--- a/libudev/libudev-util-private.c
+++ b/libudev/libudev-util-private.c
@@ -84,7 +84,7 @@ int util_delete_path(struct udev *udev, const char *path)
        if (pos == p || pos == NULL)
                return 0;
 
-       while (1) {
+       for (;;) {
                *pos = '\0';
                pos = strrchr(p, '/');
 
@@ -114,8 +114,8 @@ int util_unlink_secure(struct udev *udev, const char *filename)
 {
        int err;
 
-       chmod(filename, 0000);
        chown(filename, 0, 0);
+       chmod(filename, 0000);
        err = unlink(filename);
        if (errno == ENOENT)
                err = 0;
@@ -254,7 +254,7 @@ int util_resolve_subsys_kernel(struct udev *udev, const char *string,
 
 int util_run_program(struct udev *udev, const char *command, char **envp,
                     char *result, size_t ressize, size_t *reslen,
-                    const sigset_t *sigmask)
+                    const sigset_t *sigmask, bool reset_prio)
 {
        int status;
        int outpipe[2] = {-1, -1};
@@ -349,6 +349,8 @@ int util_run_program(struct udev *udev, const char *command, char **envp,
 
                if (sigmask)
                        sigprocmask(SIG_SETMASK, sigmask, NULL);
+               if (reset_prio)
+                       setpriority(PRIO_PROCESS, 0, 0);
 
                execve(argv[0], argv, envp);
                if (errno == ENOENT || errno == ENOTDIR) {