chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move some info() to dbg()
[elogind.git]
/
udev
/
lib
/
libudev-util.c
diff --git
a/udev/lib/libudev-util.c
b/udev/lib/libudev-util.c
index 0ff121d774e12701c1f4fb822689222643bae4e7..9353e8eda792ef2bf9a85ebfd607d84c6ef0fc7c 100644
(file)
--- a/
udev/lib/libudev-util.c
+++ b/
udev/lib/libudev-util.c
@@
-48,7
+48,7
@@
static ssize_t get_sys_link(struct udev *udev, const char *slink, const char *sy
if (pos == NULL)
return -1;
pos = &pos[1];
if (pos == NULL)
return -1;
pos = &pos[1];
-
info
(udev, "resolved link to: '%s'\n", pos);
+
dbg
(udev, "resolved link to: '%s'\n", pos);
return util_strlcpy(value, pos, size);
}
return util_strlcpy(value, pos, size);
}
@@
-114,7
+114,6
@@
size_t util_path_encode(char *s, size_t len)
char t[(len * 3)+1];
size_t i, j;
char t[(len * 3)+1];
size_t i, j;
- t[0] = '\0';
for (i = 0, j = 0; s[i] != '\0'; i++) {
if (s[i] == '/') {
memcpy(&t[j], "\\x2f", 4);
for (i = 0, j = 0; s[i] != '\0'; i++) {
if (s[i] == '/') {
memcpy(&t[j], "\\x2f", 4);
@@
-127,8
+126,11
@@
size_t util_path_encode(char *s, size_t len)
j++;
}
}
j++;
}
}
- t[j] = '\0';
- strncpy(s, t, len);
+ if (len == 0)
+ return j;
+ i = (j < len - 1) ? j : len - 1;
+ memcpy(s, t, i);
+ s[i] = '\0';
return j;
}
return j;
}