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] delete udevruler?
[elogind.git]
/
udev.c
diff --git
a/udev.c
b/udev.c
index 30921420a0fe9514dab8cce4a0bc3a2e76ffd774..a13f7013b6e6e2aa167a4b5fb99ebb38fbccf2d8 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
@@
-21,232
+20,173
@@
*
*/
*
*/
+#define _KLIBC_HAS_ARCH_SIG_ATOMIC_T
+#include <stdio.h>
+#include <stddef.h>
#include <stdlib.h>
#include <string.h>
#include <stdlib.h>
#include <string.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <errno.h>
#include <ctype.h>
#include <ctype.h>
+#include <errno.h>
#include <signal.h>
#include <signal.h>
-#include <stdarg.h>
+#include "libsysfs/sysfs/libsysfs.h"
#include "udev.h"
#include "udev.h"
+#include "udev_lib.h"
#include "udev_version.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"
+
+/* timeout flag for udevdb */
+extern sig_atomic_t gotalarm;
/* global variables */
char **main_argv;
char **main_envp;
/* global variables */
char **main_argv;
char **main_envp;
-static void sig_handler(int signum)
-{
- dbg("caught signal %d", signum);
- switch (signum) {
- case SIGINT:
- case SIGTERM:
- case SIGKILL:
- sysbus_disconnect();
- udevdb_exit();
- exit(20 + signum);
- break;
- default:
- dbg("unhandled signal");
- }
-}
-
-static inline 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;
-static inline char *get_devpath(void)
-{
- char *devpath;
-
- devpath = getenv("DEVPATH");
- return devpath;
+ va_start(args, format);
+ vsyslog(level, format, args);
+ va_end(args);
}
}
+#endif
-static
inline char *get_seqnum(void
)
+static
void asmlinkage sig_handler(int signum
)
{
{
- char *seqnum;
-
- seqnum = getenv("SEQNUM");
- return seqnum;
-}
-
-static inline int udev_user(int argc, char **argv)
-{
- static const char short_options[] = "q:rVh";
- int option;
- int retval = -EINVAL;
- struct udevice dev;
-
- while (1) {
- option = getopt(argc, argv, short_options);
- if (option == -1)
+ switch (signum) {
+ case SIGALRM:
+ gotalarm = 1;
+ info("error: timeout reached, event probably not handled correctly");
break;
break;
-
- dbg("option '%c'", option);
- switch (option) {
- case 'q':
- dbg("udev query: %s\n", optarg);
- retval = udevdb_open_ro();
- if (retval != 0) {
- printf("unable to open udev database\n");
- return -1;
- }
- retval = udevdb_get_dev(optarg, &dev);
- if (retval == 0) {
- printf("%s\n", dev.name);
- } else {
- printf("device not found in udev database\n");
- }
+ case SIGINT:
+ case SIGTERM:
udevdb_exit();
udevdb_exit();
- return retval;
-
- case 'r':
- printf("%s\n", udev_root);
- return 0;
-
- case 'V':
- printf("udev, version %s\n", UDEV_VERSION);
- return 0;
-
- case 'h':
- retval = 0;
- case '?':
+ exit(20 + signum);
default:
default:
- goto help;
- }
+ dbg("unhandled signal %d", signum);
}
}
-
-help:
- printf("Usage: [-qrVh]\n"
- " -q <path> query database for the name of the created node\n"
- " -r print udev root\n"
- " -V print udev version\n"
- " -h print this help text\n"
- "\n");
-
- return retval;
}
static char *subsystem_blacklist[] = {
}
static char *subsystem_blacklist[] = {
- "net",
"scsi_host",
"scsi_device",
"scsi_host",
"scsi_device",
- "",
+ "usb_host",
+ "pci_bus",
+ "pcmcia_socket",
+ ""
};
};
-
static inline int udev_hotplug(int argc, char **argv
)
+
int main(int argc, char *argv[], char *envp[]
)
{
{
+ main_argv = argv;
+ main_envp = envp;
+ struct sigaction act;
char *action;
char *action;
- char *devpath;
- char *subsystem;
- int retval = -EINVAL;
+ char *devpath = "";
+ char *subsystem = "";
int i;
int i;
+ int retval = -EINVAL;
+ enum {
+ ADD,
+ REMOVE,
+ UDEVSTART,
+ } act_type;
-
subsystem = argv[1]
;
+
dbg("version %s", UDEV_VERSION)
;
- devpath = get_devpath();
- if (!devpath) {
- dbg ("no devpath?");
- goto exit;
- }
- dbg("looking at '%s'", devpath);
+ init_logging("udev");
- /* we only care about class devices and block stuff */
- if (!strstr(devpath, "class") &&
- !strstr(devpath, "block")) {
- dbg("not a block or class device");
- goto exit;
- }
+ udev_init_config();
- /* skip blacklisted subsystems */
- i = 0;
- while (subsystem_blacklist[i][0] != '\0') {
- if (strcmp(subsystem, subsystem_blacklist[i]) == 0) {
- dbg("don't care about '%s' devices", subsystem);
+ if (strstr(argv[0], "udevstart")) {
+ act_type = UDEVSTART;
+ } else {
+ action = get_action();
+ if (!action) {
+ dbg("no action?");
+ goto exit;
+ }
+ if (strcmp(action, "add") == 0) {
+ act_type = ADD;
+ } else if (strcmp(action, "remove") == 0) {
+ act_type = REMOVE;
+ } else {
+ dbg("unknown action '%s'", action);
goto exit;
}
goto exit;
}
- i++;
- }
- action = get_action();
- if (!action) {
- dbg ("no action?");
- goto exit;
- }
+ devpath = get_devpath();
+ if (!devpath) {
+ dbg("no devpath?");
+ goto exit;
+ }
+ dbg("looking at '%s'", devpath);
- /* connect to the system message bus */
- sysbus_connect();
+ /* we only care about class devices and block stuff */
+ if (!strstr(devpath, "class") && !strstr(devpath, "block")) {
+ dbg("not a block or class device");
+ goto exit;
+ }
- /* initialize udev database */
- retval = udevdb_init(UDEVDB_DEFAULT);
- if (retval != 0) {
- dbg("unable to initialize database");
- goto exit_sysbus;
- }
+ subsystem = get_subsystem(main_argv[1]);
+ if (!subsystem) {
+ dbg("no subsystem?");
+ goto exit;
+ }
- /* set up a default signal handler for now */
- signal(SIGINT, sig_handler);
- signal(SIGTERM, sig_handler);
- signal(SIGKILL, sig_handler);
+ /* skip blacklisted subsystems */
+ 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 the naming deamon */
- namedev_init();
+ /* set signal handlers */
+ act.sa_handler = (void (*) (int))sig_handler;
+ sigemptyset (&act.sa_mask);
+ /* alarm must interrupt syscalls*/
+ sigaction(SIGALRM, &act, NULL);
+ sigaction(SIGINT, &act, NULL);
+ sigaction(SIGTERM, &act, NULL);
- if (strcmp(action, "add") == 0)
-
retval = udev_add_device(devpath, subsystem
);
+ /* trigger timout to interrupt blocking syscalls */
+
alarm(ALARM_TIMEOUT
);
- else if (strcmp(action, "remove") == 0)
+ /* initialize udev database */
+ if (udevdb_init(UDEVDB_DEFAULT) != 0)
+ info("error: unable to initialize database, continuing without database");
+
+ switch(act_type) {
+ case UDEVSTART:
+ dbg("udevstart");
+ namedev_init();
+ udev_sleep = 0;
+ retval = udev_start();
+ break;
+ case ADD:
+ dbg("udev add");
+ namedev_init();
+ retval = udev_add_device(devpath, subsystem, NOFAKE);
+ break;
+ case REMOVE:
+ dbg("udev remove");
retval = udev_remove_device(devpath, subsystem);
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();
+ udevdb_exit();
exit:
exit:
- if (retval > 0)
- retval = 0;
-
- return -retval;
-}
-
-int main(int argc, char **argv, char **envp)
-{
- int retval;
- main_argv = argv;
- main_envp = envp;
-
- dbg("version %s", UDEV_VERSION);
-
- /* initialize our configuration */
- udev_init_config();
-
- if (argc == 2 && argv[1][0] != '-') {
- dbg("called by hotplug");
- retval = udev_hotplug(argc, argv);
- } else {
- dbg("called by user");
- retval = udev_user(argc, argv);
- }
-
return retval;
}
return retval;
}
-
-