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] update extras/multipath
[elogind.git]
/
udev.c
diff --git
a/udev.c
b/udev.c
index 55a324efbc9a87d84340022a3a8b8b8fc01107c0..ce6d6ce9df22a7b2cb9ab3bb84133d25906d2d18 100644
(file)
--- a/
udev.c
+++ b/
udev.c
@@
-38,23
+38,30
@@
/* global variables */
char **main_argv;
char **main_envp;
/* global variables */
char **main_argv;
char **main_envp;
-unsigned char logname[42];
-int log_ok(void)
+#ifdef LOG
+unsigned char logname[42];
+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)
{
static void sig_handler(int signum)
{
- dbg("caught signal %d", signum);
switch (signum) {
case SIGINT:
case SIGTERM:
sysbus_disconnect();
udevdb_exit();
exit(20 + signum);
switch (signum) {
case SIGINT:
case SIGTERM:
sysbus_disconnect();
udevdb_exit();
exit(20 + signum);
- break;
default:
dbg("unhandled signal");
}
default:
dbg("unhandled signal");
}
@@
-100,6
+107,7
@@
static int udev_hotplug(int argc, char **argv)
char *subsystem;
int retval = -EINVAL;
int i;
char *subsystem;
int retval = -EINVAL;
int i;
+ struct sigaction act;
action = get_action();
if (!action) {
action = get_action();
if (!action) {
@@
-146,14
+154,17
@@
static int udev_hotplug(int argc, char **argv)
}
/* set up a default signal handler for now */
}
/* set up a default signal handler for now */
- signal(SIGINT, sig_handler);
- signal(SIGTERM, sig_handler);
+ 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(devpath, subsystem);
+ retval = udev_add_device(devpath, subsystem
, 0
);
else if (strcmp(action, "remove") == 0)
retval = udev_remove_device(devpath, subsystem);
else if (strcmp(action, "remove") == 0)
retval = udev_remove_device(devpath, subsystem);