diff options
| author | kay.sievers@vrfy.org <kay.sievers@vrfy.org> | 2004-11-28 13:41:15 +0100 |
|---|---|---|
| committer | Greg KH <gregkh@suse.de> | 2005-04-26 23:00:29 -0700 |
| commit | a0294b76252d8c84656218cafd458e6739361247 (patch) | |
| tree | 26f01f3ee39f8ee6adcb8ee2a63f3052704b0b1b /udevtest.c | |
| parent | 16ac31aaee34f1085daf1c43a8645b174712b2d4 (diff) | |
[PATCH] update the man pages and correct Usage: hints
Add UDEV_LOG to the man udev man page. Remove mention of specific
variables from the udevd/udevsend man page as we changed to pass
the whole environment.
Correct printed Usage: of udevtest and udevinfo.
Init the config in udevtest earlier to accept input with and without
the sysfs mount point.
Diffstat (limited to 'udevtest.c')
| -rw-r--r-- | udevtest.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/udevtest.c b/udevtest.c index 37ec767e13..9cc23f0ac7 100644 --- a/udevtest.c +++ b/udevtest.c @@ -55,19 +55,23 @@ int main(int argc, char *argv[], char *envp[]) char *devpath; char path[SYSFS_PATH_MAX]; char temp[NAME_SIZE]; - char *subsystem = ""; struct udevice udev; + char *subsystem = NULL; info("version %s", UDEV_VERSION); - if (argv[1] == NULL) { - info("udevinfo expects the DEVPATH of the sysfs device as a argument"); + if (argc < 2 || argc > 3) { + info("Usage: udevtest <devpath> [subsystem]"); return 1; } + /* initialize our configuration */ + udev_init_config(); + /* remove sysfs_path if given */ - if (strncmp(argv[1], sysfs_path, strlen(sysfs_path)) == 0) - devpath = argv[1] + strlen(sysfs_path); + if (strncmp(argv[1], sysfs_path, strlen(sysfs_path)) == 0) { + devpath = &argv[1][strlen(sysfs_path)] ; + } else if (argv[1][0] != '/') { /* prepend '/' if missing */ @@ -86,13 +90,10 @@ int main(int argc, char *argv[], char *envp[]) return 2; } - /* initialize our configuration */ - udev_init_config(); - /* initialize the naming deamon */ namedev_init(); - if (argv[2] != NULL) + if (argc == 3) subsystem = argv[2]; /* fill in values and test_run flag*/ |