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] volume_id: Fix label/uuid reading for reiserfs
[elogind.git]
/
udev.c
diff --git
a/udev.c
b/udev.c
index 7854bc74d0a2f4a8e7f98c3881bf4946c13de409..069cecf973193212f82a89a7c0743e6d256a83fc 100644
(file)
--- a/
udev.c
+++ b/
udev.c
@@
-32,15
+32,16
@@
#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
+#ifdef
USE_
LOG
void log_message(int level, const char *format, ...)
{
va_list args;
void log_message(int level, const char *format, ...)
{
va_list args;
@@
-96,16
+97,16
@@
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
];
+ char path[
PATH_SIZE
];
const char *error;
const char *action;
const char *devpath;
const char *subsystem;
int managed_event;
const char *error;
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) {
int retval = -EINVAL;
if (argc == 2 && strcmp(argv[1], "-V") == 0) {
@@
-130,17
+131,6
@@
int main(int argc, char *argv[], char *envp[])
/* trigger timeout to prevent hanging processes */
alarm(ALARM_TIMEOUT);
/* trigger timeout to prevent hanging processes */
alarm(ALARM_TIMEOUT);
- if (strstr(argv[0], "udevstart") || (argc == 2 && strstr(argv[1], "udevstart"))) {
- dbg("udevstart");
-
- /* disable all logging, as it's much too slow on some facilities */
- udev_log = 0;
-
- namedev_init();
- retval = udev_start();
- goto exit;
- }
-
/* let the executed programs know if we handle the whole hotplug event */
managed_event = manage_hotplug_event();
if (managed_event)
/* let the executed programs know if we handle the whole hotplug event */
managed_event = manage_hotplug_event();
if (managed_event)
@@
-153,16
+143,10
@@
int main(int argc, char *argv[], char *envp[])
if (!subsystem && argc == 2)
subsystem = argv[1];
if (!subsystem && argc == 2)
subsystem = argv[1];
- if (!action) {
- dbg("no action");
- goto hotplug;
- }
- if (!subsystem) {
- dbg("no subsystem");
- goto hotplug;
- }
- if (!devpath) {
- dbg("no devpath");
+ udev_init_device(&udev, devpath, subsystem);
+
+ if (!action || !subsystem || !devpath) {
+ dbg("action, subsystem or devpath missing");
goto hotplug;
}
goto hotplug;
}
@@
-170,20
+154,19
@@
int main(int argc, char *argv[], char *envp[])
if (udev_log)
setenv("UDEV_LOG", "1", 1);
if (udev_log)
setenv("UDEV_LOG", "1", 1);
- udev_init_device(&udev, devpath, subsystem);
-
- if (udev.type == BLOCK || udev.type == CLASS || udev.type == NET) {
+ 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");
/* skip subsystems without "dev", but handle net devices */
if (strcmp(action, "add") == 0) {
/* wait for sysfs and possibly add node */
dbg("udev add");
/* skip subsystems without "dev", but handle net devices */
- if (udev.type != NET && subsystem_expect_no_dev(udev.subsystem)) {
+ 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) {
dbg ("open class device failed");
class_dev = wait_class_device_open(path);
if (class_dev == NULL) {
dbg ("open class device failed");
@@
-194,7
+177,7
@@
int main(int argc, char *argv[], char *envp[])
wait_for_class_device(class_dev, &error);
/* init rules */
wait_for_class_device(class_dev, &error);
/* init rules */
-
namedev
_init();
+
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);
@@
-220,12
+203,13
@@
int main(int argc, char *argv[], char *envp[])
if (udev_dev_d)
udev_multiplex_directory(&udev, DEVD_DIR, DEVD_SUFFIX);
}
if (udev_dev_d)
udev_multiplex_directory(&udev, DEVD_DIR, DEVD_SUFFIX);
}
- } else if (udev.type ==
PHYSDEV
) {
+ } 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)");
@@
-244,10
+228,10
@@
int main(int argc, char *argv[], char *envp[])
}
hotplug:
}
hotplug:
+ udev_cleanup_device(&udev);
if (udev_hotplug_d && managed_event)
udev_multiplex_directory(&udev, HOTPLUGD_DIR, HOTPLUG_SUFFIX);
if (udev_hotplug_d && managed_event)
udev_multiplex_directory(&udev, HOTPLUGD_DIR, HOTPLUG_SUFFIX);
-exit:
logging_close();
return retval;
}
logging_close();
return retval;
}