rules_generator: fix write_cd_rules when similar names exist in the root directory

[elogind.git] / udevsettle.c

diff --git a/udevsettle.c b/udevsettle.c
index b38968e7dfa644b6b08501a771fdafd945041bee..42a03bafe38cd15452b0a63061eead1b44319e6d 100644 (file)
--- a/udevsettle.c
+++ b/udevsettle.c
@@ -1,6 +1,4 @@
 /*
- * udevsettle.c
- *
  * Copyright (C) 2006 Kay Sievers <kay@vrfy.org>
  *
  *     This program is free software; you can redistribute it and/or modify it
@@ -14,7 +12,7 @@
  * 
  *     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.,
- *     675 Mass Ave, Cambridge, MA 02139, USA.
+ *     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  */
 
@@ -27,6 +25,7 @@
 #include <dirent.h>
 #include <fcntl.h>
 #include <syslog.h>
+#include <getopt.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 
@@ -62,33 +61,37 @@ int main(int argc, char *argv[], char *envp[])
        ssize_t len;
        int timeout = DEFAULT_TIMEOUT;
        int loop;
-       int i;
+       static const struct option options[] = {
+               { "timeout", 1, NULL, 't' },
+               { "help", 0, NULL, 'h' },
+               {}
+       };
+       int option;
        int rc = 1;
+       int seconds;
 
        logging_init("udevsettle");
        udev_config_init();
        dbg("version %s", UDEV_VERSION);
        sysfs_init();
 
-       for (i = 1 ; i < argc; i++) {
-               char *arg = argv[i];
-
-               if (strncmp(arg, "--timeout=", 10) == 0) {
-                       char *str = &arg[10];
-                       int seconds;
+       while (1) {
+               option = getopt_long(argc, argv, "t:h", options, NULL);
+               if (option == -1)
+                       break;
 
-                       seconds = atoi(str);
+               switch (option) {
+               case 't':
+                       seconds = atoi(optarg);
                        if (seconds > 0)
                                timeout = seconds;
                        else
                                fprintf(stderr, "invalid timeout value\n");
                        dbg("timeout=%i", timeout);
-               } else if (strcmp(arg, "--help") == 0 || strcmp(arg, "-h") == 0) {
-                       printf("Usage: udevsettle [--help] [--timeout=<seconds>]\n");
+                       break;
+               case 'h':
+                       printf("Usage: udevsettle [--help] [--timeout=<seconds>]\n\n");
                        goto exit;
-               } else {
-                       fprintf(stderr, "unrecognized option '%s'\n", arg);
-                       err("unrecognized option '%s'\n", arg);
                }
        }
 
@@ -112,9 +115,9 @@ int main(int argc, char *argv[], char *envp[])
                        goto exit;
                }
 
-               /* read current kernel seqnum */
-               strlcpy(filename, sysfs_path, sizeof(filename));
-               strlcat(filename, "/kernel/uevent_seqnum", sizeof(filename));
+               /* read current udev seqnum */
+               strlcpy(filename, udev_root, sizeof(filename));
+               strlcat(filename, "/" EVENT_SEQNUM, sizeof(filename));
                fd = open(filename, O_RDONLY);
                if (fd < 0)
                        goto exit;
@@ -123,12 +126,12 @@ int main(int argc, char *argv[], char *envp[])
                if (len <= 0)
                        goto exit;
                seqnum[len] = '\0';
-               seq_kernel = strtoull(seqnum, NULL, 10);
-               info("kernel seqnum = %llu", seq_kernel);
+               seq_udev = strtoull(seqnum, NULL, 10);
+               info("udev seqnum = %llu", seq_udev);
 
-               /* read current udev seqnum */
-               strlcpy(filename, udev_root, sizeof(filename));
-               strlcat(filename, "/" EVENT_SEQNUM, sizeof(filename));
+               /* read current kernel seqnum */
+               strlcpy(filename, sysfs_path, sizeof(filename));
+               strlcat(filename, "/kernel/uevent_seqnum", sizeof(filename));
                fd = open(filename, O_RDONLY);
                if (fd < 0)
                        goto exit;
@@ -137,8 +140,8 @@ int main(int argc, char *argv[], char *envp[])
                if (len <= 0)
                        goto exit;
                seqnum[len] = '\0';
-               seq_udev = strtoull(seqnum, NULL, 10);
-               info("udev seqnum = %llu", seq_udev);
+               seq_kernel = strtoull(seqnum, NULL, 10);
+               info("kernel seqnum = %llu", seq_kernel);
 
                /* make sure all kernel events have arrived in the queue */
                if (seq_udev >= seq_kernel) {