chiark / gitweb /
fix some fallout from tab removal
[elogind.git] / src / udevadm.c
index 5410f00c026e73fe308a965ddafc94c9a0ac2da9..224ece0bb707ccf3e01360506887c1d656979390 100644 (file)
 static bool debug;
 
 void udev_main_log(struct udev *udev, int priority,
-                  const char *file, int line, const char *fn,
-                  const char *format, va_list args)
+                   const char *file, int line, const char *fn,
+                   const char *format, va_list args)
 {
-       if (debug) {
-               fprintf(stderr, "%s: ", fn);
-               vfprintf(stderr, format, args);
-       } else {
-               va_list args2;
-
-               va_copy(args2, args);
-               vfprintf(stderr, format, args2);
-               va_end(args2);
-               vsyslog(priority, format, args);
-       }
+        if (debug) {
+                fprintf(stderr, "%s: ", fn);
+                vfprintf(stderr, format, args);
+        } else {
+                va_list args2;
+
+                va_copy(args2, args);
+                vfprintf(stderr, format, args2);
+                va_end(args2);
+                vsyslog(priority, format, args);
+        }
 }
 
 static int adm_version(struct udev *udev, int argc, char *argv[])
 {
-       printf("%s\n", VERSION);
-       return 0;
+        printf("%s\n", VERSION);
+        return 0;
 }
 static const struct udevadm_cmd udevadm_version = {
-       .name = "version",
-       .cmd = adm_version,
+        .name = "version",
+        .cmd = adm_version,
 };
 
 static int adm_help(struct udev *udev, int argc, char *argv[]);
 static const struct udevadm_cmd udevadm_help = {
-       .name = "help",
-       .cmd = adm_help,
+        .name = "help",
+        .cmd = adm_help,
 };
 
 static const struct udevadm_cmd *udevadm_cmds[] = {
-       &udevadm_info,
-       &udevadm_trigger,
-       &udevadm_settle,
-       &udevadm_control,
-       &udevadm_monitor,
-       &udevadm_test,
-       &udevadm_test_builtin,
-       &udevadm_version,
-       &udevadm_help,
+        &udevadm_info,
+        &udevadm_trigger,
+        &udevadm_settle,
+        &udevadm_control,
+        &udevadm_monitor,
+        &udevadm_test,
+        &udevadm_test_builtin,
+        &udevadm_version,
+        &udevadm_help,
 };
 
 static int adm_help(struct udev *udev, int argc, char *argv[])
 {
-       unsigned int i;
-
-       fprintf(stderr, "Usage: udevadm [--help] [--version] [--debug] COMMAND [COMMAND OPTIONS]\n");
-       for (i = 0; i < ARRAY_SIZE(udevadm_cmds); i++)
-               if (udevadm_cmds[i]->help != NULL)
-                       printf("  %-12s %s\n", udevadm_cmds[i]->name, udevadm_cmds[i]->help);
-       fprintf(stderr, "\n");
-       return 0;
+        unsigned int i;
+
+        fprintf(stderr, "Usage: udevadm [--help] [--version] [--debug] COMMAND [COMMAND OPTIONS]\n");
+        for (i = 0; i < ARRAY_SIZE(udevadm_cmds); i++)
+                if (udevadm_cmds[i]->help != NULL)
+                        printf("  %-12s %s\n", udevadm_cmds[i]->name, udevadm_cmds[i]->help);
+        fprintf(stderr, "\n");
+        return 0;
 }
 
 static int run_command(struct udev *udev, const struct udevadm_cmd *cmd, int argc, char *argv[])
 {
-       if (cmd->debug) {
-               debug = true;
-               if (udev_get_log_priority(udev) < LOG_INFO)
-                       udev_set_log_priority(udev, LOG_INFO);
-       }
-       info(udev, "calling: %s\n", cmd->name);
-       return cmd->cmd(udev, argc, argv);
+        if (cmd->debug) {
+                debug = true;
+                if (udev_get_log_priority(udev) < LOG_INFO)
+                        udev_set_log_priority(udev, LOG_INFO);
+        }
+        info(udev, "calling: %s\n", cmd->name);
+        return cmd->cmd(udev, argc, argv);
 }
 
 int main(int argc, char *argv[])
 {
-       struct udev *udev;
-       static const struct option options[] = {
-               { "debug", no_argument, NULL, 'd' },
-               { "help", no_argument, NULL, 'h' },
-               { "version", no_argument, NULL, 'V' },
-               {}
-       };
-       const char *command;
-       unsigned int i;
-       int rc = 1;
-
-       udev = udev_new();
-       if (udev == NULL)
-               goto out;
-
-       udev_log_init("udevadm");
-       udev_set_log_fn(udev, udev_main_log);
-       udev_selinux_init(udev);
-
-       for (;;) {
-               int option;
-
-               option = getopt_long(argc, argv, "+dhV", options, NULL);
-               if (option == -1)
-                       break;
-
-               switch (option) {
-               case 'd':
-                       debug = true;
-                       if (udev_get_log_priority(udev) < LOG_INFO)
-                               udev_set_log_priority(udev, LOG_INFO);
-                       break;
-               case 'h':
-                       rc = adm_help(udev, argc, argv);
-                       goto out;
-               case 'V':
-                       rc = adm_version(udev, argc, argv);
-                       goto out;
-               default:
-                       goto out;
-               }
-       }
-       command = argv[optind];
-
-       info(udev, "runtime dir '%s'\n", udev_get_run_path(udev));
-
-       if (command != NULL)
-               for (i = 0; i < ARRAY_SIZE(udevadm_cmds); i++) {
-                       if (strcmp(udevadm_cmds[i]->name, command) == 0) {
-                               argc -= optind;
-                               argv += optind;
-                               optind = 0;
-                               rc = run_command(udev, udevadm_cmds[i], argc, argv);
-                               goto out;
-                       }
-               }
-
-       fprintf(stderr, "missing or unknown command\n\n");
-       adm_help(udev, argc, argv);
-       rc = 2;
+        struct udev *udev;
+        static const struct option options[] = {
+                { "debug", no_argument, NULL, 'd' },
+                { "help", no_argument, NULL, 'h' },
+                { "version", no_argument, NULL, 'V' },
+                {}
+        };
+        const char *command;
+        unsigned int i;
+        int rc = 1;
+
+        udev = udev_new();
+        if (udev == NULL)
+                goto out;
+
+        udev_log_init("udevadm");
+        udev_set_log_fn(udev, udev_main_log);
+        udev_selinux_init(udev);
+
+        for (;;) {
+                int option;
+
+                option = getopt_long(argc, argv, "+dhV", options, NULL);
+                if (option == -1)
+                        break;
+
+                switch (option) {
+                case 'd':
+                        debug = true;
+                        if (udev_get_log_priority(udev) < LOG_INFO)
+                                udev_set_log_priority(udev, LOG_INFO);
+                        break;
+                case 'h':
+                        rc = adm_help(udev, argc, argv);
+                        goto out;
+                case 'V':
+                        rc = adm_version(udev, argc, argv);
+                        goto out;
+                default:
+                        goto out;
+                }
+        }
+        command = argv[optind];
+
+        info(udev, "runtime dir '%s'\n", udev_get_run_path(udev));
+
+        if (command != NULL)
+                for (i = 0; i < ARRAY_SIZE(udevadm_cmds); i++) {
+                        if (strcmp(udevadm_cmds[i]->name, command) == 0) {
+                                argc -= optind;
+                                argv += optind;
+                                optind = 0;
+                                rc = run_command(udev, udevadm_cmds[i], argc, argv);
+                                goto out;
+                        }
+                }
+
+        fprintf(stderr, "missing or unknown command\n\n");
+        adm_help(udev, argc, argv);
+        rc = 2;
 out:
-       udev_selinux_exit(udev);
-       udev_unref(udev);
-       udev_log_close();
-       return rc;
+        udev_selinux_exit(udev);
+        udev_unref(udev);
+        udev_log_close();
+        return rc;
 }