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:
bbfeee2
)
udevadmi: control = exit with rc=2 if there is some system error
author
Marco d'Itri
<md@linux.it>
Mon, 14 Sep 2009 12:05:31 +0000
(14:05 +0200)
committer
Kay Sievers
<kay.sievers@vrfy.org>
Mon, 14 Sep 2009 12:05:31 +0000
(14:05 +0200)
udev/udevadm-control.c
patch
|
blob
|
history
diff --git
a/udev/udevadm-control.c
b/udev/udevadm-control.c
index 42818d9db74e4fcac941605dbb93ecc5f2b1ebd6..21d366b23485e94e4270caab8cad1234c7e61887 100644
(file)
--- a/
udev/udevadm-control.c
+++ b/
udev/udevadm-control.c
@@
-68,8
+68,10
@@
int udevadm_control(struct udev *udev, int argc, char *argv[])
}
uctrl = udev_ctrl_new_from_socket(udev, UDEV_CTRL_SOCK_PATH);
}
uctrl = udev_ctrl_new_from_socket(udev, UDEV_CTRL_SOCK_PATH);
- if (uctrl == NULL)
+ if (uctrl == NULL) {
+ rc = 2;
goto exit;
goto exit;
+ }
while (1) {
int option;
while (1) {
int option;
@@
-93,31
+95,41
@@
int udevadm_control(struct udev *udev, int argc, char *argv[])
fprintf(stderr, "invalid number '%s'\n", optarg);
goto exit;
}
fprintf(stderr, "invalid number '%s'\n", optarg);
goto exit;
}
- udev_ctrl_send_set_log_level(uctrl, util_log_priority(optarg));
- rc = 0;
+ if (udev_ctrl_send_set_log_level(uctrl, util_log_priority(optarg)) < 0)
+ rc = 2;
+ else
+ rc = 0;
break;
case 's':
case 's' + 256:
break;
case 's':
case 's' + 256:
- udev_ctrl_send_stop_exec_queue(uctrl);
- rc = 0;
+ if (udev_ctrl_send_stop_exec_queue(uctrl) < 0)
+ rc = 2;
+ else
+ rc = 0;
break;
case 'S':
case 'S' + 256:
break;
case 'S':
case 'S' + 256:
- udev_ctrl_send_start_exec_queue(uctrl);
- rc = 0;
+ if (udev_ctrl_send_start_exec_queue(uctrl) < 0)
+ rc = 2;
+ else
+ rc = 0;
break;
case 'R':
case 'R' + 256:
break;
case 'R':
case 'R' + 256:
- udev_ctrl_send_reload_rules(uctrl);
- rc = 0;
+ if (udev_ctrl_send_reload_rules(uctrl) < 0)
+ rc = 2;
+ else
+ rc = 0;
break;
case 'p':
if (strchr(optarg, '=') == NULL) {
fprintf(stderr, "expect <KEY>=<value> instead of '%s'\n", optarg);
goto exit;
}
break;
case 'p':
if (strchr(optarg, '=') == NULL) {
fprintf(stderr, "expect <KEY>=<value> instead of '%s'\n", optarg);
goto exit;
}
- udev_ctrl_send_set_env(uctrl, optarg);
- rc = 0;
+ if (udev_ctrl_send_set_env(uctrl, optarg) < 0)
+ rc = 2;
+ else
+ rc = 0;
break;
case 'm':
case 'm' + 256:
break;
case 'm':
case 'm' + 256:
@@
-126,8
+138,10
@@
int udevadm_control(struct udev *udev, int argc, char *argv[])
fprintf(stderr, "invalid number '%s'\n", optarg);
goto exit;
}
fprintf(stderr, "invalid number '%s'\n", optarg);
goto exit;
}
- udev_ctrl_send_set_max_childs(uctrl, i);
- rc = 0;
+ if (udev_ctrl_send_set_max_childs(uctrl, i) < 0)
+ rc = 2;
+ else
+ rc = 0;
break;
case 'h':
print_help();
break;
case 'h':
print_help();
@@
-146,35
+160,46
@@
int udevadm_control(struct udev *udev, int argc, char *argv[])
"this will stop working in a future release\n");
if (!strncmp(arg, "log_priority=", strlen("log_priority="))) {
"this will stop working in a future release\n");
if (!strncmp(arg, "log_priority=", strlen("log_priority="))) {
- udev_ctrl_send_set_log_level(uctrl, util_log_priority(&arg[strlen("log_priority=")]));
- rc = 0;
+ if (udev_ctrl_send_set_log_level(uctrl, util_log_priority(&arg[strlen("log_priority=")])) < 0)
+ rc = 2;
+ else
+ rc = 0;
goto exit;
} else if (!strcmp(arg, "stop_exec_queue")) {
goto exit;
} else if (!strcmp(arg, "stop_exec_queue")) {
- udev_ctrl_send_stop_exec_queue(uctrl);
- rc = 0;
+ if (udev_ctrl_send_stop_exec_queue(uctrl) < 0)
+ rc = 2;
+ else
+ rc = 0;
goto exit;
} else if (!strcmp(arg, "start_exec_queue")) {
goto exit;
} else if (!strcmp(arg, "start_exec_queue")) {
- udev_ctrl_send_start_exec_queue(uctrl);
- rc = 0;
+ if (udev_ctrl_send_start_exec_queue(uctrl) < 0)
+ rc = 2;
+ else
+ rc = 0;
goto exit;
} else if (!strcmp(arg, "reload_rules")) {
goto exit;
} else if (!strcmp(arg, "reload_rules")) {
- udev_ctrl_send_reload_rules(uctrl);
- rc = 0;
+ if (udev_ctrl_send_reload_rules(uctrl) < 0)
+ rc = 2;
+ else
+ rc = 0;
goto exit;
} else if (!strncmp(arg, "max_childs=", strlen("max_childs="))) {
goto exit;
} else if (!strncmp(arg, "max_childs=", strlen("max_childs="))) {
- udev_ctrl_send_set_max_childs(uctrl, strtoul(&arg[strlen("max_childs=")], NULL, 0));
- rc = 0;
+ if (udev_ctrl_send_set_max_childs(uctrl, strtoul(&arg[strlen("max_childs=")], NULL, 0)) < 0)
+ rc = 2;
+ else
+ rc = 0;
goto exit;
} else if (!strncmp(arg, "env", strlen("env"))) {
goto exit;
} else if (!strncmp(arg, "env", strlen("env"))) {
- udev_ctrl_send_set_env(uctrl, &arg[strlen("env=")]);
- rc = 0;
+ if (udev_ctrl_send_set_env(uctrl, &arg[strlen("env=")]) < 0)
+ rc = 2;
+ else
+ rc = 0;
goto exit;
}
}
goto exit;
}
}
- if (rc
!= 0) {
+ if (rc
== 1)
err(udev, "unrecognized command\n");
err(udev, "unrecognized command\n");
- }
exit:
udev_ctrl_unref(uctrl);
return rc;
exit:
udev_ctrl_unref(uctrl);
return rc;