shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-24 21:34:08 +03:00
Code

udevadm: trigger - check return values

Browse Source 
Fixes CID#1296243.
This commit is contained in:
Tom Gundersen 2015-06-23 17:16:28 +02:00
parent b6aab8ef9c
commit 56b13bcc99
1 changed files with 51 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/udev/udevadm-trigger.c
View File

@ -116,7 +116,7 @@ static int adm_trigger(struct udev *udev, int argc, char *argv[]) {
} device_type = TYPE_DEVICES; } device_type = TYPE_DEVICES;
const char *action = "change"; const char *action = "change";
_cleanup_udev_enumerate_unref_ struct udev_enumerate *udev_enumerate = NULL; _cleanup_udev_enumerate_unref_ struct udev_enumerate *udev_enumerate = NULL;
int c; int c, r;
udev_enumerate = udev_enumerate_new(udev); udev_enumerate = udev_enumerate_new(udev);
if (udev_enumerate == NULL) if (udev_enumerate == NULL)
@ -153,28 +153,56 @@ static int adm_trigger(struct udev *udev, int argc, char *argv[]) {
break; break;
case 's': case 's':
udev_enumerate_add_match_subsystem(udev_enumerate, optarg); r = udev_enumerate_add_match_subsystem(udev_enumerate, optarg);
if (r < 0) {
log_error_errno(r, "could not add subsystem match '%s': %m", optarg);
return 2;
}
break; break;
case 'S': case 'S':
udev_enumerate_add_nomatch_subsystem(udev_enumerate, optarg); r = udev_enumerate_add_nomatch_subsystem(udev_enumerate, optarg);
if (r < 0) {
log_error_errno(r, "could not add negative subsystem match '%s': %m", optarg);
return 2;
}
break; break;
case 'a': case 'a':
key = keyval(optarg, &val, buf, sizeof(buf)); key = keyval(optarg, &val, buf, sizeof(buf));
udev_enumerate_add_match_sysattr(udev_enumerate, key, val); r = udev_enumerate_add_match_sysattr(udev_enumerate, key, val);
if (r < 0) {
log_error_errno(r, "could not add sysattr match '%s=%s': %m", key, val);
return 2;
}
break; break;
case 'A': case 'A':
key = keyval(optarg, &val, buf, sizeof(buf)); key = keyval(optarg, &val, buf, sizeof(buf));
udev_enumerate_add_nomatch_sysattr(udev_enumerate, key, val); r = udev_enumerate_add_nomatch_sysattr(udev_enumerate, key, val);
if (r < 0) {
log_error_errno(r, "could not add negative sysattr match '%s=%s': %m", key, val);
return 2;
}
break; break;
case 'p': case 'p':
key = keyval(optarg, &val, buf, sizeof(buf)); key = keyval(optarg, &val, buf, sizeof(buf));
udev_enumerate_add_match_property(udev_enumerate, key, val); r = udev_enumerate_add_match_property(udev_enumerate, key, val);
if (r < 0) {
log_error_errno(r, "could not add property match '%s=%s': %m", key, val);
return 2;
}
break; break;
case 'g': case 'g':
udev_enumerate_add_match_tag(udev_enumerate, optarg); r = udev_enumerate_add_match_tag(udev_enumerate, optarg);
if (r < 0) {
log_error_errno(r, "could not add tag match '%s': %m", optarg);
return 2;
}
break; break;
case 'y': case 'y':
udev_enumerate_add_match_sysname(udev_enumerate, optarg); r = udev_enumerate_add_match_sysname(udev_enumerate, optarg);
if (r < 0) {
log_error_errno(r, "could not add sysname match '%s': %m", optarg);
return 2;
}
break; break;
case 'b': { case 'b': {
_cleanup_udev_device_unref_ struct udev_device *dev; _cleanup_udev_device_unref_ struct udev_device *dev;
@ -185,7 +213,11 @@ static int adm_trigger(struct udev *udev, int argc, char *argv[]) {
return 2; return 2;
} }
udev_enumerate_add_match_parent(udev_enumerate, dev); r = udev_enumerate_add_match_parent(udev_enumerate, dev);
if (r < 0) {
log_error_errno(r, "could not add parent match '%s': %m", optarg);
return 2;
}
break; break;
} }
@ -198,7 +230,11 @@ static int adm_trigger(struct udev *udev, int argc, char *argv[]) {
return 2; return 2;
} }
udev_enumerate_add_match_parent(udev_enumerate, dev); r = udev_enumerate_add_match_parent(udev_enumerate, dev);
if (r < 0) {
log_error_errno(r, "could not add parent match '%s': %m", optarg);
return 2;
}
break; break;
} }
@ -221,7 +257,11 @@ static int adm_trigger(struct udev *udev, int argc, char *argv[]) {
return 2; return 2;
} }
udev_enumerate_add_match_parent(udev_enumerate, dev); r = udev_enumerate_add_match_parent(udev_enumerate, dev);
if (r < 0) {
log_error_errno(r, "could not add tag match '%s': %m", optarg);
return 2;
}
} }
switch (device_type) { switch (device_type) {