1 files changed, 6 insertions, 29 deletions

diff --git a/src/lib/libc/string/strxfrm.c b/src/lib/libc/string/strxfrm.c
index d9df77b957..6f289c901e 100644
--- a/src/lib/libc/string/strxfrm.c
+++ b/src/lib/libc/string/strxfrm.c
@@ -1,3 +1,4 @@
+/*      $OpenBSD: strxfrm.c,v 1.6 2005/08/08 08:05:37 espie Exp $ */
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -13,11 +14,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -34,11 +31,6 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-/*static char *sccsid = "from: @(#)strxfrm.c    5.2 (Berkeley) 1/26/91";*/
-static char *rcsid = "$Id: strxfrm.c,v 1.1.1.1 1995/10/18 08:42:23 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
 #include <string.h>
 
 /*
@@ -47,28 +39,13 @@ static char *rcsid = "$Id: strxfrm.c,v 1.1.1.1 1995/10/18 08:42:23 deraadt Exp $
  * on the original untransformed strings would return.
  */
 size_t
-strxfrm(dst, src, n)
-        register char *dst;
-        register const char *src;
-        register size_t n;
+strxfrm(char *dst, const char *src, size_t n)
 {
-        register size_t r = 0;
-        register int c;
 
         /*
          * Since locales are unimplemented, this is just a copy.
          */
-        if (n != 0) {
-                while ((c = *src++) != 0) {
-                        r++;
-                        if (--n == 0) {
-                                while (*src++ != 0)
-                                        r++;
-                                break;
-                        }
-                        *dst++ = c;
-                }
-                *dst = 0;
-        }
-        return (r);
+        if (n == 0)
+                return (strlen(src));
+        return (strlcpy(dst, src, n));
 }