X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibudev%2Flibudev-util.c;h=e2fb449d64014d0791949b6abc9b38a4d78b64c2;hb=cba6e0627d659a33df31aaa74d0d701c4bc9f317;hp=944d9dfcbbe6b9961d7a0fe1b8d6d99bc6d09239;hpb=21dbe43aece5b6fc87860de175f067b56649e7d1;p=elogind.git

diff --git a/src/libudev/libudev-util.c b/src/libudev/libudev-util.c
index 944d9dfcb..e2fb449d6 100644
--- a/src/libudev/libudev-util.c
+++ b/src/libudev/libudev-util.c
@@ -85,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;
 }
 
@@ -120,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;
         }
@@ -178,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;
@@ -187,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;
@@ -727,3 +727,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;
+}