diff options
author | Kay Sievers <kay.sievers@suse.de> | 2006-08-18 02:33:46 +0200 |
---|---|---|
committer | Kay Sievers <kay.sievers@suse.de> | 2006-08-18 02:33:46 +0200 |
commit | 2362eea6019e07a2e79e67ebe626bfacf40ff40f (patch) | |
tree | d77ffb9f13ff5480cadb81197f2ddaad1313b58a /udevtest.c | |
parent | 1aa0c52b4458be4cf6e55b2faf5c602761f5d3a3 (diff) |
udevinfo, udevtest: simplify '/sys' stripping from devpath argument
Diffstat (limited to 'udevtest.c')
-rw-r--r-- | udevtest.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/udevtest.c b/udevtest.c index 078674a01d..22627c05a7 100644 --- a/udevtest.c +++ b/udevtest.c @@ -52,7 +52,6 @@ int main(int argc, char *argv[], char *envp[]) { struct udev_rules rules; char *devpath; - char temp[PATH_SIZE]; struct udevice *udev; struct sysfs_device *dev; int retval; @@ -64,24 +63,19 @@ int main(int argc, char *argv[], char *envp[]) udev_config_init(); if (udev_log_priority < LOG_INFO) udev_log_priority = LOG_INFO; - sysfs_init(); if (argc != 2) { info("Usage: udevtest <devpath>"); return 1; } - /* remove sysfs_path if given */ + sysfs_init(); + + /* remove /sys if given */ if (strncmp(argv[1], sysfs_path, strlen(sysfs_path)) == 0) devpath = &argv[1][strlen(sysfs_path)]; else - if (argv[1][0] != '/') { - /* prepend '/' if missing */ - snprintf(temp, sizeof(temp), "/%s", argv[1]); - temp[sizeof(temp)-1] = '\0'; - devpath = temp; - } else - devpath = argv[1]; + devpath = argv[1]; udev_rules_init(&rules, 0); |