summaryrefslogtreecommitdiff
path: root/udevtest.c
diff options
context:
space:
mode:
authorgreg@kroah.com <greg@kroah.com>2004-02-12 20:19:21 -0800
committerGreg KH <gregkh@suse.de>2005-04-26 21:32:27 -0700
commiteb10f97f2816ae09f949060a2bb8c46b8c1788ed (patch)
tree694bc1a4312401399613847d0e1d530758524558 /udevtest.c
parentbb051f66571121e2c9c97422b65aa89a37ec8feb (diff)
[PATCH] add udevtest program to build
Also fix up some other dependancy issues in the Makefile. Thanks to Olaf Hering <olh@suse.de> for pointing them out.
Diffstat (limited to 'udevtest.c')
-rw-r--r--udevtest.c51
1 files changed, 9 insertions, 42 deletions
diff --git a/udevtest.c b/udevtest.c
index 9f10cc2125..dd8375aa5c 100644
--- a/udevtest.c
+++ b/udevtest.c
@@ -29,10 +29,8 @@
#include "udev.h"
#include "udev_version.h"
-#include "udev_dbus.h"
#include "logging.h"
#include "namedev.h"
-#include "udevdb.h"
#include "libsysfs/libsysfs.h"
/* global variables */
@@ -45,12 +43,15 @@ void log_message (int level, const char *format, ...)
{
va_list args;
- if (!udev_log)
- return;
+// if (!udev_log)
+// return;
+ /* FIXME use level... */
va_start(args, format);
- vsyslog(level, format, args);
+ vprintf(format, args);
va_end(args);
+ if (format[strlen(format)-1] != '\n')
+ printf("\n");
}
#endif
@@ -59,8 +60,6 @@ static void sig_handler(int signum)
switch (signum) {
case SIGINT:
case SIGTERM:
- sysbus_disconnect();
- udevdb_exit();
exit(20 + signum);
default:
dbg("unhandled signal");
@@ -102,22 +101,15 @@ static char *subsystem_blacklist[] = {
static int udev_hotplug(int argc, char **argv)
{
- char *action;
char *devpath;
char *subsystem;
int retval = -EINVAL;
int i;
struct sigaction act;
- action = get_action();
- if (!action) {
- dbg ("no action?");
- goto exit;
- }
-
- devpath = get_devpath();
+ devpath = argv[1];
if (!devpath) {
- dbg ("no devpath?");
+ dbg("no devpath?");
goto exit;
}
dbg("looking at '%s'", devpath);
@@ -140,19 +132,9 @@ static int udev_hotplug(int argc, char **argv)
i++;
}
- /* connect to the system message bus */
- sysbus_connect();
-
/* initialize our configuration */
udev_init_config();
- /* initialize udev database */
- retval = udevdb_init(UDEVDB_DEFAULT);
- if (retval != 0) {
- dbg("unable to initialize database");
- goto exit_sysbus;
- }
-
/* set up a default signal handler for now */
act.sa_handler = sig_handler;
sigemptyset (&act.sa_mask);
@@ -163,21 +145,7 @@ static int udev_hotplug(int argc, char **argv)
/* initialize the naming deamon */
namedev_init();
- if (strcmp(action, "add") == 0)
- retval = udev_add_device(devpath, subsystem);
-
- else if (strcmp(action, "remove") == 0)
- retval = udev_remove_device(devpath, subsystem);
-
- else {
- dbg("unknown action '%s'", action);
- retval = -EINVAL;
- }
- udevdb_exit();
-
-exit_sysbus:
- /* disconnect from the system message bus */
- sysbus_disconnect();
+ retval = udev_add_device(devpath, subsystem, 1);
exit:
if (retval > 0)
@@ -191,7 +159,6 @@ int main(int argc, char **argv, char **envp)
main_argv = argv;
main_envp = envp;
- init_logging("udev");
dbg("version %s", UDEV_VERSION);
return udev_hotplug(argc, argv);