X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_libc_wrapper.c;h=4e9f9f1fe87108625ae539fbf4823a8a1b061ed4;hp=16d90913cf84606d38cf5ac794cd391b957f29d7;hb=586e1a37eff1ec9b69c0d2953014e7291fb875b5;hpb=68c2c0b5b1dedfe0fd3346560999791efdf48c25

diff --git a/udev_libc_wrapper.c b/udev_libc_wrapper.c
index 16d90913c..4e9f9f1fe 100644
--- a/udev_libc_wrapper.c
+++ b/udev_libc_wrapper.c
@@ -36,11 +36,15 @@
 #define __OWN_USERDB_PARSER__
 #endif
 
+#ifdef __GLIBC__
+#define __OWN_STRLCPYCAT__
+#endif
+
 #ifdef USE_STATIC
 #define __OWN_USERDB_PARSER__
 #endif
 
-#ifndef strlcpy
+#ifdef __OWN_STRLCPYCAT__
 size_t strlcpy(char *dst, const char *src, size_t size)
 {
 	size_t bytes = 0;
@@ -49,17 +53,18 @@ size_t strlcpy(char *dst, const char *src, size_t size)
 	char ch;
 
 	while ((ch = *p++)) {
-		if (bytes < size)
+		if (bytes+1 < size)
 			*q++ = ch;
 		bytes++;
 	}
 
-	*q = '\0';
+	/* If size == 0 there is no space for a final null... */
+	if (size)
+		*q = '\0';
+
 	return bytes;
 }
-#endif
 
-#ifndef strlcat
 size_t strlcat(char *dst, const char *src, size_t size)
 {
 	size_t bytes = 0;
@@ -71,9 +76,11 @@ size_t strlcat(char *dst, const char *src, size_t size)
 		q++;
 		bytes++;
 	}
+	if (bytes == size)
+		return (bytes + strlen(src));
 
 	while ((ch = *p++)) {
-		if (bytes < size)
+		if (bytes+1 < size)
 		*q++ = ch;
 		bytes++;
 	}
@@ -81,7 +88,7 @@ size_t strlcat(char *dst, const char *src, size_t size)
 	*q = '\0';
 	return bytes;
 }
-#endif
+#endif /* __OWN_STRLCPYCAT__ */
 
 #ifndef __OWN_USERDB_PARSER__
 #include <sys/types.h>
@@ -152,7 +159,8 @@ static unsigned long get_id_by_name(const char *uname, const char *dbfile)
 		if (count >= sizeof(line))
 			continue;
 
-		strlcpy(line, bufline, count);
+		memcpy(line, bufline, count-1);
+		line[count-1] = '\0';
 		pos = line;
 
 		/* get name */