[src/trunk]: src/common/lib/libc/arch/arm/string Fix a typo in strlcpy which ...

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a8b808258a41
branches:  trunk
changeset: 783835:a8b808258a41
user:      matt <matt%NetBSD.org@localhost>
date:      Thu Jan 10 04:51:49 2013 +0000

description:
Fix a typo in strlcpy which caused to not deal with NULs predecing the
string properly.

diffstat:

 common/lib/libc/arch/arm/string/strcpy_arm.S |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (26 lines):

diff -r 3c37170ed24e -r a8b808258a41 common/lib/libc/arch/arm/string/strcpy_arm.S
--- a/common/lib/libc/arch/arm/string/strcpy_arm.S      Thu Jan 10 03:59:22 2013 +0000
+++ b/common/lib/libc/arch/arm/string/strcpy_arm.S      Thu Jan 10 04:51:49 2013 +0000
@@ -29,7 +29,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$NetBSD: strcpy_arm.S,v 1.1 2013/01/08 13:17:45 matt Exp $")
+RCSID("$NetBSD: strcpy_arm.S,v 1.2 2013/01/10 04:51:49 matt Exp $")
 
 #ifdef STRLCPY
 #ifdef _LIBC
@@ -224,10 +224,10 @@
         * fill the bytes in the word we don't want to match with all 1s.
         */
        mvn     r3, #0                  /* create a mask */
-       mov     r3, r3, lslo r8         /* zero out byte being kept */
-       orr     r3, r3, r5              /* merge src and mask */
+       mov     r3, r3, lslo r8         /* zero out bytes being kept */
+       orr     r5, r5, r3              /* merge src and mask */
 #ifdef _ARM_ARCH_6
-       uqadd8  r3, r3, r7              /* NUL detection magic happens */
+       uqadd8  r3, r5, r7              /* NUL detection magic happens */
        mvns    r3, r3                  /* is the complemented result 0? */
        beq     .Lincongruent_mainloop_load /*   yes, no NUL encountered! */
 #ifdef __ARMEL__