[PATCH] klibc: version 1.0.5

klibc/klibc/strlcat.c

@@ -26,8 +26,7 @@ size_t strlcat(char *dst, const char *src, size_t size)
     bytes++;
   }
 
-  if (size)
-    *q = '\0';
+  *q = '\0';
   return bytes;
 }
 

klibc/klibc/strlcpy.c

@@ -19,8 +19,10 @@ size_t strlcpy(char *dst, const char *src, size_t size)
     bytes++;
   }
 
-  if (size)
+  /* If size == 0 there is no space for a final null... */
+  if ( size )
     *q = '\0';
+
   return bytes;
 }
 

klibc/version

@@ -1 +1 @@
-1.0.4
+1.0.5

udev_libc_wrapper.c

@@ -58,8 +58,10 @@ size_t strlcpy(char *dst, const char *src, size_t size)
 		bytes++;
 	}
 
+	/* If size == 0 there is no space for a final null... */
 	if (size)
 		*q = '\0';
+
 	return bytes;
 }
 
@@ -83,8 +85,7 @@ size_t strlcat(char *dst, const char *src, size_t size)
 		bytes++;
 	}
 
-	if (size)
-		*q = '\0';
+	*q = '\0';
 	return bytes;
 }
 #endif /* __OWN_STRLCPYCAT__ */