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: settle - fix typo
[elogind.git]
/
udev
/
udevadm-settle.c
diff --git
a/udev/udevadm-settle.c
b/udev/udevadm-settle.c
index d066ef90ce8d6dd5c9aca049e83aac4f15483349..8a765f61cf6b83bc02a4c433c65a1f23ec2bb5fc 100644
(file)
--- a/
udev/udevadm-settle.c
+++ b/
udev/udevadm-settle.c
@@
-36,12
+36,14
@@
int udevadm_settle(struct udev *udev, int argc, char *argv[])
{
static const struct option options[] = {
int udevadm_settle(struct udev *udev, int argc, char *argv[])
{
static const struct option options[] = {
- { "timeout", 1, NULL, 't' },
- { "help", 0, NULL, 'h' },
+ { "timeout", required_argument, NULL, 't' },
+ { "quiet", no_argument, NULL, 'q' },
+ { "help", no_argument, NULL, 'h' },
{}
};
int timeout = DEFAULT_TIMEOUT;
{}
};
int timeout = DEFAULT_TIMEOUT;
- struct udev_queue *udev_queue;
+ int quiet = 0;
+ struct udev_queue *udev_queue = NULL;
int loop;
int rc = 0;
int loop;
int rc = 0;
@@
-51,21
+53,24
@@
int udevadm_settle(struct udev *udev, int argc, char *argv[])
int option;
int seconds;
int option;
int seconds;
- option = getopt_long(argc, argv, "t:h", options, NULL);
+ option = getopt_long(argc, argv, "t:
q
h", options, NULL);
if (option == -1)
break;
switch (option) {
case 't':
seconds = atoi(optarg);
if (option == -1)
break;
switch (option) {
case 't':
seconds = atoi(optarg);
- if (seconds > 0)
+ if (seconds >
=
0)
timeout = seconds;
else
fprintf(stderr, "invalid timeout value\n");
dbg(udev, "timeout=%i\n", timeout);
break;
timeout = seconds;
else
fprintf(stderr, "invalid timeout value\n");
dbg(udev, "timeout=%i\n", timeout);
break;
+ case 'q':
+ quiet = 1;
+ break;
case 'h':
case 'h':
- printf("Usage: udevadm settle [--help] [--timeout=<seconds>]\n\n");
+ printf("Usage: udevadm settle [--help] [--timeout=<seconds>]
[--quiet]
\n\n");
goto exit;
}
}
goto exit;
}
}
@@
-82,12
+87,14
@@
int udevadm_settle(struct udev *udev, int argc, char *argv[])
if (loop <= 0) {
struct udev_list_entry *list_entry;
if (loop <= 0) {
struct udev_list_entry *list_entry;
- info(udev, "timeout waiting for udev queue\n");
- printf("\ndevadm settle timeout of %i seconds reached, the event queue contains:\n", timeout);
- udev_list_entry_foreach(list_entry, udev_queue_get_queued_list_entry(udev_queue))
- printf(" '%s' [%s]\n",
- udev_list_entry_get_name(list_entry),
- udev_list_entry_get_value(list_entry));
+ if (!quiet) {
+ info(udev, "timeout waiting for udev queue\n");
+ printf("\nudevadm settle - timeout of %i seconds reached, the event queue contains:\n", timeout);
+ udev_list_entry_foreach(list_entry, udev_queue_get_queued_list_entry(udev_queue))
+ printf(" %s (%s)\n",
+ udev_list_entry_get_name(list_entry),
+ udev_list_entry_get_value(list_entry));
+ }
rc = 1;
}
exit:
rc = 1;
}
exit: