test-libudev: update monitor source

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

diff --git a/udev/lib/test-libudev.c b/udev/lib/test-libudev.c
index 592a147e0124461f4871eb23702bd6853e0760e3..be167cff47436ae7ddf27891e930d532af285383 100644 (file)
--- a/udev/lib/test-libudev.c
+++ b/udev/lib/test-libudev.c
@@ -3,18 +3,10 @@
  *
  * Copyright (C) 2008 Kay Sievers <kay.sievers@vrfy.org>
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  */
 
 #include <stdio.h>
@@ -225,13 +217,13 @@ static int test_enumerate_print_list(struct udev_enumerate *enumerate)
        return count;
 }
 
-static int test_monitor(struct udev *udev, const char *socket_path)
+static int test_monitor(struct udev *udev)
 {
        struct udev_monitor *udev_monitor;
        fd_set readfds;
        int fd;
 
-       udev_monitor = udev_monitor_new_from_socket(udev, socket_path);
+       udev_monitor = udev_monitor_new_from_netlink(udev, "udev");
        if (udev_monitor == NULL) {
                printf("no socket\n");
                return -1;
@@ -251,7 +243,7 @@ static int test_monitor(struct udev *udev, const char *socket_path)
                FD_SET(STDIN_FILENO, &readfds);
                FD_SET(fd, &readfds);
 
-               printf("waiting for events on %s, press ENTER to exit\n", socket_path);
+               printf("waiting for events from udev, press ENTER to exit\n");
                fdcount = select(fd+1, &readfds, NULL, NULL, NULL);
                printf("select fd count: %i\n", fdcount);
 
@@ -385,7 +377,6 @@ int main(int argc, char *argv[])
        static const struct option options[] = {
                { "syspath", required_argument, NULL, 'p' },
                { "subsystem", required_argument, NULL, 's' },
-               { "socket", required_argument, NULL, 'S' },
                { "debug", no_argument, NULL, 'd' },
                { "help", no_argument, NULL, 'h' },
                { "version", no_argument, NULL, 'V' },
@@ -393,7 +384,6 @@ int main(int argc, char *argv[])
        };
        const char *syspath = "/devices/virtual/mem/null";
        const char *subsystem = NULL;
-       const char *socket = "@/org/kernel/udev/monitor";
        char path[1024];
        const char *str;
 
@@ -420,15 +410,12 @@ int main(int argc, char *argv[])
                case 's':
                        subsystem = optarg;
                        break;
-               case 'S':
-                       socket = optarg;
-                       break;
                case 'd':
                        if (udev_get_log_priority(udev) < LOG_INFO)
                                udev_set_log_priority(udev, LOG_INFO);
                        break;
                case 'h':
-                       printf("--debug --syspath= --subsystem= --socket= --help\n");
+                       printf("--debug --syspath= --subsystem= --help\n");
                        goto out;
                case 'V':
                        printf("%s\n", VERSION);
@@ -458,7 +445,7 @@ int main(int argc, char *argv[])
 
        test_queue(udev);
 
-       test_monitor(udev, socket);
+       test_monitor(udev);
 out:
        udev_unref(udev);
        return 0;