uid_t util_lookup_user(struct udev *udev, const char *user)
{
+ char *endptr;
int buflen = sysconf(_SC_GETPW_R_SIZE_MAX);
char buf[buflen];
struct passwd pwbuf;
struct passwd *pw;
- uid_t uid = 0;
+ uid_t uid;
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) {
- 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);
- } else
- uid = pw->pw_uid;
-
- return uid;
+ 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;
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) {
- 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);
- } else
- gid = gr->gr_gid;
- return gid;
+ 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 */
if (WEXITSTATUS(status) != 0)
err = -1;
} else {
- err(udev, "'%s' abnormal exit\n", argv[0]);
+ err(udev, "'%s' abnormal exit\n", command);
err = -1;
}
}