chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rules: Gentoo update
[elogind.git]
/
udevinfo.c
diff --git
a/udevinfo.c
b/udevinfo.c
index cda229244d9b59aadaea86d55fca32d098271016..be9aa769e10f46352039dbdb93e0d723d5dc89d6 100644
(file)
--- a/
udevinfo.c
+++ b/
udevinfo.c
@@
-79,6
+79,8
@@
static void print_all_attributes(const char *devpath, const char *key)
if (attr_value == NULL)
continue;
len = strlcpy(value, attr_value, sizeof(value));
if (attr_value == NULL)
continue;
len = strlcpy(value, attr_value, sizeof(value));
+ if(len >= sizeof(value))
+ len = sizeof(value) - 1;
dbg("attr '%s'='%s'(%zi)", dent->d_name, value, len);
/* remove trailing newlines */
dbg("attr '%s'='%s'(%zi)", dent->d_name, value, len);
/* remove trailing newlines */
@@
-265,7
+267,6
@@
int main(int argc, char *argv[], char *envp[])
goto exit;
}
goto exit;
}
- /* get command line options */
while (1) {
option = getopt_long(argc, argv, "aen:p:q:rVh", options, NULL);
if (option == -1)
while (1) {
option = getopt_long(argc, argv, "aen:p:q:rVh", options, NULL);
if (option == -1)
@@
-279,7
+280,7
@@
int main(int argc, char *argv[], char *envp[])
strlcpy(name, &optarg[strlen(udev_root)+1], sizeof(name));
else
strlcpy(name, optarg, sizeof(name));
strlcpy(name, &optarg[strlen(udev_root)+1], sizeof(name));
else
strlcpy(name, optarg, sizeof(name));
- dbg("name: %s
\n
", name);
+ dbg("name: %s", name);
break;
case 'p':
/* remove /sys if given */
break;
case 'p':
/* remove /sys if given */
@@
-287,10
+288,9
@@
int main(int argc, char *argv[], char *envp[])
strlcpy(path, &optarg[strlen(sysfs_path)], sizeof(path));
else
strlcpy(path, optarg, sizeof(path));
strlcpy(path, &optarg[strlen(sysfs_path)], sizeof(path));
else
strlcpy(path, optarg, sizeof(path));
- dbg("path: %s
\n
", path);
+ dbg("path: %s", path);
break;
case 'q':
break;
case 'q':
- dbg("udev query: %s\n", optarg);
action = ACTION_QUERY;
if (strcmp(optarg, "name") == 0) {
query = QUERY_NAME;
action = ACTION_QUERY;
if (strcmp(optarg, "name") == 0) {
query = QUERY_NAME;
@@
-413,7
+413,7
@@
int main(int argc, char *argv[], char *envp[])
case ACTION_ATTRIBUTE_WALK:
if (path[0] != '\0') {
if (print_device_chain(path) != 0) {
case ACTION_ATTRIBUTE_WALK:
if (path[0] != '\0') {
if (print_device_chain(path) != 0) {
- fprintf(stderr, "
device not
found\n");
+ fprintf(stderr, "
no valid sysfs device
found\n");
rc = 4;
goto exit;
}
rc = 4;
goto exit;
}
@@
-424,7
+424,7
@@
int main(int argc, char *argv[], char *envp[])
goto exit;
}
if (print_device_chain(udev->dev->devpath) != 0) {
goto exit;
}
if (print_device_chain(udev->dev->devpath) != 0) {
- fprintf(stderr, "
device not
found\n");
+ fprintf(stderr, "
no valid sysfs device
found\n");
rc = 4;
goto exit;
}
rc = 4;
goto exit;
}