summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkay.sievers@vrfy.org <kay.sievers@vrfy.org>2004-03-22 22:18:34 -0800
committerGreg KH <gregkh@suse.de>2005-04-26 21:35:10 -0700
commit8a0acf85f25d2fb4659aafbad7db2fe48a58307d (patch)
treebf45b3ff9bac17734dc27ef755c2583a07a65951
parentb99c85e440193eb7f7dd84e473cafb16cb75722f (diff)
[PATCH] make udevtest a real program :)
Here are the missing pieces for udevtest. A simple man page is added, the blacklist is removed, cause it can't work without having a subsystem. The Makefile removes all manpages now with a uninstall and installs udevtest in /usr/bin/. Any old version from /sbin/ should be deleted by hand. The only expected argument is the sysfs devpath, here I changed it to be more tolerant to the input. The path may now be specified with or without a leading slash and optionally with the /sys moutpoint prepended. I hope this will end the confusion about the use of this program :)
-rw-r--r--Makefile7
-rw-r--r--udevtest.817
-rw-r--r--udevtest.c83
3 files changed, 56 insertions, 51 deletions
diff --git a/Makefile b/Makefile
index 612911c441..000918573e 100644
--- a/Makefile
+++ b/Makefile
@@ -382,10 +382,11 @@ install: install-initscript install-config install-dbus-policy all
$(INSTALL_PROGRAM) -D $(DAEMON) $(DESTDIR)$(sbindir)/$(DAEMON)
$(INSTALL_PROGRAM) -D $(SENDER) $(DESTDIR)$(sbindir)/$(SENDER)
$(INSTALL_PROGRAM) -D $(INFO) $(DESTDIR)$(usrbindir)/$(INFO)
- $(INSTALL_PROGRAM) -D $(TESTER) $(DESTDIR)$(sbindir)/$(TESTER)
+ $(INSTALL_PROGRAM) -D $(TESTER) $(DESTDIR)$(usrbindir)/$(TESTER)
$(INSTALL_PROGRAM) -D $(STARTER) $(DESTDIR)$(sbindir)/$(STARTER)
$(INSTALL_DATA) -D udev.8 $(DESTDIR)$(mandir)/man8/udev.8
$(INSTALL_DATA) -D udevinfo.8 $(DESTDIR)$(mandir)/man8/udevinfo.8
+ $(INSTALL_DATA) -D udevtest.8 $(DESTDIR)$(mandir)/man8/udevtest.8
$(INSTALL_DATA) -D udevstart.8 $(DESTDIR)$(mandir)/man8/udevstart.8
$(INSTALL_DATA) -D udevd.8 $(DESTDIR)$(mandir)/man8/udevd.8
- ln -f -s udevd.8 $(DESTDIR)$(mandir)/man8/udevsend.8
@@ -408,6 +409,10 @@ uninstall: uninstall-dbus-policy
- rm $(initdir)/udev
- rm $(mandir)/man8/udev.8
- rm $(mandir)/man8/udevinfo.8
+ - rm $(mandir)/man8/udevtest.8
+ - rm $(mandir)/man8/udevstart.8
+ - rm $(mandir)/man8/udevd.8
+ - rm $(mandir)/man8/udevsend.8
- rm $(sbindir)/$(ROOT)
- rm $(sbindir)/$(DAEMON)
- rm $(sbindir)/$(SENDER)
diff --git a/udevtest.8 b/udevtest.8
new file mode 100644
index 0000000000..f23e219244
--- /dev/null
+++ b/udevtest.8
@@ -0,0 +1,17 @@
+.TH UDEVTEST 8 "March 2004" "" "Linux Administrator's Manual"
+.SH NAME
+udevtest \- simulates a udev run to test the configured rules
+.SH SYNOPSIS
+.BI udevtest " sysfs_device_path"
+.SH "DESCRIPTION"
+.B udevtest
+simulates a
+.B udev
+run for the given device, and prints out the node names
+for the given device, the real udev would have created.
+.SH "SEE ALSO"
+.BR udev (8)
+.SH AUTHORS
+.B udevtest
+was developed by Greg Kroah-Hartman <greg@kroah.com> with much help
+from others.
diff --git a/udevtest.c b/udevtest.c
index e67d452577..95b85dd8be 100644
--- a/udevtest.c
+++ b/udevtest.c
@@ -37,6 +37,7 @@
char **main_argv;
char **main_envp;
+
#ifdef LOG
unsigned char logname[LOGNAME_SIZE];
void log_message (int level, const char *format, ...)
@@ -51,72 +52,54 @@ void log_message (int level, const char *format, ...)
}
#endif
-static char *subsystem_blacklist[] = {
- "net",
- "scsi_host",
- "scsi_device",
- "usb_host",
- "pci_bus",
- "pcmcia_socket",
- ""
-};
-
-static int udev_hotplug(void)
+int main(int argc, char *argv[], char *envp[])
{
char *devpath;
- char *subsystem;
- int retval = -EINVAL;
- int i;
+ char temp[NAME_SIZE];
+ char subsystem[] = "";
+ const int fake = 1;
+
+ main_argv = argv;
+ main_envp = envp;
+
+ info("version %s", UDEV_VERSION);
- devpath = main_argv[1];
- if (!devpath) {
- dbg("no devpath?");
+ if (argv[1] == NULL) {
+ info("udevinfo expects the DEVPATH of the sysfs device as a argument");
goto exit;
}
- dbg("looking at '%s'", devpath);
+
+ /* 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);
+ else
+ if (argv[1][0] != '/') {
+ /* prepend '/' if missing */
+ strfieldcpy(temp, "/");
+ strfieldcat(temp, argv[1]);
+ devpath = temp;
+ } else {
+ devpath = argv[1];
+ }
+
+ info("looking at '%s'", devpath);
/* we only care about class devices and block stuff */
if (!strstr(devpath, "class") &&
!strstr(devpath, "block")) {
- dbg("not a block or class device");
+ info("not a block or class device");
goto exit;
}
- /* skip blacklisted subsystems */
- subsystem = main_argv[1];
- i = 0;
- while (subsystem_blacklist[i][0] != '\0') {
- if (strcmp(subsystem, subsystem_blacklist[i]) == 0) {
- dbg("don't care about '%s' devices", subsystem);
- goto exit;
- }
- i++;
- }
-
- /* initialize our configuration */
- udev_init_config();
-
/* initialize the naming deamon */
namedev_init();
/* simulate node creation with fake flag */
- retval = udev_add_device(devpath, subsystem, 1);
+ udev_add_device(devpath, subsystem, fake);
exit:
- if (retval > 0)
- retval = 0;
-
- return -retval;
-}
-
-int main(int argc, char *argv[], char *envp[])
-{
- main_argv = argv;
- main_envp = envp;
-
- dbg("version %s", UDEV_VERSION);
-
- return udev_hotplug();
+ return 0;
}
-
-