switch mailing lists to linux-hotplug@vger.kernel.org

[elogind.git] / udevtrigger.c

diff --git a/udevtrigger.c b/udevtrigger.c
index cf8f209b1c105155727fe9f186218dd19832f6de..0a9dc669097c286bac02104816947e8c6b08dbff 100644 (file)
--- a/udevtrigger.c
+++ b/udevtrigger.c
@@ -42,20 +42,6 @@ LIST_HEAD(filter_subsystem_nomatch_list);
 LIST_HEAD(filter_attr_match_list);
 LIST_HEAD(filter_attr_nomatch_list);
 
-#ifdef USE_LOG
-void log_message(int priority, const char *format, ...)
-{
-       va_list args;
-
-       if (priority > udev_log_priority)
-               return;
-
-       va_start(args, format);
-       vsyslog(priority, format, args);
-       va_end(args);
-}
-#endif
-
 /* devices that should run last cause of their dependencies */
 static int delay_device(const char *devpath)
 {
@@ -435,6 +421,8 @@ static void scan_failed(void)
                                continue;
 
                        start = strlcpy(device, sysfs_path, sizeof(device));
+                       if(start >= sizeof(device))
+                               start = sizeof(device) - 1;
                        strlcat(device, dent->d_name, sizeof(device));
                        path_decode(&device[start]);
                        device_list_insert(device);
@@ -443,7 +431,7 @@ static void scan_failed(void)
        }
 }
 
-int main(int argc, char *argv[], char *envp[])
+int udevtrigger(int argc, char *argv[], char *envp[])
 {
        int failed = 0;
        int option;
@@ -497,7 +485,7 @@ int main(int argc, char *argv[], char *envp[])
                        name_list_add(&filter_attr_nomatch_list, optarg, 0);
                        break;
                case 'h':
-                       printf("Usage: udevtrigger OPTIONS\n"
+                       printf("Usage: udevadm trigger OPTIONS\n"
                               "  --verbose                       print the list of devices while running\n"
                               "  --dry-run                       do not actually trigger the events\n"
                               "  --retry-failed                  trigger only the events which have been\n"