Libc-763.11.tar.gz

[apple/libc.git] / string / FreeBSD / strxfrm.c

diff --git a/string/FreeBSD/strxfrm.c b/string/FreeBSD/strxfrm.c
index 3ab7b720a4dee2fe7b5943812331800e7081ca4a..9ef2e8739bc31c27526163e6405703cb43c8d98e 100644 (file)
--- a/string/FreeBSD/strxfrm.c
+++ b/string/FreeBSD/strxfrm.c
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
  */
 
 #include <sys/cdefs.h>

-__FBSDID("$FreeBSD: src/lib/libc/string/strxfrm.c,v 1.15 2002/09/06 11:24:06 tjr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/string/strxfrm.c,v 1.17 2008/10/19 09:10:44 delphij Exp $");

 
 #include <stdlib.h>
 #include <string.h>
 
 #include <stdlib.h>
 #include <string.h>


@@ -45,18 +45,8 @@ strxfrm(char * __restrict dest, const char * __restrict src, size_t len)
                return 0;
        }
 
                return 0;
        }
 

-       if (__collate_load_error) {
-               slen = strlen(src);
-               if (len > 0) {
-                       if (slen < len)
-                               strcpy(dest, src);
-                       else {
-                               strncpy(dest, src, len - 1);
-                               dest[len - 1] = '\0';
-                       }
-               }
-               return slen;
-       }
+       if (__collate_load_error)
+               return strlcpy(dest, src, len);

 
        slen = 0;
        prim = sec = 0;
 
        slen = 0;
        prim = sec = 0;