shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-23 21:35:11 +03:00
Code

udev_rules_run() -> udev_event_execute_run();

Browse Source
This commit is contained in:
Kay Sievers 2008-10-18 15:50:16 +02:00
parent dcdcb8cc06
commit 2d73813ebc
5 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
udev/test-udev.c
View File

@ -104,7 +104,7 @@ int main(int argc, char *argv[])
alarm(udev_device_get_event_timeout(dev));
if (err == 0 && !event->ignore_device && udev_get_run(udev))
udev_rules_run(event);
udev_event_execute_run(event);
udev_event_unref(event);
udev_device_unref(dev);

33
udev/udev-event.c
View File

@ -282,3 +282,36 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules)
exit:
return err;
}
int udev_event_execute_run(struct udev_event *event)
{
struct udev_list_entry *list_entry;
int err = 0;
dbg(event->udev, "executing run list\n");
udev_list_entry_foreach(list_entry, udev_list_get_entry(&event->run_list)) {
const char *cmd = udev_list_entry_get_name(list_entry);
if (strncmp(cmd, "socket:", strlen("socket:")) == 0) {
struct udev_monitor *monitor;
monitor = udev_monitor_new_from_socket(event->udev, &cmd[strlen("socket:")]);
if (monitor == NULL)
continue;
udev_monitor_send_device(monitor, event->dev);
udev_monitor_unref(monitor);
} else {
char program[UTIL_PATH_SIZE];
char **envp;
util_strlcpy(program, cmd, sizeof(program));
udev_rules_apply_format(event, program, sizeof(program));
envp = udev_device_get_properties_envp(event->dev);
if (run_program(event->udev, program, envp, NULL, 0, NULL) != 0) {
if (!udev_list_entry_get_flag(list_entry))
err = -1;
}
}
}
return err;
}

33
udev/udev-rules.c
View File

@ -374,39 +374,6 @@ static int import_parent_into_env(struct udev_device *dev, const char *filter)
return 0;
}
int udev_rules_run(struct udev_event *event)
{
struct udev_list_entry *list_entry;
int err = 0;
dbg(event->udev, "executing run list\n");
udev_list_entry_foreach(list_entry, udev_list_get_entry(&event->run_list)) {
const char *cmd = udev_list_entry_get_name(list_entry);
if (strncmp(cmd, "socket:", strlen("socket:")) == 0) {
struct udev_monitor *monitor;
monitor = udev_monitor_new_from_socket(event->udev, &cmd[strlen("socket:")]);
if (monitor == NULL)
continue;
udev_monitor_send_device(monitor, event->dev);
udev_monitor_unref(monitor);
} else {
char program[UTIL_PATH_SIZE];
char **envp;
util_strlcpy(program, cmd, sizeof(program));
udev_rules_apply_format(event, program, sizeof(program));
envp = udev_device_get_properties_envp(event->dev);
if (run_program(event->udev, program, envp, NULL, 0, NULL) != 0) {
if (!udev_list_entry_get_flag(list_entry))
err = -1;
}
}
}
return err;
}
#define WAIT_LOOP_PER_SECOND 50
static int wait_for_file(struct udev_event *event, const char *file, int timeout)
{

2
udev/udev.h
View File

@ -90,13 +90,13 @@ struct udev_rules;
extern struct udev_event *udev_event_new(struct udev_device *dev);
extern void udev_event_unref(struct udev_event *event);
extern int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules);
extern int udev_event_execute_run(struct udev_event *event);
/* udev-rules.c */
extern struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names);
extern void udev_rules_unref(struct udev_rules *rules);
extern int udev_rules_get_name(struct udev_rules *rules, struct udev_event *event);
extern int udev_rules_get_run(struct udev_rules *rules, struct udev_event *event);
extern int udev_rules_run(struct udev_event *event);
extern void udev_rules_apply_format(struct udev_event *event, char *string, size_t maxsize);
/* udev-node.c */

2
udev/udevd.c
View File

@ -220,7 +220,7 @@ static void event_fork(struct udev_event *event)
/* execute RUN= */
if (err == 0 && !event->ignore_device && udev_get_run(event->udev))
udev_rules_run(event);
udev_event_execute_run(event);
info(event->udev, "seq %llu exit with %i\n", udev_device_get_seqnum(event->dev), err);
logging_close();
if (err != 0)