X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fudev%2Fudev-builtin.c;h=18fc3df274936b637c7a5431551207715f048605;hp=5bc5fa68f6a8d4f4cd54d33ab2667c773c807835;hb=796b06c21b62d13c9021e2fbd9c58a5c6edb2764;hpb=3e2147858f21943d5f4a781c60f33ac22c6096ed

diff --git a/src/udev/udev-builtin.c b/src/udev/udev-builtin.c
index 5bc5fa68f..18fc3df27 100644
--- a/src/udev/udev-builtin.c
+++ b/src/udev/udev-builtin.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2009 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2007-2012 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
@@ -25,29 +25,39 @@
 
 #include "udev.h"
 
+static bool initialized;
+
 static const struct udev_builtin *builtins[] = {
         [UDEV_BUILTIN_BLKID] = &udev_builtin_blkid,
+        [UDEV_BUILTIN_BTRFS] = &udev_builtin_btrfs,
         [UDEV_BUILTIN_FIRMWARE] = &udev_builtin_firmware,
+        [UDEV_BUILTIN_HWDB] = &udev_builtin_hwdb,
         [UDEV_BUILTIN_INPUT_ID] = &udev_builtin_input_id,
         [UDEV_BUILTIN_KMOD] = &udev_builtin_kmod,
         [UDEV_BUILTIN_PATH_ID] = &udev_builtin_path_id,
-        [UDEV_BUILTIN_PCI_DB] = &udev_builtin_pci_db,
-        [UDEV_BUILTIN_USB_DB] = &udev_builtin_usb_db,
         [UDEV_BUILTIN_USB_ID] = &udev_builtin_usb_id,
+#ifdef HAVE_ACL
+        [UDEV_BUILTIN_UACCESS] = &udev_builtin_uaccess,
+#endif
 };
 
 int udev_builtin_init(struct udev *udev)
 {
         unsigned int i;
-        int err;
+        int err = 0;
+
+        if (initialized)
+                return 0;
 
-        for (i = 0; i < ARRAY_SIZE(builtins); i++) {
+        for (i = 0; i < ELEMENTSOF(builtins); i++) {
                 if (builtins[i]->init) {
                         err = builtins[i]->init(udev);
                         if (err < 0)
                                 break;
                 }
         }
+
+        initialized = true;
         return err;
 }
 
@@ -55,9 +65,14 @@ void udev_builtin_exit(struct udev *udev)
 {
         unsigned int i;
 
-        for (i = 0; i < ARRAY_SIZE(builtins); i++)
+        if (!initialized)
+                return;
+
+        for (i = 0; i < ELEMENTSOF(builtins); i++)
                 if (builtins[i]->exit)
                         builtins[i]->exit(udev);
+
+        initialized = false;
 }
 
 bool udev_builtin_validate(struct udev *udev)
@@ -65,7 +80,7 @@ bool udev_builtin_validate(struct udev *udev)
         unsigned int i;
         bool change = false;
 
-        for (i = 0; i < ARRAY_SIZE(builtins); i++)
+        for (i = 0; i < ELEMENTSOF(builtins); i++)
                 if (builtins[i]->validate)
                         if (builtins[i]->validate(udev))
                                 change = true;
@@ -76,7 +91,7 @@ void udev_builtin_list(struct udev *udev)
 {
         unsigned int i;
 
-        for (i = 0; i < ARRAY_SIZE(builtins); i++)
+        for (i = 0; i < ELEMENTSOF(builtins); i++)
                 fprintf(stderr, "  %-12s %s\n", builtins[i]->name, builtins[i]->help);
 }
 
@@ -100,7 +115,7 @@ enum udev_builtin_cmd udev_builtin_lookup(const char *command)
         pos = strchr(name, ' ');
         if (pos)
                 pos[0] = '\0';
-        for (i = 0; i < ARRAY_SIZE(builtins); i++)
+        for (i = 0; i < ELEMENTSOF(builtins); i++)
                 if (strcmp(builtins[i]->name, name) == 0)
                         return i;
         return UDEV_BUILTIN_MAX;
@@ -112,7 +127,7 @@ int udev_builtin_run(struct udev_device *dev, enum udev_builtin_cmd cmd, const c
         int argc;
         char *argv[128];
 
-        optind = 0;
+        optind = 1;
         util_strscpy(arg, sizeof(arg), command);
         udev_build_argv(udev_device_get_udev(dev), arg, &argc, argv);
         return builtins[cmd]->cmd(dev, argc, argv, test);
@@ -127,7 +142,6 @@ int udev_builtin_add_property(struct udev_device *dev, bool test, const char *ke
         if (key[0] != '.')
                 udev_list_entry_set_num(entry, true);
 
-        info(udev_device_get_udev(dev), "%s=%s\n", key, val);
         if (test)
                 printf("%s=%s\n", key, val);
         return 0;