X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudev-util.c;h=3d5eb7657c40b812e14b6a395e5e8a0629930710;hp=2620d9a994ba0e4ea3d96d36965f7f6957975f82;hb=db71b500b2fe1fc74c4d9b60082cb142283b6eda;hpb=a391f49d7f5433e6204f35331b81391c2d110309

diff --git a/udev/udev-util.c b/udev/udev-util.c
index 2620d9a99..3d5eb7657 100644
--- a/udev/udev-util.c
+++ b/udev/udev-util.c
@@ -135,46 +135,46 @@ uid_t util_lookup_user(struct udev *udev, const char *user)
 
 	if (strcmp(user, "root") == 0)
 		return 0;
-		uid = strtoul(user, &endptr, 10);
-		if (endptr[0] == '\0')
-			return uid;
-
-		errno = 0;
-		getpwnam_r(user, &pwbuf, buf, buflen, &pw);
-		if (pw != NULL)
-			return pw->pw_uid;
-		if (errno == 0 || errno == ENOENT || errno == ESRCH)
-			err(udev, "specified user '%s' unknown\n", user);
-		else
-			err(udev, "error resolving user '%s': %m\n", user);
-		return 0;
-	}
+	uid = strtoul(user, &endptr, 10);
+	if (endptr[0] == '\0')
+		return uid;
+
+	errno = 0;
+	getpwnam_r(user, &pwbuf, buf, buflen, &pw);
+	if (pw != NULL)
+		return pw->pw_uid;
+	if (errno == 0 || errno == ENOENT || errno == ESRCH)
+		err(udev, "specified user '%s' unknown\n", user);
+	else
+		err(udev, "error resolving user '%s': %m\n", user);
+	return 0;
+}
 
-	extern gid_t util_lookup_group(struct udev *udev, const char *group)
-	{
-		char *endptr;
-		int buflen = sysconf(_SC_GETGR_R_SIZE_MAX);
-		char buf[buflen];
-		struct group grbuf;
-		struct group *gr;
-		gid_t gid = 0;
+extern gid_t util_lookup_group(struct udev *udev, const char *group)
+{
+	char *endptr;
+	int buflen = sysconf(_SC_GETGR_R_SIZE_MAX);
+	char buf[buflen];
+	struct group grbuf;
+	struct group *gr;
+	gid_t gid = 0;
 
-		if (strcmp(group, "root") == 0)
-			return 0;
-		gid = strtoul(group, &endptr, 10);
-		if (endptr[0] == '\0')
-			return gid;
-
-		errno = 0;
-		getgrnam_r(group, &grbuf, buf, buflen, &gr);
-		if (gr != NULL)
-			return gr->gr_gid;
-		if (errno == 0 || errno == ENOENT || errno == ESRCH)
-			err(udev, "specified group '%s' unknown\n", group);
-		else
-			err(udev, "error resolving group '%s': %m\n", group);
+	if (strcmp(group, "root") == 0)
 		return 0;
-	}
+	gid = strtoul(group, &endptr, 10);
+	if (endptr[0] == '\0')
+		return gid;
+
+	errno = 0;
+	getgrnam_r(group, &grbuf, buf, buflen, &gr);
+	if (gr != NULL)
+		return gr->gr_gid;
+	if (errno == 0 || errno == ENOENT || errno == ESRCH)
+		err(udev, "specified group '%s' unknown\n", group);
+	else
+		err(udev, "error resolving group '%s': %m\n", group);
+	return 0;
+}
 
 /* handle "[<SUBSYSTEM>/<KERNEL>]<attribute>" format */
 int util_resolve_subsys_kernel(struct udev *udev, const char *string,
@@ -444,7 +444,7 @@ int util_run_program(struct udev *udev, const char *command, char **envp,
 			if (WEXITSTATUS(status) != 0)
 				err = -1;
 		} else {
-			err(udev, "'%s' abnormal exit\n", argv[0]);
+			err(udev, "'%s' abnormal exit\n", command);
 			err = -1;
 		}
 	}