udevinfo: do not replace chars when printing ATTR== matches

[elogind.git] / udev_rules.c

diff --git a/udev_rules.c b/udev_rules.c
index dcd091485b8e74c433916941c5aabd9e000f8e73..eccea3b57c75c1a4aae4db773c2bdd1e4ff78e4f 100644 (file)
--- a/udev_rules.c
+++ b/udev_rules.c
@@ -26,6 +26,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include <syslog.h>
+#include <dirent.h>
 #include <fnmatch.h>
 #include <sys/socket.h>
 #include <sys/un.h>
@@ -349,11 +350,6 @@ static int import_keys_into_env(struct udevice *udev, const char *buf, size_t bu
                cur += count+1;
                lineno++;
 
-               if (count >= sizeof(line)) {
-                       err("line too long, conf line skipped %s, line %d", udev_config_filename, lineno);
-                       continue;
-               }
-
                /* eat the whitespace */
                while ((count > 0) && isspace(bufline[0])) {
                        bufline++;
@@ -366,6 +362,11 @@ static int import_keys_into_env(struct udevice *udev, const char *buf, size_t bu
                if (bufline[0] == COMMENT_CHARACTER)
                        continue;
 
+               if (count >= sizeof(line)) {
+                       err("line too long, conf line skipped %s, line %d", udev_config_filename, lineno);
+                       continue;
+               }
+
                memcpy(line, bufline, count);
                line[count] = '\0';
 
@@ -454,24 +455,35 @@ static int import_parent_into_env(struct udevice *udev, const char *filter)
        return rc;
 }
 
-static int pass_env_to_socket(const char *sockname, const char *devpath, const char *action)
+static int pass_env_to_socket(const char *sockpath, const char *devpath, const char *action)
 {
        int sock;
        struct sockaddr_un saddr;
-       socklen_t addrlen;
+       socklen_t saddrlen;
+       struct stat stats;
        char buf[2048];
        size_t bufpos = 0;
        int i;
        ssize_t count;
        int retval = 0;
 
-       dbg("pass environment to socket '%s'", sockname);
+       dbg("pass environment to socket '%s'", sockpath);
        sock = socket(AF_LOCAL, SOCK_DGRAM, 0);
        memset(&saddr, 0x00, sizeof(struct sockaddr_un));
        saddr.sun_family = AF_LOCAL;
-       /* abstract namespace only */
-       strcpy(&saddr.sun_path[1], sockname);
-       addrlen = offsetof(struct sockaddr_un, sun_path) + strlen(saddr.sun_path+1) + 1;
+       if (sockpath[0] == '@') {
+               /* abstract namespace socket requested */
+               strlcpy(&saddr.sun_path[1], &sockpath[1], sizeof(saddr.sun_path)-1);
+               saddrlen = offsetof(struct sockaddr_un, sun_path) + 1 + strlen(&saddr.sun_path[1]);
+       } else if (stat(sockpath, &stats) == 0 && S_ISSOCK(stats.st_mode)) {
+               /* existing socket file */
+               strlcpy(saddr.sun_path, sockpath, sizeof(saddr.sun_path));
+               saddrlen = offsetof(struct sockaddr_un, sun_path) + strlen(saddr.sun_path);
+       } else {
+               /* no socket file, assume abstract namespace socket */
+               strlcpy(&saddr.sun_path[1], sockpath, sizeof(saddr.sun_path)-1);
+               saddrlen = offsetof(struct sockaddr_un, sun_path) + 1 + strlen(&saddr.sun_path[1]);
+       }
 
        bufpos = snprintf(buf, sizeof(buf)-1, "%s@%s", action, devpath);
        bufpos++;
@@ -482,10 +494,10 @@ static int pass_env_to_socket(const char *sockname, const char *devpath, const c
        if (bufpos > sizeof(buf))
                bufpos = sizeof(buf);
 
-       count = sendto(sock, &buf, bufpos, 0, (struct sockaddr *)&saddr, addrlen);
+       count = sendto(sock, &buf, bufpos, 0, (struct sockaddr *)&saddr, saddrlen);
        if (count < 0)
                retval = -1;
-       info("passed %zi bytes to socket '%s', ", count, sockname);
+       info("passed %zi bytes to socket '%s', ", count, sockpath);
 
        close(sock);
        return retval;
@@ -585,6 +597,44 @@ out:
        return found;
 }
 
+static int attr_subst_subdir(char *attr, size_t len)
+{
+       char *pos;
+       int found = 0;
+
+       pos = strstr(attr, "/*/");
+       if (pos != NULL) {
+               char str[PATH_SIZE];
+               DIR *dir;
+
+               pos[1] = '\0';
+               strlcpy(str, &pos[2], sizeof(str));
+               dir = opendir(attr);
+               if (dir != NULL) {
+                       struct dirent *dent;
+
+                       for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) {
+                               struct stat stats;
+
+                               if (dent->d_name[0] == '.')
+                                       continue;
+                               strlcat(attr, dent->d_name, len);
+                               strlcat(attr, str, len);
+                               if (stat(attr, &stats) == 0) {
+                                       found = 1;
+                                       break;
+                               }
+                               pos[1] = '\0';
+                       }
+                       closedir(dir);
+               }
+               if (!found)
+                       strlcat(attr, str, len);
+       }
+
+       return found;
+}
+
 void udev_rules_apply_format(struct udevice *udev, char *string, size_t maxsize)
 {
        char temp[PATH_SIZE];
@@ -1022,6 +1072,8 @@ static int match_rule(struct udevice *udev, struct udev_rule *rule)
                        strlcpy(filename, tmp, sizeof(filename));
                }
 
+               attr_subst_subdir(filename, sizeof(filename));
+
                match = (stat(filename, &statbuf) == 0);
                info("'%s' %s", filename, match ? "exists" : "does not exist");
                if (match && rule->test_mode_mask > 0) {
@@ -1264,6 +1316,8 @@ try_parent:
                                strlcat(attr, key_name, sizeof(attr));
                        }
 
+                       attr_subst_subdir(attr, sizeof(attr));
+
                        strlcpy(value, key_val(rule, &pair->key), sizeof(value));
                        udev_rules_apply_format(udev, value, sizeof(value));
                        info("writing '%s' to sysfs file '%s'", value, attr);
@@ -1446,7 +1500,7 @@ int udev_rules_get_name(struct udev_rules *rules, struct udevice *udev)
        }
 
        if (!name_set) {
-               info("no node name set, will use kernel name '%s'", udev->name);
+               info("no node name set, will use kernel name '%s'", udev->dev->kernel);
                strlcpy(udev->name, udev->dev->kernel, sizeof(udev->name));
        }