* device/lib/mcs51/crtxclear.asm: pdata segment of 256 byte would not be cleared...

[fw/sdcc] / device / lib / _strncpy.c

diff --git a/device/lib/_strncpy.c b/device/lib/_strncpy.c
index f67aa7d0026ffc56033794c331916b3c8b6b74dd..505379eb4754206a2ae2d27ed131b9301fcd7bd1 100644 (file)
--- a/device/lib/_strncpy.c
+++ b/device/lib/_strncpy.c
@@ -3,35 +3,41 @@
 
              Written By -  Sandeep Dutta . sandeep.dutta@usa.net (1999)
 
 
              Written By -  Sandeep Dutta . sandeep.dutta@usa.net (1999)
 

-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by the
+   This library is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published by the

    Free Software Foundation; either version 2, or (at your option) any
    later version.
    Free Software Foundation; either version 2, or (at your option) any
    later version.

-   
-   This program is distributed in the hope that it will be useful,
+
+   This library is distributed in the hope that it will be useful,

    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
+   GNU Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public License

    along with this program; if not, write to the Free Software
    Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
    along with this program; if not, write to the Free Software
    Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

-   
+

    In other words, you are welcome to use, share and improve this program.
    You are forbidden to forbid anyone else to use, share and improve
    In other words, you are welcome to use, share and improve this program.
    You are forbidden to forbid anyone else to use, share and improve

-   what you give them.   Help stamp out software-hoarding!  
+   what you give them.   Help stamp out software-hoarding!

 -------------------------------------------------------------------------*/
 -------------------------------------------------------------------------*/

-#include "string.h" 
-#define NULL (void *)0
+#include "string.h"

 
 

-char _generic *strncpy (
-       char _generic *d ,
-       char _generic *s ,
-       int            n ) 
+char *strncpy (
+       char * d,
+       char * s,
+       size_t n )

 {
 {

-       register char _generic *d1 =  d;
+       register char * d1 =  d;

 
 

-       while ( n-- )
+       while ( n && *s )
+       {
+               n-- ;

                *d++ = *s++ ;
                *d++ = *s++ ;

+       }
+       while ( n-- )
+       {
+               *d++ = '\0' ;
+       }

        return d1;
 }
        return d1;
 }