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] conditional remove of trailing sysfs whitespace
[elogind.git]
/
udev.c
diff --git
a/udev.c
b/udev.c
index a3984771188a50d33a3e6b02fcf38922868ea8df..9b4d91f75cea26373c9aebc7688b0d992d0c3089 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,105
+23,158
@@
#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 "libsysfs/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 "udevdb.h"
#include "namedev.h"
#include "udevdb.h"
-#include "libsysfs/libsysfs.h"
+/* global variables */
+char **main_argv;
+char **main_envp;
-static char *get_action(void)
+#ifdef LOG
+unsigned char logname[LOGNAME_SIZE];
+void log_message(int level, const char *format, ...)
{
{
-
char *action
;
+
va_list args
;
- action = getenv("ACTION");
- return action;
-}
+ if (!udev_log)
+ return;
+ va_start(args, format);
+ vsyslog(level, format, args);
+ va_end(args);
+}
+#endif
-static
char *get_device(void
)
+static
void sig_handler(int signum
)
{
{
- char *device;
-
- device = getenv("DEVPATH");
- return device;
+ switch (signum) {
+ case SIGINT:
+ case SIGTERM:
+ sysbus_disconnect();
+ udevdb_exit();
+ exit(20 + signum);
+ default:
+ dbg("unhandled signal");
+ }
}
}
-char **main_argv;
-char **main_envp;
-
-int main(int argc, char **argv, char **envp)
+static char *subsystem_blacklist[] = {
+ "net",
+ "scsi_host",
+ "scsi_device",
+ "usb_host",
+ "pci_bus",
+ "pcmcia_socket",
+ ""
+};
+
+static int udev_hotplug(void)
{
char *action;
{
char *action;
- char *dev
ice
;
+ char *dev
path
;
char *subsystem;
int retval = -EINVAL;
char *subsystem;
int retval = -EINVAL;
-
- main_argv = argv;
- main_envp = envp;
+ int i;
+ struct sigaction act;
- dbg("version %s", UDEV_VERSION);
-
- if (argc != 2) {
- dbg ("unknown number of arguments");
+ 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");
+ /* skip blacklisted subsystems */
+ subsystem = get_subsystem(main_argv[1]);
+ if (!subsystem) {
+ dbg("no subsystem?");
goto exit;
}
goto exit;
}
-
- action = get_action();
- if (!action) {
- dbg ("no action?");
- goto exit;
+ 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++;
}
}
+ /* connect to the system message bus */
+ sysbus_connect();
+
/* initialize udev database */
retval = udevdb_init(UDEVDB_DEFAULT);
if (retval != 0) {
/* initialize udev database */
retval = udevdb_init(UDEVDB_DEFAULT);
if (retval != 0) {
- dbg("
Unable to initialize database.
");
- goto exit;
+ 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)
- retval = udev_add_device(dev
ice, argv[1]
);
+ retval = udev_add_device(dev
path, subsystem, 0
);
else if (strcmp(action, "remove") == 0)
else if (strcmp(action, "remove") == 0)
- retval = udev_remove_device(dev
ice, argv[1]
);
+ retval = udev_remove_device(dev
path, subsystem
);
else {
else {
- dbg("
Unknown action: %s
", action);
+ dbg("
unknown action '%s'
", action);
retval = -EINVAL;
}
udevdb_exit();
retval = -EINVAL;
}
udevdb_exit();
-exit:
- return retval;
+exit_sysbus:
+ /* disconnect from the system message bus */
+ sysbus_disconnect();
+
+exit:
+ if (retval > 0)
+ retval = 0;
+
+ return -retval;
}
}
+int main(int argc, char *argv[], char *envp[])
+{
+ main_argv = argv;
+ main_envp = envp;
+
+ init_logging("udev");
+
+ /* initialize our configuration */
+ udev_init_config();
+
+ dbg("version %s", UDEV_VERSION);
+
+ return udev_hotplug();
+}