X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=libudev%2Flibudev-util-private.c;h=2f9f4a74c31bf016bd4bef867f19333a490b907b;hb=847b4f84c671e98f29f22d8e3e0d70a231d71a7b;hp=5b3e337643d13a0c1cdaf38f9bb39a76a18a153f;hpb=6834a4429997480b3959c04ac9a74de7f29b3056;p=elogind.git

diff --git a/libudev/libudev-util-private.c b/libudev/libudev-util-private.c
index 5b3e33764..2f9f4a74c 100644
--- 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) {
@@ -452,7 +454,7 @@ int util_run_program(struct udev *udev, const char *command, char **envp,
 			if (errpipe[READ_END] > 0)
 				close(errpipe[READ_END]);
 
-			/* return the childs stdout string */
+			/* return the child's stdout string */
 			if (result) {
 				result[respos] = '\0';
 				dbg(udev, "result='%s'\n", result);