chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
man: fix udevmonitor text
[elogind.git]
/
udevd.c
diff --git
a/udevd.c
b/udevd.c
index a21d2ab77d6cfe050bad776f66ca96be9948d80b..3adedac0807b722cd9c9b38dc665387feff33de0 100644
(file)
--- a/
udevd.c
+++ b/
udevd.c
@@
-29,6
+29,7
@@
#include <fcntl.h>
#include <syslog.h>
#include <time.h>
#include <fcntl.h>
#include <syslog.h>
#include <time.h>
+#include <getopt.h>
#include <sys/select.h>
#include <sys/wait.h>
#include <sys/types.h>
#include <sys/select.h>
#include <sys/wait.h>
#include <sys/types.h>
@@
-44,6
+45,9
@@
#include "udevd.h"
#include "udev_selinux.h"
#include "udevd.h"
#include "udev_selinux.h"
+static int debug_trace;
+static int verbose;
+
static struct udev_rules rules;
static int udevd_sock = -1;
static int uevent_netlink_sock = -1;
static struct udev_rules rules;
static int udevd_sock = -1;
static int uevent_netlink_sock = -1;
@@
-75,7
+79,15
@@
void log_message(int priority, const char *format, ...)
va_start(args, format);
vsyslog(priority, format, args);
va_end(args);
va_start(args, format);
vsyslog(priority, format, args);
va_end(args);
+
+ if (verbose) {
+ va_start(args, format);
+ vprintf(format, args);
+ va_end(args);
+ printf("\n");
+ }
}
}
+
#endif
static void asmlinkage udev_event_sig_handler(int signum)
#endif
static void asmlinkage udev_event_sig_handler(int signum)
@@
-296,6
+308,15
@@
static void msg_queue_insert(struct udevd_uevent_msg *msg)
export_event_state(msg, EVENT_QUEUED);
export_event_state(msg, EVENT_QUEUED);
+ /* run one event after the other in debug mode */
+ if (debug_trace) {
+ list_add_tail(&msg->node, &running_list);
+ udev_event_run(msg);
+ waitpid(msg->pid, NULL, 0);
+ msg_queue_delete(msg);
+ return;
+ }
+
/* run all events with a timeout set immediately */
if (msg->timeout != 0) {
list_add_tail(&msg->node, &running_list);
/* run all events with a timeout set immediately */
if (msg->timeout != 0) {
list_add_tail(&msg->node, &running_list);
@@
-916,7
+937,14
@@
int main(int argc, char *argv[], char *envp[])
fd_set readfds;
const char *value;
int daemonize = 0;
fd_set readfds;
const char *value;
int daemonize = 0;
- int i;
+ int option;
+ static const struct option options[] = {
+ { "daemon", 0, NULL, 'd' },
+ { "debug-trace", 0, NULL, 't' },
+ { "verbose", 0, NULL, 'v' },
+ { "help", 0, NULL, 'h' },
+ {}
+ };
int rc = 1;
int maxfd;
int rc = 1;
int maxfd;
@@
-926,16
+954,28
@@
int main(int argc, char *argv[], char *envp[])
dbg("version %s", UDEV_VERSION);
/* parse commandline options */
dbg("version %s", UDEV_VERSION);
/* parse commandline options */
- for (i = 1 ; i < argc; i++) {
- char *arg = argv[i];
- if (strcmp(arg, "--daemon") == 0 || strcmp(arg, "-d") == 0)
+ while (1) {
+ option = getopt_long(argc, argv, "dtvh", options, NULL);
+ if (option == -1)
+ break;
+
+ switch (option) {
+ case 'd':
daemonize = 1;
daemonize = 1;
- else if (strcmp(arg, "--help") == 0 || strcmp(arg, "-h") == 0) {
- printf("Usage: udevd [--help] [--daemon]\n");
+ break;
+ case 't':
+ debug_trace = 1;
+ break;
+ case 'v':
+ verbose = 1;
+ if (udev_log_priority < LOG_INFO)
+ udev_log_priority = LOG_INFO;
+ break;
+ case 'h':
+ printf("Usage: udevd [--help] [--daemon] [--debug-trace] [--verbose]\n");
+ goto exit;
+ default:
goto exit;
goto exit;
- } else {
- fprintf(stderr, "unrecognized option '%s'\n", arg);
- err("unrecognized option '%s'\n", arg);
}
}
}
}
@@
-995,7
+1035,8
@@
int main(int argc, char *argv[], char *envp[])
fd = open("/dev/null", O_RDWR);
if (fd >= 0) {
dup2(fd, STDIN_FILENO);
fd = open("/dev/null", O_RDWR);
if (fd >= 0) {
dup2(fd, STDIN_FILENO);
- dup2(fd, STDOUT_FILENO);
+ if (!verbose)
+ dup2(fd, STDOUT_FILENO);
dup2(fd, STDERR_FILENO);
if (fd > STDERR_FILENO)
close(fd);
dup2(fd, STDERR_FILENO);
if (fd > STDERR_FILENO)
close(fd);
@@
-1101,6
+1142,8
@@
int main(int argc, char *argv[], char *envp[])
/* export log_priority , as called programs may want to follow that setting */
sprintf(udev_log, "UDEV_LOG=%i", udev_log_priority);
putenv(udev_log);
/* export log_priority , as called programs may want to follow that setting */
sprintf(udev_log, "UDEV_LOG=%i", udev_log_priority);
putenv(udev_log);
+ if (debug_trace)
+ putenv("DEBUG=1");
maxfd = udevd_sock;
maxfd = UDEV_MAX(maxfd, uevent_netlink_sock);
maxfd = udevd_sock;
maxfd = UDEV_MAX(maxfd, uevent_netlink_sock);