* device/lib/_strncpy.c: fixed the fix

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@3775 4a8a32a2-be11-0410-ad9d-d568d2c75423

diff --git a/ChangeLog b/ChangeLog
index ea242ced697ff1669ab1b81e296ff58634e8f164..5b59a009124e56f57b67a86a323c3a43008b049c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-27 Maarten Brock <sourceforge.brock AT dse.nl>
+
+       * device/lib/_strncpy.c: fixed the fix
+
 2005-05-26 Raphael Neider <rneider AT web.de>
 
        * src/pic16/glue.c (pic16_printIvalChar): fixed _constant_ string
@@ -12,7 +16,7 @@
        * src/pic16/main.c (_process_pragma): added sanity checks
          for stack position and size, emit warnings when appropriate
 
-2005-05-21 Maarten Brock <sourceforge.brock AT dse.nl>
+2005-05-26 Maarten Brock <sourceforge.brock AT dse.nl>
 
        * device/lib/_strncpy.c: fixed not filling with \0
 

diff --git a/device/lib/_strncpy.c b/device/lib/_strncpy.c
index 2b7aa481f9b23af73cb0e42c29ae75d8f4fab9bf..505379eb4754206a2ae2d27ed131b9301fcd7bd1 100644 (file)
--- a/device/lib/_strncpy.c
+++ b/device/lib/_strncpy.c
@@ -30,9 +30,14 @@ char *strncpy (
 {
        register char * d1 =  d;
 
-       while ( n-- && *s )
+       while ( n && *s )
+       {
+               n-- ;
                *d++ = *s++ ;
+       }
        while ( n-- )
+       {
                *d++ = '\0' ;
+       }
        return d1;
 }