From 977a560255a4919469c924d73c3d7ce165106722 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Mon, 5 Sep 2005 07:29:47 +0000
Subject: fix string functions to not treat the size_t as ssize_t

---
 libc/string/i386/string.c | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

(limited to 'libc')

diff --git a/libc/string/i386/string.c b/libc/string/i386/string.c
index 779087aed..8a7f1a89b 100644
--- a/libc/string/i386/string.c
+++ b/libc/string/i386/string.c
@@ -48,12 +48,15 @@ char * strncpy(char * dest, const char * src, size_t count)
 {
     int d0, d1, d2, d3;
     __asm__ __volatile__(
-	    "1:\tdecl %2\n\t"
-	    "js 2f\n\t"
+	    "incl %2\n"
+	    "1:\n"
+	    "decl %2\n"
+	    "jz 2f\n"
 	    "lodsb\n\t"
 	    "stosb\n\t"
 	    "testb %%al,%%al\n\t"
 	    "jne 1b\n\t"
+	    "decl %2\n"
 	    "rep\n\t"
 	    "stosb\n"
 	    "2:"
@@ -93,14 +96,17 @@ char *strncat(char * dest,
 	    "scasb\n\t"
 	    "decl %1\n\t"
 	    "movl %8,%3\n"
+	    "incl %3\n"
 	    "1:\tdecl %3\n\t"
-	    "js 2f\n\t"
+	    "jz 2f\n"
 	    "lodsb\n\t"
 	    "stosb\n\t"
 	    "testb %%al,%%al\n\t"
 	    "jne 1b\n"
+	    "jmp 3f\n"
 	    "2:\txorl %2,%2\n\t"
-	    "stosb"
+	    "stosb\n"
+	    "3:"
 	    : "=&S" (d0), "=&D" (d1), "=&a" (d2), "=&c" (d3)
 	    : "0" (src),"1" (dest),"2" (0),"3" (0xffffffff), "g" (count)
 	    : "memory");
@@ -141,8 +147,9 @@ int strncmp(const char *cs, const char *ct, size_t count)
     register int __res;
     int d0, d1, d2;
     __asm__ __volatile__(
+	    "incl %3\n"
 	    "1:\tdecl %3\n\t"
-	    "js 2f\n\t"
+	    "jz 2f\n"
 	    "lodsb\n\t"
 	    "scasb\n\t"
 	    "jne 3f\n\t"
@@ -226,12 +233,12 @@ size_t strnlen(const char *s, size_t count)
     register int __res;
     __asm__ __volatile__(
 	    "movl %2,%0\n\t"
+	    "incl %1\n"
 	    "jmp 2f\n"
 	    "1:\tcmpb $0,(%0)\n\t"
 	    "je 3f\n\t"
 	    "incl %0\n"
 	    "2:\tdecl %1\n\t"
-	    "cmpl $-1,%1\n\t"
 	    "jne 1b\n"
 	    "3:\tsubl %2,%0"
 	    :"=a" (__res), "=&d" (d0)
-- 
cgit v1.2.3