udevadm: monitor - use / as separator in --subsystem-match=subsystem[/devtype]

diff --git a/udev/udevadm-monitor.c b/udev/udevadm-monitor.c
index 4063c48303c08544a579ab07fa94d50acfd2a34c..d136c6070abe5604b32333eaf6e0c5b2cfb26e9a 100644 (file)
--- a/udev/udevadm-monitor.c
+++ b/udev/udevadm-monitor.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (C) 2004-2009 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2004-2010 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
  *
  * 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


@@ -111,7 +111,7 @@ int udevadm_monitor(struct udev *udev, int argc, char *argv[])
                                char *devtype;
 
                                util_strscpy(subsys, sizeof(subsys), optarg);
                                char *devtype;
 
                                util_strscpy(subsys, sizeof(subsys), optarg);

-                               devtype = strchr(subsys, ':');
+                               devtype = strchr(subsys, '/');

                                if (devtype != NULL) {
                                        devtype[0] = '\0';
                                        devtype++;
                                if (devtype != NULL) {
                                        devtype[0] = '\0';
                                        devtype++;


@@ -121,10 +121,10 @@ int udevadm_monitor(struct udev *udev, int argc, char *argv[])
                        }
                case 'h':
                        printf("Usage: udevadm monitor [--property] [--kernel] [--udev] [--help]\n"
                        }
                case 'h':
                        printf("Usage: udevadm monitor [--property] [--kernel] [--udev] [--help]\n"

-                              "  --property                    print the event properties\n"
-                              "  --kernel                      print kernel uevents\n"
-                              "  --udev                        print udev events\n"
-                              "  --subsystem-match=<subsystem> filter events\n"
+                              "  --property                              print the event properties\n"
+                              "  --kernel                                print kernel uevents\n"
+                              "  --udev                                  print udev events\n"
+                              "  --subsystem-match=<subsystem[/devtype]> filter events by subsystem\n"

                               "  --help\n\n");
                default:
                        goto out;
                               "  --help\n\n");
                default:
                        goto out;

diff --git a/udev/udevadm.xml b/udev/udevadm.xml
index ad492494a11ecb7d8de6e0ccd3f834b7a8888d07..fa1742badaef2fd9150c395e41bd5a3ab05f4119 100644 (file)
--- a/udev/udevadm.xml
+++ b/udev/udevadm.xml
@@ -349,6 +349,12 @@
                 <para>Also print the properties of the event.</para>
               </listitem>
             </varlistentry>
                 <para>Also print the properties of the event.</para>
               </listitem>
             </varlistentry>

+            <varlistentry>
+              <term><option>--subsystem-match=<replaceable>string[/string]</replaceable></option></term>
+              <listitem>
+                <para>Filter events by subsystem[/devtype]. Only udev events with a matching subsystem value will pass.</para>
+              </listitem>
+            </varlistentry>

             <varlistentry>
               <term><option>--help</option></term>
               <listitem>
             <varlistentry>
               <term><option>--help</option></term>
               <listitem>