[PATCH] volume_id: version 41

[elogind.git] / klibc / klibc / strncat.c

diff --git a/klibc/klibc/strncat.c b/klibc/klibc/strncat.c
index 0dd9deb984f1323874d64ef8fb5f0d11e8273387..78223152c4f98d53445f28633f431026e4726dfb 100644 (file)
--- a/klibc/klibc/strncat.c
+++ b/klibc/klibc/strncat.c
@@ -10,16 +10,13 @@ char *strncat(char *dst, const char *src, size_t n)
   char *q = strchr(dst, '\0');
   const char *p = src;
   char ch;
-  size_t nn = q-dst;
-
-  if ( __likely(nn <= n) )
-    n -= nn;
 
   while (n--) {
     *q++ = ch = *p++;
     if ( !ch )
-      break;
+      return dst;
   }
+  *q = '\0';
 
   return dst;
 }