X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/5ba3f43ea354af8ad55bea84372a2bc834d8757c..e8c3f78193f1895ea514044358b93b1add9322f3:/iokit/Kernel/IOStringFuncs.c?ds=sidebyside

diff --git a/iokit/Kernel/IOStringFuncs.c b/iokit/Kernel/IOStringFuncs.c
index c4f9458fe..6890305d6 100644
--- a/iokit/Kernel/IOStringFuncs.c
+++ b/iokit/Kernel/IOStringFuncs.c
@@ -475,17 +475,18 @@ strtouq(const char *nptr,
 char *
 strncat(char *s1, const char *s2, unsigned long n)
 {
-	char *os1;
-	int i = n;
+	if (n != 0) {
+		char *d = s1;
+		const char *s = s2;
 
-	os1 = s1;
-	while (*s1++)
-		;
-	--s1;
-	while ((*s1++ = *s2++))
-		if (--i < 0) {
-			*--s1 = '\0';
-			break;
-		}
-	return(os1);
+		while (*d != 0)
+			d++;
+		do {
+			if ((*d = *s++) == '\0')
+				break;
+			d++;
+		} while (--n != 0);
+		*d = '\0';
+	}
+	return (s1);
 }