CVS: blob/src/lib strncpy.c,NONE,1.1 Makefile.am,1.5,1.6 strcpy.c,1.1,NONE

[Erik M. <er...@us...>]

Update of /cvsroot/blob/blob/src/lib
In directory usw-pr-cvs1:/tmp/cvs-serv30998/src/lib

Modified Files:
	Makefile.am 
Added Files:
	strncpy.c 
Removed Files:
	strcpy.c 
Log Message:
Remove strcpy() in favour of strncpy(). Again, this forces you to think before
you copy a string. The changes in the files are trivial again.


--- NEW FILE: strncpy.c ---
/*
 * strncpy.c: copy string
 *
 * Copyright (C) 2001  Erik Mouw (J.A...@it...)
 *
 * $Id: strncpy.c,v 1.1 2001/12/19 20:00:14 erikm Exp $
 *
 * 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 Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program 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
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 */

#ident "$Id: strncpy.c,v 1.1 2001/12/19 20:00:14 erikm Exp $"

#ifdef HAVE_CONFIG_H
# include <blob/config.h>
#endif

#include <blob/util.h>




char *strncpy(char *dest, const char *src, int n)
{
	while(n > 0) {
		n--;

		if((*dest++ = *src++) == '\0')
			break;
	}

	return dest;
}




/* small variation on strncpy(): null-terminate the destination
 * string
 */
char *strlcpy(char *dest, const char *src, int n)
{
	strncpy(dest, src, n);

	if(n > 0)
		dest[n-1] = '\0';

	return dest;
}

Index: Makefile.am
===================================================================
RCS file: /cvsroot/blob/blob/src/lib/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile.am	2001/10/07 22:58:56	1.5
+++ Makefile.am	2001/12/19 20:00:15	1.6
@@ -33,7 +33,7 @@
 	led.c \
 	reboot.c \
 	serial.c \
-	strcpy.c \
+	strncpy.c \
 	strlen.c \
 	strncmp.c \
 	strtou32.c \

--- strcpy.c DELETED ---