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 9eab8b2a21293ef90f08d89da5cfdcb1f952a462..6bcb3a985e99bb99235198bdfaccd0e36cf28e0e 100644
(file)
--- a/
src/udev/udevadm-settle.c
+++ b/
src/udev/udevadm-settle.c
@@
-48,12
+48,12
@@
static void help(void) {
static int adm_settle(struct udev *udev, int argc, char *argv[]) {
static const struct option options[] = {
static int adm_settle(struct udev *udev, int argc, char *argv[]) {
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;
{}
};
const char *exists = NULL;
@@
-63,8
+63,9
@@
static int adm_settle(struct udev *udev, int argc, char *argv[]) {
struct udev_queue *queue;
int rc = EXIT_FAILURE;
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;
@@
-76,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();
return EXIT_SUCCESS;
case 'h':
help();
return EXIT_SUCCESS;
+
+ case 's':
+ case 'e':
+ case 'q':
+ log_info("Option -%c no longer supported.", c);
+ return EXIT_FAILURE;
+
case '?':
return EXIT_FAILURE;
case '?':
return EXIT_FAILURE;
+
default:
assert_not_reached("Unknown argument");
}
default:
assert_not_reached("Unknown argument");
}