chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a107488
)
udevadm-settle: add parameters checking
author
Yang Zhiyong
<yangzy.fnst@cn.fujitsu.com>
Mon, 4 Nov 2013 03:26:07 +0000
(11:26 +0800)
committer
Zbigniew Jędrzejewski-Szmek
<zbyszek@in.waw.pl>
Thu, 7 Nov 2013 06:23:54 +0000
(
01:23
-0500)
src/udev/udevadm-settle.c
patch
|
blob
|
history
diff --git
a/src/udev/udevadm-settle.c
b/src/udev/udevadm-settle.c
index c4fc4ee4e50fea063dc45fb1ee5aa96bca40d28e..65508d8c16c12b9173d2acd2e433332f6d6d8032 100644
(file)
--- a/
src/udev/udevadm-settle.c
+++ b/
src/udev/udevadm-settle.c
@@
-35,6
+35,7
@@
#include <sys/types.h>
#include "udev.h"
#include <sys/types.h>
#include "udev.h"
+#include "util.h"
static int adm_settle(struct udev *udev, int argc, char *argv[])
{
static int adm_settle(struct udev *udev, int argc, char *argv[])
{
@@
-59,11
+60,15
@@
static int adm_settle(struct udev *udev, int argc, char *argv[])
for (;;) {
int option;
for (;;) {
int option;
- int seconds;
option = getopt_long(argc, argv, "s:e:t:E:qh", options, NULL);
option = getopt_long(argc, argv, "s:e:t:E:qh", options, NULL);
- if (option == -1)
+ if (option == -1) {
+ if (optind < argc) {
+ fprintf(stderr, "Extraneous argument: '%s'\n", argv[optind]);
+ exit(EXIT_FAILURE);
+ }
break;
break;
+ }
switch (option) {
case 's':
switch (option) {
case 's':
@@
-72,12
+77,15
@@
static int adm_settle(struct udev *udev, int argc, char *argv[])
case 'e':
end = strtoull(optarg, NULL, 0);
break;
case 'e':
end = strtoull(optarg, NULL, 0);
break;
- case 't':
- seconds = atoi(optarg);
- if (seconds >= 0)
- timeout = seconds;
- else
- fprintf(stderr, "invalid timeout value\n");
+ case 't': {
+ int r;
+
+ r = safe_atou(optarg, &timeout);
+ if (r < 0) {
+ fprintf(stderr, "Invalid timeout value '%s': %s\n",
+ optarg, strerror(-r));
+ exit(EXIT_FAILURE);
+ };
break;
case 'q':
quiet = 1;
break;
case 'q':
quiet = 1;