diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-11-28 08:44:21 -0500 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2014-11-28 08:44:21 -0500 |
| commit | c0f2fad6a55e93eb4a2caba6b276fa3069b5f0fb (patch) | |
| tree | 6acca1604d6767631900192c1de91cb166c5627f /src/udev/udevadm-trigger.c | |
| parent | 3481b5b97660d56841c24683f0b8e7ad74a833f7 (diff) | |
udevadm: split out find_device helper
The idea is to unify the way that devices can be specified.
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
Diffstat (limited to 'src/udev/udevadm-trigger.c')
| -rw-r--r-- | src/udev/udevadm-trigger.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/src/udev/udevadm-trigger.c b/src/udev/udevadm-trigger.c index a52d1b5ad5..49e256289c 100644 --- a/src/udev/udevadm-trigger.c +++ b/src/udev/udevadm-trigger.c @@ -32,6 +32,7 @@ #include "udev.h" #include "udev-util.h" +#include "udevadm-util.h" #include "util.h" static int verbose; @@ -174,25 +175,18 @@ static int adm_trigger(struct udev *udev, int argc, char *argv[]) { udev_enumerate_add_match_sysname(udev_enumerate, optarg); break; case 'b': { - char path[UTIL_PATH_SIZE]; - struct udev_device *dev; - - /* add sys dir if needed */ - if (!startswith(optarg, "/sys")) - strscpyl(path, sizeof(path), "/sys", optarg, NULL); - else - strscpy(path, sizeof(path), optarg); - util_remove_trailing_chars(path, '/'); - dev = udev_device_new_from_syspath(udev, path); + _cleanup_udev_device_unref_ struct udev_device *dev; + + dev = find_device(udev, optarg, "/sys"); if (dev == NULL) { log_error("unable to open the device '%s'", optarg); return 2; } + udev_enumerate_add_match_parent(udev_enumerate, dev); - /* drop reference immediately, enumerate pins the device as long as needed */ - udev_device_unref(dev); break; } + case 'h': help(); return 0; |