*
*/
+#include <stdio.h>
+#include <stddef.h>
#include <stdlib.h>
#include <string.h>
-#include <stdio.h>
-#include <errno.h>
#include <ctype.h>
+#include <errno.h>
#include <signal.h>
+#include "libsysfs/sysfs/libsysfs.h"
#include "udev.h"
+#include "udev_lib.h"
#include "udev_version.h"
-#include "udev_dbus.h"
#include "logging.h"
#include "namedev.h"
#include "udevdb.h"
-#include "libsysfs/libsysfs.h"
/* global variables */
char **main_argv;
char **main_envp;
-unsigned char logname[42];
-int log_ok(void)
+/* local variables */
+static int is_udevstart;
+
+#ifdef LOG
+unsigned char logname[LOGNAME_SIZE];
+void log_message(int level, const char *format, ...)
{
- return udev_log;
+ 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)
+asmlinkage static void sig_handler(int signum)
{
switch (signum) {
case SIGINT:
case SIGTERM:
- sysbus_disconnect();
udevdb_exit();
exit(20 + signum);
default:
- dbg("unhandled signal");
+ dbg("unhandled signal %d", signum);
}
}
-static inline char *get_action(void)
-{
- char *action;
-
- action = getenv("ACTION");
- return action;
-}
-
-static inline char *get_devpath(void)
-{
- char *devpath;
-
- devpath = getenv("DEVPATH");
- return devpath;
-}
-
-static inline char *get_seqnum(void)
-{
- char *seqnum;
-
- seqnum = getenv("SEQNUM");
- return seqnum;
-}
-
static char *subsystem_blacklist[] = {
- "net",
"scsi_host",
"scsi_device",
"usb_host",
"pci_bus",
- "",
+ "pcmcia_socket",
+ ""
};
-static int udev_hotplug(int argc, char **argv)
+int __udev_hotplug(char *action, const char *devpath, const char *subsystem)
{
- char *action;
- char *devpath;
- char *subsystem;
int retval = -EINVAL;
int i;
struct sigaction act;
+ const int nofake = 0;
- 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);
/* we only care about class devices and block stuff */
goto exit;
}
- /* skip blacklisted subsystems */
- subsystem = argv[1];
i = 0;
while (subsystem_blacklist[i][0] != '\0') {
if (strcmp(subsystem, subsystem_blacklist[i]) == 0) {
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;
+ goto exit;
}
- /* set up a default signal handler for now */
+ /* set signal handlers */
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)
- retval = udev_add_device(devpath, subsystem);
+ if (strcmp(action, "add") == 0) {
+ /* Already done. */
+ if (!is_udevstart)
+ namedev_init();
+ retval = udev_add_device(devpath, subsystem, nofake);
+ goto action_done;
+ }
- else if (strcmp(action, "remove") == 0)
+ if (strcmp(action, "remove") == 0) {
retval = udev_remove_device(devpath, subsystem);
-
- else {
- dbg("unknown action '%s'", action);
- retval = -EINVAL;
+ goto action_done;
}
- udevdb_exit();
-exit_sysbus:
- /* disconnect from the system message bus */
- sysbus_disconnect();
+ dbg("unknown action '%s'", action);
+ retval = -EINVAL;
+
+action_done:
+ udevdb_exit();
exit:
- if (retval > 0)
- retval = 0;
+ return retval;
+}
+
+static int udev_hotplug(void)
+{
+ char *action;
+ char *devpath;
+ char *subsystem;
+
+ action = get_action();
+ if (!action) {
+ dbg("no action?");
+ return -EINVAL;
+ }
- return -retval;
+ devpath = get_devpath();
+ if (!devpath) {
+ dbg("no devpath?");
+ return -EINVAL;
+ }
+
+ /* skip blacklisted subsystems */
+ subsystem = get_subsystem(main_argv[1]);
+ if (!subsystem) {
+ dbg("no subsystem?");
+ return -EINVAL;
+ }
+
+ return __udev_hotplug(action, devpath, subsystem);
}
-int main(int argc, char **argv, char **envp)
+int main(int argc, char *argv[], char *envp[])
{
main_argv = argv;
main_envp = envp;
- init_logging("udev");
- dbg("version %s", UDEV_VERSION);
+ if (strstr(argv[0], "udevstart")) {
+ /* Setup env variables. */
+ setenv("UDEV_NO_SLEEP", "1", 1);
+ is_udevstart = 1;
+ }
- return udev_hotplug(argc, argv);
-}
+ /* initialize our configuration */
+ udev_init_config();
+ dbg("version %s", UDEV_VERSION);
+ if (is_udevstart) {
+ namedev_init();
+ return udev_start();
+ } else
+ return udev_hotplug();
+}
~ianmdlvl / elogind.git / blobdiff