udevadm,..: make --help output of udev tools more like the output of the various...

[elogind.git] / src / udev / udev-builtin-uaccess.c

diff --git a/src/udev/udev-builtin-uaccess.c b/src/udev/udev-builtin-uaccess.c
index ddb015744f2afb0ee1ca85b3cb219192124fbaca..b78c09b9108a44d312309ce0dcca717965ca76d2 100644 (file)
--- a/src/udev/udev-builtin-uaccess.c
+++ b/src/udev/udev-builtin-uaccess.c
@@ -29,13 +29,12 @@
 #include <dirent.h>
 #include <getopt.h>
 
-#include <systemd/sd-login.h>
+#include "systemd/sd-login.h"
 #include "logind-acl.h"
 #include "udev.h"
 #include "util.h"
 
-static int builtin_uaccess(struct udev_device *dev, int argc, char *argv[], bool test)
-{
+static int builtin_uaccess(struct udev_device *dev, int argc, char *argv[], bool test) {
         int r;
         const char *path = NULL, *seat;
         bool changed_acl = false;
@@ -64,7 +63,7 @@ static int builtin_uaccess(struct udev_device *dev, int argc, char *argv[], bool
 
         r = devnode_acl(path, true, false, 0, true, uid);
         if (r < 0) {
-                log_error("Failed to apply ACL on %s: %s", path, strerror(-r));
+                log_error_errno(r, "Failed to apply ACL on %s: %m", path);
                 goto finish;
         }
 
@@ -78,7 +77,7 @@ finish:
                 /* Better be safe than sorry and reset ACL */
                 k = devnode_acl(path, true, false, 0, false, 0);
                 if (k < 0) {
-                        log_error("Failed to apply ACL on %s: %s", path, strerror(-k));
+                        log_error_errno(k, "Failed to apply ACL on %s: %m", path);
                         if (r >= 0)
                                 r = k;
                 }
@@ -90,5 +89,5 @@ finish:
 const struct udev_builtin udev_builtin_uaccess = {
         .name = "uaccess",
         .cmd = builtin_uaccess,
-        .help = "manage device node user ACL",
+        .help = "Manage device node user ACL",
 };