chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cdrom_id: add error message if open() fails
[elogind.git]
/
udev
/
udevadm-trigger.c
diff --git
a/udev/udevadm-trigger.c
b/udev/udevadm-trigger.c
index 15e7dc17fb88d7b0da4e20f3a6946063d9012983..c256a9e5daaa0e5808e4da648d21e6ca990c2456 100644
(file)
--- a/
udev/udevadm-trigger.c
+++ b/
udev/udevadm-trigger.c
@@
-49,8
+49,7
@@
static void exec_list(struct udev_enumerate *udev_enumerate, const char *action)
printf("%s\n", udev_list_entry_get_name(entry));
if (dry_run)
continue;
printf("%s\n", udev_list_entry_get_name(entry));
if (dry_run)
continue;
- util_strlcpy(filename, udev_list_entry_get_name(entry), sizeof(filename));
- util_strlcat(filename, "/uevent", sizeof(filename));
+ util_strscpyl(filename, sizeof(filename), udev_list_entry_get_name(entry), "/uevent", NULL);
fd = open(filename, O_WRONLY);
if (fd < 0) {
dbg(udev, "error on opening %s: %m\n", filename);
fd = open(filename, O_WRONLY);
if (fd < 0) {
dbg(udev, "error on opening %s: %m\n", filename);
@@
-150,7
+149,7
@@
int udevadm_trigger(struct udev *udev, int argc, char *argv[])
udev_enumerate_add_nomatch_subsystem(udev_enumerate, optarg);
break;
case 'a':
udev_enumerate_add_nomatch_subsystem(udev_enumerate, optarg);
break;
case 'a':
- util_str
lcpy(attr, optarg, sizeof(attr)
);
+ util_str
scpy(attr, sizeof(attr), optarg
);
val = strchr(attr, '=');
if (val != NULL) {
val[0] = 0;
val = strchr(attr, '=');
if (val != NULL) {
val[0] = 0;
@@
-159,7
+158,7
@@
int udevadm_trigger(struct udev *udev, int argc, char *argv[])
udev_enumerate_add_match_sysattr(udev_enumerate, attr, val);
break;
case 'A':
udev_enumerate_add_match_sysattr(udev_enumerate, attr, val);
break;
case 'A':
- util_str
lcpy(attr, optarg, sizeof(attr)
);
+ util_str
scpy(attr, sizeof(attr), optarg
);
val = strchr(attr, '=');
if (val != NULL) {
val[0] = 0;
val = strchr(attr, '=');
if (val != NULL) {
val[0] = 0;