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] remove usage of expr in ide-devfs.sh
[elogind.git]
/
udev.c
diff --git
a/udev.c
b/udev.c
index b45fb336be8c631023b891a7a60b3840433a6f07..4ae46845368e6880e72381466133c7cfaae46554 100644
(file)
--- a/
udev.c
+++ b/
udev.c
@@
-27,58
+27,46
@@
#include <ctype.h>
#include <signal.h>
#include <ctype.h>
#include <signal.h>
+#include "libsysfs/sysfs/libsysfs.h"
#include "udev.h"
#include "udev_version.h"
#include "udev_dbus.h"
#include "logging.h"
#include "namedev.h"
#include "udevdb.h"
#include "udev.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;
/* global variables */
char **main_argv;
char **main_envp;
+
+#ifdef LOG
unsigned char logname[42];
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)
{
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");
}
}
-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",
static char *subsystem_blacklist[] = {
"net",
"scsi_host",
@@
-88,23
+76,24
@@
static char *subsystem_blacklist[] = {
"",
};
"",
};
-static int udev_hotplug(
int argc, char **argv
)
+static int udev_hotplug(
void
)
{
char *action;
char *devpath;
char *subsystem;
int retval = -EINVAL;
int i;
{
char *action;
char *devpath;
char *subsystem;
int retval = -EINVAL;
int i;
+ struct sigaction act;
action = get_action();
if (!action) {
action = get_action();
if (!action) {
- dbg
("no action?");
+ dbg("no action?");
goto exit;
}
devpath = get_devpath();
if (!devpath) {
goto exit;
}
devpath = get_devpath();
if (!devpath) {
- dbg
("no devpath?");
+ dbg("no devpath?");
goto exit;
}
dbg("looking at '%s'", devpath);
goto exit;
}
dbg("looking at '%s'", devpath);
@@
-117,7
+106,11
@@
static int udev_hotplug(int argc, char **argv)
}
/* skip blacklisted subsystems */
}
/* skip blacklisted subsystems */
- subsystem = argv[1];
+ subsystem = get_subsystem(main_argv[1]);
+ if (!subsystem) {
+ dbg("no subsystem?");
+ goto exit;
+ }
i = 0;
while (subsystem_blacklist[i][0] != '\0') {
if (strcmp(subsystem, subsystem_blacklist[i]) == 0) {
i = 0;
while (subsystem_blacklist[i][0] != '\0') {
if (strcmp(subsystem, subsystem_blacklist[i]) == 0) {
@@
-130,9
+123,6
@@
static int udev_hotplug(int argc, char **argv)
/* connect to the system message bus */
sysbus_connect();
/* 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) {
/* initialize udev database */
retval = udevdb_init(UDEVDB_DEFAULT);
if (retval != 0) {
@@
-141,14
+131,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);
@@
-176,9
+169,11
@@
int main(int argc, char **argv, char **envp)
main_envp = envp;
init_logging("udev");
main_envp = envp;
init_logging("udev");
- dbg("version %s", UDEV_VERSION);
- return udev_hotplug(argc, argv);
-}
+ /* initialize our configuration */
+ udev_init_config();
+ dbg("version %s", UDEV_VERSION);
+ return udev_hotplug();
+}