X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fudev%2Fudev-builtin.c;h=3bcbd6e828a807c55af513c68c4bae7a914ffdb8;hp=5bc5fa68f6a8d4f4cd54d33ab2667c773c807835;hb=be2ea723b1d023b3d385d3b791ee4607cbfb20ca;hpb=6df831f25ebc9f55cd939f04392dad9237706e45 diff --git a/src/udev/udev-builtin.c b/src/udev/udev-builtin.c index 5bc5fa68f..3bcbd6e82 100644 --- a/src/udev/udev-builtin.c +++ b/src/udev/udev-builtin.c @@ -1,19 +1,21 @@ -/* - * Copyright (C) 2007-2009 Kay Sievers - * - * 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 - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ +/*** + This file is part of systemd. + + Copyright 2007-2012 Kay Sievers + + systemd is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2.1 of the License, or + (at your option) any later version. + + systemd is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with systemd; If not, see . +***/ #include #include @@ -25,101 +27,106 @@ #include "udev.h" +static bool initialized; + static const struct udev_builtin *builtins[] = { +#ifdef HAVE_BLKID [UDEV_BUILTIN_BLKID] = &udev_builtin_blkid, - [UDEV_BUILTIN_FIRMWARE] = &udev_builtin_firmware, +#endif + [UDEV_BUILTIN_BTRFS] = &udev_builtin_btrfs, + [UDEV_BUILTIN_HWDB] = &udev_builtin_hwdb, [UDEV_BUILTIN_INPUT_ID] = &udev_builtin_input_id, + [UDEV_BUILTIN_KEYBOARD] = &udev_builtin_keyboard, +#ifdef HAVE_KMOD [UDEV_BUILTIN_KMOD] = &udev_builtin_kmod, +#endif + [UDEV_BUILTIN_NET_ID] = &udev_builtin_net_id, + [UDEV_BUILTIN_NET_LINK] = &udev_builtin_net_setup_link, [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) -{ +void udev_builtin_init(struct udev *udev) { unsigned int i; - int err; - - for (i = 0; i < ARRAY_SIZE(builtins); i++) { - if (builtins[i]->init) { - err = builtins[i]->init(udev); - if (err < 0) - break; - } - } - return err; + + if (initialized) + return; + + for (i = 0; i < ELEMENTSOF(builtins); i++) + if (builtins[i]->init) + builtins[i]->init(udev); + + initialized = true; } -void udev_builtin_exit(struct udev *udev) -{ +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) -{ +bool udev_builtin_validate(struct udev *udev) { unsigned int i; - bool change = false; - for (i = 0; i < ARRAY_SIZE(builtins); i++) - if (builtins[i]->validate) - if (builtins[i]->validate(udev)) - change = true; - return change; + for (i = 0; i < ELEMENTSOF(builtins); i++) + if (builtins[i]->validate && builtins[i]->validate(udev)) + return true; + return false; } -void udev_builtin_list(struct udev *udev) -{ +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); } -const char *udev_builtin_name(enum udev_builtin_cmd cmd) -{ +const char *udev_builtin_name(enum udev_builtin_cmd cmd) { return builtins[cmd]->name; } -bool udev_builtin_run_once(enum udev_builtin_cmd cmd) -{ +bool udev_builtin_run_once(enum udev_builtin_cmd cmd) { return builtins[cmd]->run_once; } -enum udev_builtin_cmd udev_builtin_lookup(const char *command) -{ +enum udev_builtin_cmd udev_builtin_lookup(const char *command) { char name[UTIL_PATH_SIZE]; enum udev_builtin_cmd i; char *pos; - util_strscpy(name, sizeof(name), command); + strscpy(name, sizeof(name), command); pos = strchr(name, ' '); if (pos) pos[0] = '\0'; - for (i = 0; i < ARRAY_SIZE(builtins); i++) - if (strcmp(builtins[i]->name, name) == 0) + for (i = 0; i < ELEMENTSOF(builtins); i++) + if (streq(builtins[i]->name, name)) return i; return UDEV_BUILTIN_MAX; } -int udev_builtin_run(struct udev_device *dev, enum udev_builtin_cmd cmd, const char *command, bool test) -{ +int udev_builtin_run(struct udev_device *dev, enum udev_builtin_cmd cmd, const char *command, bool test) { char arg[UTIL_PATH_SIZE]; int argc; char *argv[128]; + /* we need '0' here to reset the internal state */ optind = 0; - util_strscpy(arg, sizeof(arg), command); + strscpy(arg, sizeof(arg), command); udev_build_argv(udev_device_get_udev(dev), arg, &argc, argv); return builtins[cmd]->cmd(dev, argc, argv, test); } -int udev_builtin_add_property(struct udev_device *dev, bool test, const char *key, const char *val) -{ +int udev_builtin_add_property(struct udev_device *dev, bool test, const char *key, const char *val) { struct udev_list_entry *entry; entry = udev_device_add_property(dev, key, val); @@ -127,7 +134,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;