libudev: hwdb - cleanup list before getting new properties

[elogind.git] / src / libudev / libudev-util.c

diff --git a/src/libudev/libudev-util.c b/src/libudev/libudev-util.c
index aed4393d5857e7d8f17e965a823761ea50be04c9..b1c113046ebeb8e4314269bc425b4eb1e5a0d5cd 100644 (file)
--- a/src/libudev/libudev-util.c
+++ b/src/libudev/libudev-util.c
@@ -30,6 +30,8 @@
 /**
  * SECTION:libudev-util
  * @short_description: utils
+ *
+ * Utilities useful when dealing with devices and device node names.
  */
 
 int util_delete_path(struct udev *udev, const char *path)
@@ -83,9 +85,9 @@ uid_t util_lookup_user(struct udev *udev, const char *user)
         if (pw != NULL)
                 return pw->pw_uid;
         if (errno == 0 || errno == ENOENT || errno == ESRCH)
-                err(udev, "specified user '%s' unknown\n", user);
+                udev_err(udev, "specified user '%s' unknown\n", user);
         else
-                err(udev, "error resolving user '%s': %m\n", user);
+                udev_err(udev, "error resolving user '%s': %m\n", user);
         return 0;
 }
 
@@ -118,9 +120,9 @@ gid_t util_lookup_group(struct udev *udev, const char *group)
                         buflen *= 2;
                         continue;
                 } else if (errno == 0 || errno == ENOENT || errno == ESRCH) {
-                        err(udev, "specified group '%s' unknown\n", group);
+                        udev_err(udev, "specified group '%s' unknown\n", group);
                 } else {
-                        err(udev, "error resolving group '%s': %m\n", group);
+                        udev_err(udev, "error resolving group '%s': %m\n", group);
                 }
                 break;
         }
@@ -176,7 +178,7 @@ int util_resolve_subsys_kernel(struct udev *udev, const char *string,
                         util_strscpy(result, maxsize, val);
                 else
                         result[0] = '\0';
-                dbg(udev, "value '[%s/%s]%s' is '%s'\n", subsys, sysname, attr, result);
+                udev_dbg(udev, "value '[%s/%s]%s' is '%s'\n", subsys, sysname, attr, result);
         } else {
                 size_t l;
                 char *s;
@@ -185,7 +187,7 @@ int util_resolve_subsys_kernel(struct udev *udev, const char *string,
                 l = util_strpcpyl(&s, maxsize, udev_device_get_syspath(dev), NULL);
                 if (attr != NULL)
                         util_strpcpyl(&s, l, "/", attr, NULL);
-                dbg(udev, "path '[%s/%s]%s' is '%s'\n", subsys, sysname, attr, result);
+                udev_dbg(udev, "path '[%s/%s]%s' is '%s'\n", subsys, sysname, attr, result);
         }
         udev_device_unref(dev);
         return 0;
@@ -286,26 +288,6 @@ size_t util_path_encode(const char *src, char *dest, size_t size)
         return j;
 }
 
-size_t util_path_decode(char *s)
-{
-        size_t i, j;
-
-        for (i = 0, j = 0; s[i] != '\0'; j++) {
-                if (memcmp(&s[i], "\\x2f", 4) == 0) {
-                        s[j] = '/';
-                        i += 4;
-                } else if (memcmp(&s[i], "\\x5c", 4) == 0) {
-                        s[j] = '\\';
-                        i += 4;
-                } else {
-                        s[j] = s[i];
-                        i++;
-                }
-        }
-        s[j] = '\0';
-        return j;
-}
-
 void util_remove_trailing_chars(char *path, char c)
 {
         size_t len;
@@ -725,3 +707,28 @@ unsigned long long now_usec(void)
                 return 0;
         return ts_usec(&ts);
 }
+
+ssize_t print_kmsg(const char *fmt, ...)
+{
+        int fd;
+        va_list ap;
+        char text[1024];
+        ssize_t len;
+        ssize_t ret;
+
+        fd = open("/dev/kmsg", O_WRONLY|O_NOCTTY|O_CLOEXEC);
+        if (fd < 0)
+                return -errno;
+
+        len = snprintf(text, sizeof(text), "<30>systemd-udevd[%u]: ", getpid());
+
+        va_start(ap, fmt);
+        len += vsnprintf(text + len, sizeof(text) - len, fmt, ap);
+        va_end(ap);
+
+        ret = write(fd, text, len);
+        if (ret < 0)
+                ret = -errno;
+        close(fd);
+        return ret;
+}