Fixing strncpy.

nicolasnoble · nicolasnoble · commit af8c83494bbc · 2020-07-14T21:10:16.000-07:00
diff --git a/libc/include/string.h b/libc/include/string.h
@@ -47,12 +47,14 @@ static __inline__ char * strncpy(char * s1, const char * s2, size_t n) {
     char * r = s1;
     char c;
     size_t i;
+    int done = 0;
     
     for (i = 0; i < n; i++) {
-        if ((c = *s2++)) {
+        if (!done && (c = *s2++)) {
             *s1++ = c;
         } else {
             *s1++ = 0;
+            done = 1;
         }
     }
     

Original file line number	Diff line number	Diff line change
`@@ -47,12 +47,14 @@ static __inline__ char * strncpy(char * s1, const char * s2, size_t n) {`
`47`	`47`	`char * r = s1;`
`48`	`48`	`char c;`
`49`	`49`	`size_t i;`
	`50`	`+ int done = 0;`
`50`	`51`
`51`	`52`	`for (i = 0; i < n; i++) {`
`52`		`- if ((c = *s2++)) {`
	`53`	`+ if (!done && (c = *s2++)) {`
`53`	`54`	`*s1++ = c;`
`54`	`55`	`} else {`
`55`	`56`	`*s1++ = 0;`
	`57`	`+ done = 1;`
`56`	`58`	`}`
`57`	`59`	`}`
`58`	`60`