fix NAME= and OPTION+="string_escape=..." logic

[elogind.git] / udev / udev-util.c

diff --git a/udev/udev-util.c b/udev/udev-util.c
index d45d444e979229e8613b69c062ad2d7dca4e8d9c..3d5eb7657c40b812e14b6a395e5e8a0629930710 100644 (file)
--- a/udev/udev-util.c
+++ b/udev/udev-util.c
@@ -126,38 +126,117 @@ int util_unlink_secure(struct udev *udev, const char *filename)
 
 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;
 
-       errno = 0;
-       pw = getpwnam(user);
-       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;
+       if (strcmp(user, "root") == 0)
+               return 0;
+       uid = strtoul(user, &endptr, 10);
+       if (endptr[0] == '\0')
+               return uid;
 
-       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;
 
+       if (strcmp(group, "root") == 0)
+               return 0;
+       gid = strtoul(group, &endptr, 10);
+       if (endptr[0] == '\0')
+               return gid;
+
        errno = 0;
-       gr = getgrnam(group);
-       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;
+       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,
+                              char *result, size_t maxsize, int read_value)
+{
+       char temp[UTIL_PATH_SIZE];
+       char *subsys;
+       char *sysname;
+       struct udev_device *dev;
+       char *attr;
+
+       if (string == NULL)
+               string = result;
+       if (string[0] != '[')
+               return -1;
+
+       util_strlcpy(temp, string, sizeof(temp));
 
-       return gid;
+       subsys = &temp[1];
+
+       sysname = strchr(subsys, '/');
+       if (sysname == NULL)
+               return -1;
+       sysname[0] = '\0';
+       sysname = &sysname[1];
+
+       attr = strchr(sysname, ']');
+       if (attr == NULL)
+               return -1;
+       attr[0] = '\0';
+       attr = &attr[1];
+       if (attr[0] == '/')
+               attr = &attr[1];
+       if (attr[0] == '\0')
+               attr = NULL;
+
+       if (read_value && attr == NULL)
+               return -1;
+
+       dev = udev_device_new_from_subsystem_sysname(udev, subsys, sysname);
+       if (dev == NULL)
+               return -1;
+
+       if (read_value) {
+               const char *val;
+
+               val = udev_device_get_sysattr_value(dev, attr);
+               if (val != NULL)
+                       util_strlcpy(result, val, maxsize);
+               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);
+               }
+               info(udev, "path '[%s/%s]%s' is '%s'\n", subsys, sysname, attr, result);
+       }
+       udev_device_unref(dev);
+       return 0;
 }
 
 int util_run_program(struct udev *udev, const char *command, char **envp,
@@ -365,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;
                }
        }