From 061bd98dc5dfdf77b0877df02c7d6c25b6b417b1 Mon Sep 17 00:00:00 2001 From: jjohnstn Date: Fri, 18 Jul 2008 16:36:21 +0000 Subject: [PATCH] 2008-07-18 Ken Werner * libc/machine/spu/strcpy.h: Fix error in previous patch. --- newlib/ChangeLog | 4 ++++ newlib/libc/machine/spu/strcpy.h | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/newlib/ChangeLog b/newlib/ChangeLog index 9eb10cc997..88206eb0cc 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,3 +1,7 @@ +2008-07-18 Ken Werner + + * libc/machine/spu/strcpy.h: Fix error in previous patch. + 2008-07-17 Jeff Johnston * libc/include/assert.h (__ASSERT_FUNC): Define to __FUNCTION__ when diff --git a/newlib/libc/machine/spu/strcpy.h b/newlib/libc/machine/spu/strcpy.h index 946148bd24..b407eaf5b7 100644 --- a/newlib/libc/machine/spu/strcpy.h +++ b/newlib/libc/machine/spu/strcpy.h @@ -178,7 +178,7 @@ static inline void * _strncpy(char * __restrict__ dest, const char * } /* Pad null bytes if the length of the "src" is less than "n" (strncpy). */ - if (checklen && !lastzero && (maxlen != spu_extract(curlen,0))) - memset(dest + spu_extract(curlen, 0), 0, maxlen - spu_extract(curlen, 0)); + if (checklen && !lastzero && spu_extract(curlen, 0)) + memset(dest + maxlen - spu_extract(curlen, 0), 0, spu_extract(curlen, 0)); return (dest); } -- 2.11.0