struct stat stats;
int ret;
- util_strlcpy(p, path, sizeof(p));
+ util_strscpy(p, sizeof(p), path);
pos = strrchr(p, '/');
if (pos == p || pos == NULL)
return 0;
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)
+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 */
struct udev_device *dev;
char *attr;
- if (string == NULL)
- string = result;
if (string[0] != '[')
return -1;
- util_strlcpy(temp, string, sizeof(temp));
+ util_strscpy(temp, sizeof(temp), string);
subsys = &temp[1];
val = udev_device_get_sysattr_value(dev, attr);
if (val != NULL)
- util_strlcpy(result, val, maxsize);
+ util_strscpy(result, maxsize, val);
else
result[0] = '\0';
info(udev, "value '[%s/%s]%s' is '%s'\n", subsys, sysname, attr, result);
} else {
- util_strlcpy(result, udev_device_get_syspath(dev), maxsize);
- if (attr != NULL) {
- util_strlcat(result, "/", maxsize);
- util_strlcat(result, attr, maxsize);
- }
+ size_t l;
+ char *s;
+
+ s = result;
+ l = util_strpcpyl(&s, maxsize, udev_device_get_syspath(dev), NULL);
+ if (attr != NULL)
+ util_strpcpyl(&s, l, "/", attr, NULL);
info(udev, "path '[%s/%s]%s' is '%s'\n", subsys, sysname, attr, result);
}
udev_device_unref(dev);
int err = 0;
/* build argv from command */
- util_strlcpy(arg, command, sizeof(arg));
+ util_strscpy(arg, sizeof(arg), command);
i = 0;
if (strchr(arg, ' ') != NULL) {
char *pos = arg;
}
/* allow programs in /lib/udev/ to be called without the path */
- if (strchr(argv[0], '/') == NULL) {
- util_strlcpy(program, UDEV_PREFIX "/lib/udev/", sizeof(program));
- util_strlcat(program, argv[0], sizeof(program));
+ if (argv[0][0] != '/') {
+ util_strscpyl(program, sizeof(program), UDEV_PREFIX "/lib/udev/", argv[0], NULL);
argv[0] = program;
}
if (WEXITSTATUS(status) != 0)
err = -1;
} else {
- err(udev, "'%s' abnormal exit\n", argv[0]);
+ err(udev, "'%s' abnormal exit\n", command);
err = -1;
}
}