vol_id: fix language in manpage

[elogind.git] / udev / udevadm-monitor.c

diff --git a/udev/udevadm-monitor.c b/udev/udevadm-monitor.c
index 29f819f43971840a043ad5f52426b7f5423e744f..77d98facd5cff1f1f8b999d631f1df4905ab8ed6 100644 (file)
--- a/udev/udevadm-monitor.c
+++ b/udev/udevadm-monitor.c
@@ -1,19 +1,18 @@
 /*
 /*

- * Copyright (C) 2004-2006 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2004-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 version 2 of the License.
- * 
- *     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, write to the Free Software Foundation, Inc.,
- *     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ * 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/>.

  */
 
 #include <unistd.h>
  */
 
 #include <unistd.h>


@@ -42,16 +41,27 @@ static void asmlinkage sig_handler(int signum)
                udev_exit = 1;
 }
 
                udev_exit = 1;
 }
 

-static int print_properties_cb(struct udev_device *udev_device, const char *key, const char *value, void *data)
+static void print_device(struct udev_device *device, const char *source, int env)

 {
 {

-       printf("%s=%s\n", key, value);
-       return 0;
-}
-
-static void print_properties(struct udev_device *device)
-{
-       udev_device_get_properties(device, print_properties_cb, NULL);
-       printf("\n");
+       struct timeval tv;
+       struct timezone tz;
+
+       gettimeofday(&tv, &tz);
+       printf("%-6s[%llu.%06u] %-8s %s (%s)\n",
+              source,
+              (unsigned long long) tv.tv_sec, (unsigned int) tv.tv_usec,
+              udev_device_get_action(device),
+              udev_device_get_devpath(device),
+              udev_device_get_subsystem(device));
+       if (env) {
+               struct udev_list_entry *list_entry;
+
+               udev_list_entry_foreach(list_entry, udev_device_get_properties_list_entry(device))
+                       printf("%s=%s\n",
+                              udev_list_entry_get_name(list_entry),
+                              udev_list_entry_get_value(list_entry));
+               printf("\n");
+       }

 }
 
 int udevadm_monitor(struct udev *udev, int argc, char *argv[])
 }
 
 int udevadm_monitor(struct udev *udev, int argc, char *argv[])


@@ -67,10 +77,10 @@ int udevadm_monitor(struct udev *udev, int argc, char *argv[])
        int rc = 0;
 
        static const struct option options[] = {
        int rc = 0;
 
        static const struct option options[] = {

-               { "environment", 0, NULL, 'e' },
-               { "kernel", 0, NULL, 'k' },
-               { "udev", 0, NULL, 'u' },
-               { "help", 0, NULL, 'h' },
+               { "environment", no_argument, NULL, 'e' },
+               { "kernel", no_argument, NULL, 'k' },
+               { "udev", no_argument, NULL, 'u' },
+               { "help", no_argument, NULL, 'h' },

                {}
        };
 
                {}
        };
 


@@ -94,7 +104,7 @@ int udevadm_monitor(struct udev *udev, int argc, char *argv[])
                               "  --env    print the whole event environment\n"
                               "  --kernel print kernel uevents\n"
                               "  --udev   print udev events\n"
                               "  --env    print the whole event environment\n"
                               "  --kernel print kernel uevents\n"
                               "  --udev   print udev events\n"

-                              "  --help   print this help text\n\n");
+                              "  --help\n\n");

                default:
                        goto out;
                }
                default:
                        goto out;
                }


@@ -147,9 +157,6 @@ int udevadm_monitor(struct udev *udev, int argc, char *argv[])
 
        while (!udev_exit) {
                int fdcount;
 
        while (!udev_exit) {
                int fdcount;

-               struct timeval tv;
-               struct timezone tz;
-               char timestr[64];

 
                FD_ZERO(&readfds);
                if (kernel_monitor != NULL)
 
                FD_ZERO(&readfds);
                if (kernel_monitor != NULL)


@@ -161,39 +168,27 @@ int udevadm_monitor(struct udev *udev, int argc, char *argv[])
                                 &readfds, NULL, NULL, NULL);
                if (fdcount < 0) {
                        if (errno != EINTR)
                                 &readfds, NULL, NULL, NULL);
                if (fdcount < 0) {
                        if (errno != EINTR)

-                               fprintf(stderr, "error receiving uevent message: %s\n", strerror(errno));
+                               fprintf(stderr, "error receiving uevent message: %m\n");

                        continue;
                }
 
                        continue;
                }
 

-               if (gettimeofday(&tv, &tz) == 0) {
-                       snprintf(timestr, sizeof(timestr), "%llu.%06u",
-                                (unsigned long long) tv.tv_sec, (unsigned int) tv.tv_usec);
-               } else
-                       timestr[0] = '\0';
-

                if ((kernel_monitor != NULL) && FD_ISSET(udev_monitor_get_fd(kernel_monitor), &readfds)) {
                if ((kernel_monitor != NULL) && FD_ISSET(udev_monitor_get_fd(kernel_monitor), &readfds)) {

-                       struct udev_device *device = udev_monitor_receive_device(kernel_monitor);
+                       struct udev_device *device;
+
+                       device = udev_monitor_receive_device(kernel_monitor);

                        if (device == NULL)
                                continue;
                        if (device == NULL)
                                continue;

-                       printf("UEVENT[%s] %-8s %s (%s)\n", timestr,
-                              udev_device_get_action(device),
-                              udev_device_get_devpath(device),
-                              udev_device_get_subsystem(device));
-                       if (env)
-                               print_properties(device);
+                       print_device(device, "UEVENT", env);

                        udev_device_unref(device);
                }
 
                if ((udev_monitor != NULL) && FD_ISSET(udev_monitor_get_fd(udev_monitor), &readfds)) {
                        udev_device_unref(device);
                }
 
                if ((udev_monitor != NULL) && FD_ISSET(udev_monitor_get_fd(udev_monitor), &readfds)) {

-                       struct udev_device *device = udev_monitor_receive_device(udev_monitor);
+                       struct udev_device *device;
+
+                       device = udev_monitor_receive_device(udev_monitor);

                        if (device == NULL)
                                continue;
                        if (device == NULL)
                                continue;

-                       printf("UDEV  [%s] %-8s %s (%s)\n", timestr,
-                              udev_device_get_action(device),
-                              udev_device_get_devpath(device),
-                              udev_device_get_subsystem(device));
-                       if (env)
-                               print_properties(device);
+                       print_device(device, "UDEV", env);

                        udev_device_unref(device);
                }
        }
                        udev_device_unref(device);
                }
        }