chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] udev - TODO update
[elogind.git]
/
udev.c
diff --git
a/udev.c
b/udev.c
index 74572625afaae0830175bcf653e2063fc3d0b7b3..f3fab18b29e3fe000f214f38d0cfd0dfc8ee88fa 100644
(file)
--- a/
udev.c
+++ b/
udev.c
@@
-3,8
+3,7
@@
*
* Userspace devfs
*
*
* Userspace devfs
*
- * Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
- *
+ * Copyright (C) 2003,2004 Greg Kroah-Hartman <greg@kroah.com>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@
-24,17
+23,51
@@
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
-#include <fcntl.h>
-#include <unistd.h>
#include <errno.h>
#include <errno.h>
+#include <ctype.h>
+#include <signal.h>
+#include <sysfs/libsysfs.h>
#include "udev.h"
#include "udev_version.h"
#include "udev.h"
#include "udev_version.h"
+#include "udev_dbus.h"
+#include "logging.h"
#include "namedev.h"
#include "namedev.h"
-#include "libsysfs/libsysfs.h"
+#include "udevdb.h"
+
+/* global variables */
+char **main_argv;
+char **main_envp;
+
+#ifdef LOG
+unsigned char logname[42];
+void log_message (int level, const char *format, ...)
+{
+ va_list args;
+
+ if (!udev_log)
+ return;
+ va_start(args, format);
+ vsyslog(level, format, args);
+ va_end(args);
+}
+#endif
+
+static void sig_handler(int signum)
+{
+ switch (signum) {
+ case SIGINT:
+ case SIGTERM:
+ sysbus_disconnect();
+ udevdb_exit();
+ exit(20 + signum);
+ default:
+ dbg("unhandled signal");
+ }
+}
-static char *get_action(void)
+static
inline
char *get_action(void)
{
char *action;
{
char *action;
@@
-42,68
+75,126
@@
static char *get_action(void)
return action;
}
return action;
}
+static inline char *get_devpath(void)
+{
+ char *devpath;
+
+ devpath = getenv("DEVPATH");
+ return devpath;
+}
-static
char *get_device
(void)
+static
inline char *get_seqnum
(void)
{
{
- char *
device
;
+ char *
seqnum
;
-
device = getenv("DEVPATH
");
- return
device
;
+
seqnum = getenv("SEQNUM
");
+ return
seqnum
;
}
}
-int main(int argc, char *argv[])
+static char *subsystem_blacklist[] = {
+ "net",
+ "scsi_host",
+ "scsi_device",
+ "usb_host",
+ "pci_bus",
+ "",
+};
+
+static int udev_hotplug(int argc, char **argv)
{
char *action;
{
char *action;
- char *dev
ice
;
+ char *dev
path
;
char *subsystem;
int retval = -EINVAL;
char *subsystem;
int retval = -EINVAL;
-
- if (argc != 2) {
- dbg ("unknown number of arguments");
+ int i;
+ struct sigaction act;
+
+ action = get_action();
+ if (!action) {
+ dbg ("no action?");
goto exit;
}
goto exit;
}
- subsystem = argv[1];
-
- device = get_device();
- if (!device) {
- dbg ("no device?");
+ devpath = get_devpath();
+ if (!devpath) {
+ dbg ("no devpath?");
goto exit;
}
goto exit;
}
- dbg("looking at
%s", device
);
+ dbg("looking at
'%s'", devpath
);
/* we only care about class devices and block stuff */
/* we only care about class devices and block stuff */
- if (!strstr(dev
ice
, "class") &&
- !strstr(dev
ice
, "block")) {
- dbg("not
block or class
");
+ if (!strstr(dev
path
, "class") &&
+ !strstr(dev
path
, "block")) {
+ dbg("not
a block or class device
");
goto exit;
}
goto exit;
}
- /* but we don't care about net class devices */
- if (strcmp(subsystem, "net") == 0) {
- dbg("don't care about net devices");
- goto exit;
+ /* skip blacklisted subsystems */
+ subsystem = 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++;
}
}
- action = get_action();
- if (!action) {
- dbg ("no action?");
- goto exit;
+ /* 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);
+ act.sa_flags = SA_RESTART;
+ sigaction(SIGINT, &act, NULL);
+ sigaction(SIGTERM, &act, NULL);
+
/* initialize the naming deamon */
namedev_init();
if (strcmp(action, "add") == 0)
/* initialize the naming deamon */
namedev_init();
if (strcmp(action, "add") == 0)
- ret
urn udev_add_device(device, argv[1]
);
+ ret
val = udev_add_device(devpath, subsystem, 0
);
- if (strcmp(action, "remove") == 0)
- ret
urn udev_remove_device(device, argv[1]
);
+
else
if (strcmp(action, "remove") == 0)
+ ret
val = udev_remove_device(devpath, subsystem
);
- dbg("Unknown action: %s", action);
- retval = -EINVAL;
+ else {
+ dbg("unknown action '%s'", action);
+ retval = -EINVAL;
+ }
+ udevdb_exit();
+
+exit_sysbus:
+ /* disconnect from the system message bus */
+ sysbus_disconnect();
+
+exit:
+ if (retval > 0)
+ retval = 0;
-exit:
- return retval;
+ return -retval;
}
}
+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);
+}
+
+