Also merge into the top-level Makefile.am the simpler extras.

[elogind.git] / udev / test-udev.c

diff --git a/udev/test-udev.c b/udev/test-udev.c
index d304a1cc159a96ea8ac5a7a1fb2f4708440c4ada..c6b8bf573ba774b7d7464906cff1a42f1935fca3 100644 (file)
--- a/udev/test-udev.c
+++ b/udev/test-udev.c
@@ -30,14 +30,14 @@
 
 #include "udev.h"
 
-static void asmlinkage sig_handler(int signum)
+static void sig_handler(int signum)
 {
        switch (signum) {
                case SIGALRM:
-                       exit(1);
+                       _exit(1);
                case SIGINT:
                case SIGTERM:
-                       exit(20 + signum);
+                       _exit(20 + signum);
        }
 }
 
@@ -58,11 +58,11 @@ int main(int argc, char *argv[])
        if (udev == NULL)
                exit(1);
        info(udev, "version %s\n", VERSION);
-       selinux_init(udev);
+       udev_selinux_init(udev);
 
        /* set signal handlers */
        memset(&act, 0x00, sizeof(act));
-       act.sa_handler = (void (*)(int)) sig_handler;
+       act.sa_handler = sig_handler;
        sigemptyset (&act.sa_mask);
        act.sa_flags = 0;
        sigaction(SIGALRM, &act, NULL);
@@ -81,10 +81,9 @@ int main(int argc, char *argv[])
                goto exit;
        }
 
-       rules = udev_rules_new(udev, 0);
+       rules = udev_rules_new(udev, 1);
 
-       util_strlcpy(syspath, udev_get_sys_path(udev), sizeof(syspath));
-       util_strlcat(syspath, devpath, sizeof(syspath));
+       util_strscpyl(syspath, sizeof(syspath), udev_get_sys_path(udev), devpath, NULL);
        dev = udev_device_new_from_syspath(udev, syspath);
        if (dev == NULL) {
                info(udev, "unknown device '%s'\n", devpath);
@@ -104,14 +103,14 @@ int main(int argc, char *argv[])
                alarm(udev_device_get_event_timeout(dev));
 
        if (err == 0 && !event->ignore_device && udev_get_run(udev))
-               udev_rules_run(event);
+               udev_event_execute_run(event);
 
        udev_event_unref(event);
        udev_device_unref(dev);
 fail:
        udev_rules_unref(rules);
 exit:
-       selinux_exit(udev);
+       udev_selinux_exit(udev);
        udev_unref(udev);
        if (err != 0)
                return 1;