chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
correct use of fcntl()
[elogind.git]
/
udevd.c
diff --git
a/udevd.c
b/udevd.c
index ff61c656c872c3d834efef79f6be1604136f9953..701165b9ad0df601ecb53dcf53480843634ae0f9 100644
(file)
--- a/
udevd.c
+++ b/
udevd.c
@@
-42,16
+42,11
@@
#include <linux/types.h>
#include <linux/netlink.h>
#include <linux/types.h>
#include <linux/netlink.h>
-#include "list.h"
-#include "udev_libc_wrapper.h"
#include "udev.h"
#include "udev.h"
-#include "udev_version.h"
#include "udev_rules.h"
#include "udev_rules.h"
-#include "udev_utils.h"
#include "udevd.h"
#include "udevd.h"
-#include "logging.h"
-struct udev_rules rules;
+st
atic st
ruct udev_rules rules;
static int udevd_sock;
static int uevent_netlink_sock;
static int inotify_fd;
static int udevd_sock;
static int uevent_netlink_sock;
static int inotify_fd;
@@
-94,8
+89,7
@@
static void asmlinkage udev_event_sig_handler(int signum)
static int udev_event_process(struct uevent_msg *msg)
{
struct sigaction act;
static int udev_event_process(struct uevent_msg *msg)
{
struct sigaction act;
- struct udevice udev;
- struct name_entry *name_loop;
+ struct udevice *udev;
int i;
int retval;
int i;
int retval;
@@
-106,30
+100,50
@@
static int udev_event_process(struct uevent_msg *msg)
act.sa_flags = 0;
sigaction(SIGALRM, &act, NULL);
act.sa_flags = 0;
sigaction(SIGALRM, &act, NULL);
+ /* reset to default */
+ act.sa_handler = SIG_DFL;
+ sigaction(SIGINT, &act, NULL);
+ sigaction(SIGTERM, &act, NULL);
+ sigaction(SIGCHLD, &act, NULL);
+ sigaction(SIGHUP, &act, NULL);
+
/* trigger timeout to prevent hanging processes */
alarm(UDEV_ALARM_TIMEOUT);
/* trigger timeout to prevent hanging processes */
alarm(UDEV_ALARM_TIMEOUT);
- /* reconstruct e
nv
from message */
+ /* reconstruct e
vent environment
from message */
for (i = 0; msg->envp[i]; i++)
putenv(msg->envp[i]);
for (i = 0; msg->envp[i]; i++)
putenv(msg->envp[i]);
- udev_init_device(&udev, msg->devpath, msg->subsystem, msg->action);
- retval = udev_process_event(&rules, &udev);
+ udev = udev_device_init();
+ if (udev == NULL)
+ return -1;
+ strlcpy(udev->action, msg->action, sizeof(udev->action));
+ sysfs_device_set_values(udev->dev, msg->devpath, msg->subsystem);
+ udev->devt = msg->devt;
+
+ retval = udev_device_event(&rules, udev);
/* run programs collected by RUN-key*/
/* run programs collected by RUN-key*/
- if (!retval) {
- list_for_each_entry(name_loop, &udev.run_list, node) {
+ if (retval == 0 && !udev->ignore_device && udev_run) {
+ struct name_entry *name_loop;
+
+ dbg("executing run list");
+ list_for_each_entry(name_loop, &udev->run_list, node) {
if (strncmp(name_loop->name, "socket:", strlen("socket:")) == 0)
pass_env_to_socket(&name_loop->name[strlen("socket:")], msg->devpath, msg->action);
if (strncmp(name_loop->name, "socket:", strlen("socket:")) == 0)
pass_env_to_socket(&name_loop->name[strlen("socket:")], msg->devpath, msg->action);
- else
- if (run_program(name_loop->name, udev.subsystem, NULL, 0, NULL,
+ else {
+ char program[PATH_SIZE];
+
+ strlcpy(program, name_loop->name, sizeof(program));
+ udev_rules_apply_format(udev, program, sizeof(program));
+ if (run_program(program, udev->dev->subsystem, NULL, 0, NULL,
(udev_log_priority >= LOG_INFO)))
retval = -1;
(udev_log_priority >= LOG_INFO)))
retval = -1;
+ }
}
}
}
}
- udev_cleanup_device(&udev);
-
+ udev_device_cleanup(udev);
return retval;
}
return retval;
}
@@
-193,6
+207,10
@@
static void export_event_state(struct uevent_msg *msg, enum event_state state)
if (loop_msg->devpath && strcmp(loop_msg->devpath, msg->devpath) == 0)
return;
if (loop_msg->devpath && strcmp(loop_msg->devpath, msg->devpath) == 0)
return;
+ list_for_each_entry(loop_msg, &exec_list, node)
+ if (loop_msg->devpath && strcmp(loop_msg->devpath, msg->devpath) == 0)
+ return;
+
/* move failed events to the failed directory */
if (state == EVENT_FAILED) {
create_path(filename_failed);
/* move failed events to the failed directory */
if (state == EVENT_FAILED) {
create_path(filename_failed);
@@
-515,12
+533,11
@@
static struct uevent_msg *get_msg_from_envbuf(const char *buf, int buf_size)
msg->envp[i++] = "UDEVD_EVENT=1";
msg->envp[i] = NULL;
msg->envp[i++] = "UDEVD_EVENT=1";
msg->envp[i] = NULL;
- if (
!msg->devpath
) {
- info("DEVPATH missing, ignore message");
+ if (
msg->devpath == NULL || msg->action == NULL
) {
+ info("DEVPATH
or ACTION
missing, ignore message");
free(msg);
return NULL;
}
free(msg);
return NULL;
}
-
return msg;
}
return msg;
}
@@
-574,7
+591,6
@@
static struct uevent_msg *get_udevd_msg(void)
switch (usend_msg.type) {
case UDEVD_UEVENT_UDEVSEND:
switch (usend_msg.type) {
case UDEVD_UEVENT_UDEVSEND:
- case UDEVD_UEVENT_INITSEND:
info("udevd event message received");
envbuf_size = size - offsetof(struct udevd_msg, envbuf);
dbg("envbuf_size=%i", envbuf_size);
info("udevd event message received");
envbuf_size = size - offsetof(struct udevd_msg, envbuf);
dbg("envbuf_size=%i", envbuf_size);
@@
-620,7
+636,7
@@
static struct uevent_msg *get_netlink_msg(void)
struct uevent_msg *msg;
int bufpos;
ssize_t size;
struct uevent_msg *msg;
int bufpos;
ssize_t size;
- static char buffer[UEVENT_BUFFER_SIZE
+
512];
+ static char buffer[UEVENT_BUFFER_SIZE
+
512];
char *pos;
size = recv(uevent_netlink_sock, &buffer, sizeof(buffer), 0);
char *pos;
size = recv(uevent_netlink_sock, &buffer, sizeof(buffer), 0);
@@
-819,7
+835,7
@@
int main(int argc, char *argv[], char *envp[])
if (fd < 0)
err("fatal, could not open /dev/null: %s", strerror(errno));
if (fd < 0)
err("fatal, could not open /dev/null: %s", strerror(errno));
- udev_
init_config
();
+ udev_
config_init
();
dbg("version %s", UDEV_VERSION);
if (getuid() != 0) {
dbg("version %s", UDEV_VERSION);
if (getuid() != 0) {
@@
-859,6
+875,7
@@
int main(int argc, char *argv[], char *envp[])
}
/* parse the rules and keep it in memory */
}
/* parse the rules and keep it in memory */
+ sysfs_init();
udev_rules_init(&rules, 1);
if (daemonize) {
udev_rules_init(&rules, 1);
if (daemonize) {
@@
-904,12
+921,24
@@
int main(int argc, char *argv[], char *envp[])
err("error getting pipes: %s", strerror(errno));
goto exit;
}
err("error getting pipes: %s", strerror(errno));
goto exit;
}
- retval = fcntl(signal_pipe[READ_END], F_SETFL, O_NONBLOCK);
+
+ retval = fcntl(signal_pipe[READ_END], F_GETFL, 0);
+ if (retval < 0) {
+ err("error fcntl on read pipe: %s", strerror(errno));
+ goto exit;
+ }
+ retval = fcntl(signal_pipe[READ_END], F_SETFL, retval | O_NONBLOCK);
if (retval < 0) {
err("error fcntl on read pipe: %s", strerror(errno));
goto exit;
}
if (retval < 0) {
err("error fcntl on read pipe: %s", strerror(errno));
goto exit;
}
- retval = fcntl(signal_pipe[WRITE_END], F_SETFL, O_NONBLOCK);
+
+ retval = fcntl(signal_pipe[WRITE_END], F_GETFL, 0);
+ if (retval < 0) {
+ err("error fcntl on write pipe: %s", strerror(errno));
+ goto exit;
+ }
+ retval = fcntl(signal_pipe[WRITE_END], F_SETFL, retval | O_NONBLOCK);
if (retval < 0) {
err("error fcntl on write pipe: %s", strerror(errno));
goto exit;
if (retval < 0) {
err("error fcntl on write pipe: %s", strerror(errno));
goto exit;
@@
-1020,7
+1049,7
@@
int main(int argc, char *argv[], char *envp[])
/* rules changed, set by inotify or a signal*/
if (reload_config) {
reload_config = 0;
/* rules changed, set by inotify or a signal*/
if (reload_config) {
reload_config = 0;
- udev_rules_cl
ose
(&rules);
+ udev_rules_cl
eanup
(&rules);
udev_rules_init(&rules, 1);
}
udev_rules_init(&rules, 1);
}
@@
-1038,7
+1067,8
@@
int main(int argc, char *argv[], char *envp[])
}
exit:
}
exit:
- udev_rules_close(&rules);
+ udev_rules_cleanup(&rules);
+ sysfs_cleanup();
if (signal_pipe[READ_END] > 0)
close(signal_pipe[READ_END]);
if (signal_pipe[READ_END] > 0)
close(signal_pipe[READ_END]);