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] udevinfo: print errors to stderr instead of stdout
[elogind.git]
/
udev.c
diff --git
a/udev.c
b/udev.c
index 3a97eb1046d006009abf65053cfdfabcb7c8916b..6d1d679d9a0ccd446f988cb605c407dd545c123f 100644
(file)
--- a/
udev.c
+++ b/
udev.c
@@
-32,50
+32,54
@@
#include <unistd.h>
#include "libsysfs/sysfs/libsysfs.h"
#include <unistd.h>
#include "libsysfs/sysfs/libsysfs.h"
+#include "udev_libc_wrapper.h"
#include "udev.h"
#include "udev_utils.h"
#include "udev_sysfs.h"
#include "udev_version.h"
#include "udev.h"
#include "udev_utils.h"
#include "udev_sysfs.h"
#include "udev_version.h"
-#include "
namedev
.h"
+#include "
udev_rules
.h"
#include "logging.h"
#include "logging.h"
-
-#ifdef LOG
-unsigned char logname[LOGNAME_SIZE];
-void log_message(int level, const char *format, ...)
+#ifdef USE_LOG
+void log_message(int priority, const char *format, ...)
{
va_list args;
{
va_list args;
- if (
!udev_log
)
+ if (
priority > udev_log_priority
)
return;
va_start(args, format);
return;
va_start(args, format);
- vsyslog(
level
, format, args);
+ vsyslog(
priority
, format, args);
va_end(args);
}
#endif
va_end(args);
}
#endif
-/* (for now) true if udevsend is the helper */
+/* decide if we should manage the whole hotplug event
+ * for now look if the kernel calls udevsend instead of /sbin/hotplug
+ */
static int manage_hotplug_event(void) {
char helper[256];
int fd;
int len;
static int manage_hotplug_event(void) {
char helper[256];
int fd;
int len;
+ /* don't handle hotplug.d if we are called directly */
+ if (!getenv("UDEVD_EVENT"))
+ return 0;
+
fd = open("/proc/sys/kernel/hotplug", O_RDONLY);
if (fd < 0)
fd = open("/proc/sys/kernel/hotplug", O_RDONLY);
if (fd < 0)
-
goto exit
;
+
return 0
;
len = read(fd, helper, 256);
close(fd);
if (len < 0)
len = read(fd, helper, 256);
close(fd);
if (len < 0)
-
goto exit
;
+
return 0
;
helper[len] = '\0';
if (strstr(helper, "udevsend"))
return 1;
helper[len] = '\0';
if (strstr(helper, "udevsend"))
return 1;
-exit:
return 0;
}
return 0;
}
@@
-92,119
+96,122
@@
static void asmlinkage sig_handler(int signum)
int main(int argc, char *argv[], char *envp[])
{
int main(int argc, char *argv[], char *envp[])
{
- struct sigaction act;
struct sysfs_class_device *class_dev;
struct sysfs_device *devices_dev;
struct udevice udev;
struct sysfs_class_device *class_dev;
struct sysfs_device *devices_dev;
struct udevice udev;
- char path[SYSFS_PATH_MAX];
- int retval = -EINVAL;
+ char path[PATH_SIZE];
const char *error;
const char *error;
- const char *action = getenv("ACTION");
- const char *devpath = getenv("DEVPATH");
- const char *subsystem = argv[1];
+ const char *action;
+ const char *devpath;
+ const char *subsystem;
+ int managed_event;
+ struct sigaction act;
+ int retval = -EINVAL;
+
+ if (argc == 2 && strcmp(argv[1], "-V") == 0) {
+ printf("%s\n", UDEV_VERSION);
+ exit(0);
+ }
- dbg("version %s", UDEV_VERSION);
logging_init("udev");
udev_init_config();
logging_init("udev");
udev_init_config();
+ dbg("version %s", UDEV_VERSION);
/* set signal handlers */
/* set signal handlers */
- act.sa_handler = (void (*) (int))sig_handler;
+ memset(&act, 0x00, sizeof(act));
+ act.sa_handler = (void (*)(int)) sig_handler;
sigemptyset (&act.sa_mask);
act.sa_flags = 0;
sigemptyset (&act.sa_mask);
act.sa_flags = 0;
- /* alarm must not restart syscalls*/
sigaction(SIGALRM, &act, NULL);
sigaction(SIGINT, &act, NULL);
sigaction(SIGTERM, &act, NULL);
sigaction(SIGALRM, &act, NULL);
sigaction(SIGINT, &act, NULL);
sigaction(SIGTERM, &act, NULL);
- /* trigger timeout to
interrupt blocking syscall
s */
+ /* trigger timeout to
prevent hanging processe
s */
alarm(ALARM_TIMEOUT);
alarm(ALARM_TIMEOUT);
- udev_set_values(&udev, devpath, subsystem, action);
+ /* let the executed programs know if we handle the whole hotplug event */
+ managed_event = manage_hotplug_event();
+ if (managed_event)
+ setenv("MANAGED_EVENT", "1", 1);
- if (strstr(argv[0], "udevstart") || (argv[1] != NULL && strstr(argv[1], "udevstart"))) {
- dbg("udevstart");
+ action = getenv("ACTION");
+ devpath = getenv("DEVPATH");
+ subsystem = getenv("SUBSYSTEM");
+ /* older kernels passed the SUBSYSTEM only as argument */
+ if (!subsystem && argc == 2)
+ subsystem = argv[1];
- /* disable all logging, as it's much too slow on some facilities */
- udev_log = 0;
+ udev_init_device(&udev, devpath, subsystem);
- namedev_init();
- retval = udev_start();
- goto exit;
- }
-
- if (!action) {
- dbg("no action");
+ if (!action || !subsystem || !devpath) {
+ err("action, subsystem or devpath missing");
goto hotplug;
}
goto hotplug;
}
- if (!subsystem) {
- dbg("no subsystem");
- goto hotplug;
- }
+ /* export logging flag, as called scripts may want to do the same as udev */
+ if (udev_log_priority) {
+ char priority[32];
- if (!devpath) {
- dbg("no devpath");
- goto hotplug;
+ sprintf(priority, "%i", udev_log_priority);
+ setenv("UDEV_LOG", priority, 1);
}
}
- /* export logging flag, as called scripts may want to do the same as udev */
- if (udev_log)
- setenv("UDEV_LOG", "1", 1);
-
- if ((strncmp(devpath, "/block/", 7) == 0) || (strncmp(devpath, "/class/", 7) == 0)) {
+ if (udev.type == DEV_BLOCK || udev.type == DEV_CLASS || udev.type == DEV_NET) {
if (strcmp(action, "add") == 0) {
/* wait for sysfs and possibly add node */
dbg("udev add");
if (strcmp(action, "add") == 0) {
/* wait for sysfs and possibly add node */
dbg("udev add");
- /* skip
blacklisted subsystem
s */
- if (udev.type !=
'n'
&& subsystem_expect_no_dev(udev.subsystem)) {
+ /* skip
subsystems without "dev", but handle net device
s */
+ if (udev.type !=
DEV_NET
&& subsystem_expect_no_dev(udev.subsystem)) {
dbg("don't care about '%s' devices", udev.subsystem);
goto hotplug;
dbg("don't care about '%s' devices", udev.subsystem);
goto hotplug;
- }
;
+ }
- snprintf(path, SYSFS_PATH_MAX, "%s%s", sysfs_path, udev.devpath);
+ snprintf(path, sizeof(path), "%s%s", sysfs_path, udev.devpath);
+ path[sizeof(path)-1] = '\0';
class_dev = wait_class_device_open(path);
if (class_dev == NULL) {
class_dev = wait_class_device_open(path);
if (class_dev == NULL) {
- dbg
("open class device failed");
+ dbg("open class device failed");
goto hotplug;
}
dbg("opened class_dev->name='%s'", class_dev->name);
wait_for_class_device(class_dev, &error);
goto hotplug;
}
dbg("opened class_dev->name='%s'", class_dev->name);
wait_for_class_device(class_dev, &error);
- /* init rules
, permissions
*/
-
namedev
_init();
+ /* init rules */
+
udev_rules
_init();
/* name, create node, store in db */
retval = udev_add_device(&udev, class_dev);
/* name, create node, store in db */
retval = udev_add_device(&udev, class_dev);
- /* run dev.d/ scripts if we created a node or changed a netif name */
- if (udev_dev_d && udev.devname[0] != '\0') {
- setenv("DEVNAME", udev.devname, 1);
- udev_multiplex_directory(&udev, DEVD_DIR, DEVD_SUFFIX);
- }
-
sysfs_close_class_device(class_dev);
} else if (strcmp(action, "remove") == 0) {
/* possibly remove a node */
dbg("udev remove");
sysfs_close_class_device(class_dev);
} else if (strcmp(action, "remove") == 0) {
/* possibly remove a node */
dbg("udev remove");
+ /* skip subsystems without "dev" */
+ if (subsystem_expect_no_dev(udev.subsystem)) {
+ dbg("don't care about '%s' devices", udev.subsystem);
+ goto hotplug;
+ }
+
/* get node from db, remove db-entry, delete created node */
retval = udev_remove_device(&udev);
/* get node from db, remove db-entry, delete created node */
retval = udev_remove_device(&udev);
+ }
- /* run dev.d/ scripts if we're not instructed to ignore the event */
- if (udev_dev_d && udev.devname[0] != '\0') {
- setenv("DEVNAME", udev.devname, 1);
+ /* run dev.d/ scripts if we created/deleted a node or changed a netif name */
+ if (udev.devname[0] != '\0') {
+ setenv("DEVNAME", udev.devname, 1);
+ if (udev_dev_d)
udev_multiplex_directory(&udev, DEVD_DIR, DEVD_SUFFIX);
udev_multiplex_directory(&udev, DEVD_DIR, DEVD_SUFFIX);
- }
-
}
}
- } else if (
(strncmp(devpath, "/devices/", 9) == 0)
) {
+ } else if (
udev.type == DEV_DEVICE
) {
if (strcmp(action, "add") == 0) {
/* wait for sysfs */
dbg("devices add");
if (strcmp(action, "add") == 0) {
/* wait for sysfs */
dbg("devices add");
- snprintf(path, SYSFS_PATH_MAX, "%s%s", sysfs_path, devpath);
+ snprintf(path, sizeof(path), "%s%s", sysfs_path, devpath);
+ path[sizeof(path)-1] = '\0';
devices_dev = wait_devices_device_open(path);
if (!devices_dev) {
dbg("devices device unavailable (probably remove has beaten us)");
devices_dev = wait_devices_device_open(path);
if (!devices_dev) {
dbg("devices device unavailable (probably remove has beaten us)");
@@
-223,10
+230,10
@@
int main(int argc, char *argv[], char *envp[])
}
hotplug:
}
hotplug:
- if (udev_hotplug_d && manage_hotplug_event())
+ udev_cleanup_device(&udev);
+ if (udev_hotplug_d && managed_event)
udev_multiplex_directory(&udev, HOTPLUGD_DIR, HOTPLUG_SUFFIX);
udev_multiplex_directory(&udev, HOTPLUGD_DIR, HOTPLUG_SUFFIX);
-exit:
logging_close();
return retval;
}
logging_close();
return retval;
}