chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
udevadm: don't hit an assert when obsolete parameters are passed
[elogind.git]
/
src
/
udev
/
udevadm-settle.c
diff --git
a/src/udev/udevadm-settle.c
b/src/udev/udevadm-settle.c
index 66fd843012393fac123bd86514ddad5e46a4c374..6bcb3a985e99bb99235198bdfaccd0e36cf28e0e 100644
(file)
--- a/
src/udev/udevadm-settle.c
+++ b/
src/udev/udevadm-settle.c
@@
-25,11
+25,9
@@
#include <errno.h>
#include <dirent.h>
#include <fcntl.h>
#include <errno.h>
#include <dirent.h>
#include <fcntl.h>
-#include <syslog.h>
#include <getopt.h>
#include <signal.h>
#include <time.h>
#include <getopt.h>
#include <signal.h>
#include <time.h>
-#include <sys/inotify.h>
#include <sys/poll.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <sys/poll.h>
#include <sys/stat.h>
#include <sys/types.h>
@@
-39,30
+37,35
@@
#include "util.h"
static void help(void) {
#include "util.h"
static void help(void) {
- printf("Usage: udevadm settle OPTIONS\n"
- " -t,--timeout=<seconds> maximum time to wait for events\n"
- " -E,--exit-if-exists=<file> stop waiting if file exists\n"
- " -h,--help\n\n");
+ printf("%s settle OPTIONS\n\n"
+ "Wait for pending udev events.\n\n"
+ " -h --help Show this help\n"
+ " --version Show package version\n"
+ " -t --timeout=SECONDS Maximum time to wait for events\n"
+ " -E --exit-if-exists=FILE Stop waiting if file exists\n"
+ , program_invocation_short_name);
}
}
-static int adm_settle(struct udev *udev, int argc, char *argv[])
-{
+static int adm_settle(struct udev *udev, int argc, char *argv[]) {
static const struct option options[] = {
static const struct option options[] = {
- { "seq-start", required_argument, NULL, '\0' }, /* removed */
- { "seq-end", required_argument, NULL, '\0' }, /* removed */
{ "timeout", required_argument, NULL, 't' },
{ "exit-if-exists", required_argument, NULL, 'E' },
{ "timeout", required_argument, NULL, 't' },
{ "exit-if-exists", required_argument, NULL, 'E' },
- { "quiet", no_argument, NULL, 'q' }, /* removed */
{ "help", no_argument, NULL, 'h' },
{ "help", no_argument, NULL, 'h' },
+ { "seq-start", required_argument, NULL, 's' }, /* removed */
+ { "seq-end", required_argument, NULL, 'e' }, /* removed */
+ { "quiet", no_argument, NULL, 'q' }, /* removed */
{}
};
const char *exists = NULL;
unsigned int timeout = 120;
struct pollfd pfd[1] = { {.fd = -1}, };
{}
};
const char *exists = NULL;
unsigned int timeout = 120;
struct pollfd pfd[1] = { {.fd = -1}, };
- int rc = EXIT_FAILURE, c;
+ int c;
+ struct udev_queue *queue;
+ int rc = EXIT_FAILURE;
- while ((c = getopt_long(argc, argv, "
s:e:t:E:qh
", options, NULL)) >= 0) {
+ while ((c = getopt_long(argc, argv, "
t:E:hs:e:q
", options, NULL)) >= 0) {
switch (c) {
switch (c) {
+
case 't': {
int r;
case 't': {
int r;
@@
-74,14
+77,24
@@
static int adm_settle(struct udev *udev, int argc, char *argv[])
};
break;
}
};
break;
}
+
case 'E':
exists = optarg;
break;
case 'E':
exists = optarg;
break;
+
case 'h':
help();
case 'h':
help();
- exit(EXIT_SUCCESS);
+ return EXIT_SUCCESS;
+
+ case 's':
+ case 'e':
+ case 'q':
+ log_info("Option -%c no longer supported.", c);
+ return EXIT_FAILURE;
+
case '?':
case '?':
- exit(EXIT_FAILURE);
+ return EXIT_FAILURE;
+
default:
assert_not_reached("Unknown argument");
}
default:
assert_not_reached("Unknown argument");
}
@@
-89,7
+102,7
@@
static int adm_settle(struct udev *udev, int argc, char *argv[])
if (optind < argc) {
fprintf(stderr, "Extraneous argument: '%s'\n", argv[optind]);
if (optind < argc) {
fprintf(stderr, "Extraneous argument: '%s'\n", argv[optind]);
-
exit(EXIT_FAILURE)
;
+
return EXIT_FAILURE
;
}
/* guarantee that the udev daemon isn't pre-processing */
}
/* guarantee that the udev daemon isn't pre-processing */
@@
-101,26
+114,23
@@
static int adm_settle(struct udev *udev, int argc, char *argv[])
if (udev_ctrl_send_ping(uctrl, timeout) < 0) {
log_debug("no connection to daemon");
udev_ctrl_unref(uctrl);
if (udev_ctrl_send_ping(uctrl, timeout) < 0) {
log_debug("no connection to daemon");
udev_ctrl_unref(uctrl);
- rc = EXIT_SUCCESS;
- goto out;
+ return EXIT_SUCCESS;
}
udev_ctrl_unref(uctrl);
}
}
}
udev_ctrl_unref(uctrl);
}
}
- pfd[0].events = POLLIN;
- pfd[0].fd = inotify_init1(IN_CLOEXEC);
- if (pfd[0].fd < 0) {
- log_error("inotify_init failed: %m");
- goto out;
+ queue = udev_queue_new(udev);
+ if (!queue) {
+ log_error("unable to get udev queue");
+ return EXIT_FAILURE;
}
}
- if (inotify_add_watch(pfd[0].fd, "/run/udev/queue" , IN_DELETE) < 0) {
- /* If it does not exist, we don't have to wait */
- if (errno == ENOENT)
- rc = EXIT_SUCCESS;
- else
- log_debug("watching /run/udev/queue failed");
+ pfd[0].events = POLLIN;
+ pfd[0].fd = udev_queue_get_fd(queue);
+ if (pfd[0].fd < 0) {
+ log_debug("queue is empty, nothing to watch");
+ rc = EXIT_SUCCESS;
goto out;
}
goto out;
}
@@
-131,27
+141,23
@@
static int adm_settle(struct udev *udev, int argc, char *argv[])
}
/* exit if queue is empty */
}
/* exit if queue is empty */
- if (
access("/run/udev/queue", F_OK) < 0
) {
+ if (
udev_queue_get_queue_is_empty(queue)
) {
rc = EXIT_SUCCESS;
break;
}
rc = EXIT_SUCCESS;
break;
}
- /* wake up when "queue" file is deleted */
- if (poll(pfd, 1, 100) > 0 && pfd[0].revents & POLLIN) {
- char buf[sizeof(struct inotify_event) + PATH_MAX];
-
- read(pfd[0].fd, buf, sizeof(buf));
- }
+ /* wake up when queue is empty */
+ if (poll(pfd, 1, MSEC_PER_SEC) > 0 && pfd[0].revents & POLLIN)
+ udev_queue_flush(queue);
}
out:
}
out:
- if (pfd[0].fd >= 0)
- close(pfd[0].fd);
+ udev_queue_unref(queue);
return rc;
}
const struct udevadm_cmd udevadm_settle = {
.name = "settle",
.cmd = adm_settle,
return rc;
}
const struct udevadm_cmd udevadm_settle = {
.name = "settle",
.cmd = adm_settle,
- .help = "
w
ait for pending udev events",
+ .help = "
W
ait for pending udev events",
};
};