Merge pull request #11827 from keszybz/pkgconfig-variables

[thirdparty/systemd.git] / src / test / test-udev.c

diff --git a/src/test/test-udev.c b/src/test/test-udev.c
index 49198f8633fcc3bd9bb55da3baa6579d6a7a27af..ab31f5a2f1bbaa25c363aa97068bac51550eb70f 100644 (file)
--- a/src/test/test-udev.c
+++ b/src/test/test-udev.c
@@ -11,9 +11,11 @@
 #include <sys/signalfd.h>
 #include <unistd.h>
 
+#include "build.h"
 #include "device-private.h"
 #include "fs-util.h"
 #include "log.h"
+#include "main-func.h"
 #include "missing.h"
 #include "mkdir.h"
 #include "selinux-util.h"
@@ -53,9 +55,9 @@ static int fake_filesystems(void) {
         return 0;
 }
 
-int main(int argc, char *argv[]) {
-        _cleanup_(udev_rules_unrefp) struct udev_rules *rules = NULL;
-        _cleanup_(udev_event_freep) struct udev_event *event = NULL;
+static int run(int argc, char *argv[]) {
+        _cleanup_(udev_rules_freep) UdevRules *rules = NULL;
+        _cleanup_(udev_event_freep) UdevEvent *event = NULL;
         _cleanup_(sd_device_unrefp) sd_device *dev = NULL;
         const char *devpath, *devname, *action;
         int r;
@@ -64,35 +66,34 @@ int main(int argc, char *argv[]) {
 
         if (!IN_SET(argc, 2, 3)) {
                 log_error("This program needs one or two arguments, %d given", argc - 1);
-                return EXIT_FAILURE;
+                return -EINVAL;
         }
 
-        if (fake_filesystems() < 0)
-                return EXIT_FAILURE;
+        r = fake_filesystems();
+        if (r < 0)
+                return r;
 
         if (argc == 2) {
                 if (!streq(argv[1], "check")) {
                         log_error("Unknown argument: %s", argv[1]);
-                        return EXIT_FAILURE;
+                        return -EINVAL;
                 }
 
-                return EXIT_SUCCESS;
+                return 0;
         }
 
-        log_debug("version %s", PACKAGE_VERSION);
+        log_debug("version %s", GIT_VERSION);
         mac_selinux_init();
 
         action = argv[1];
         devpath = argv[2];
 
-        rules = udev_rules_new(RESOLVE_NAME_EARLY);
+        assert_se(udev_rules_new(&rules, RESOLVE_NAME_EARLY) == 0);
 
         const char *syspath = strjoina("/sys", devpath);
         r = device_new_from_synthetic_event(&dev, syspath, action);
-        if (r < 0) {
-                log_debug_errno(r, "Failed to open device '%s'", devpath);
-                goto out;
-        }
+        if (r < 0)
+                return log_debug_errno(r, "Failed to open device '%s'", devpath);
 
         assert_se(event = udev_event_new(dev, 0, NULL));
 
@@ -113,17 +114,19 @@ int main(int argc, char *argv[]) {
 
                         (void) mkdir_parents_label(devname, 0755);
                         (void) sd_device_get_devnum(dev, &devnum);
-                        assert_se(mknod(devname, mode, devnum) == 0);
+                        if (mknod(devname, mode, devnum) < 0)
+                                return log_error_errno(errno, "mknod() failed for '%s': %m", devname);
                 } else {
-                        assert_se(unlink(devname) == 0);
+                        if (unlink(devname) < 0)
+                                return log_error_errno(errno, "unlink('%s') failed: %m", devname);
                         (void) rmdir_parents(devname, "/");
                 }
         }
 
         udev_event_execute_rules(event, 3 * USEC_PER_SEC, NULL, rules);
         udev_event_execute_run(event, 3 * USEC_PER_SEC);
-out:
-        mac_selinux_finish();
 
-        return EXIT_SUCCESS;
+        return 0;
 }
+
+DEFINE_MAIN_FUNCTION(run);