Module Name: src
Committed By: tron
Date: Wed Nov 6 21:05:27 UTC 2013
Modified Files:
src/lib/libc/string: stpcpy.c stpncpy.c
Log Message:
Fix build problems.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/libc/string/stpcpy.c \
src/lib/libc/string/stpncpy.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/string/stpcpy.c
diff -u src/lib/libc/string/stpcpy.c:1.1 src/lib/libc/string/stpcpy.c:1.2
--- src/lib/libc/string/stpcpy.c:1.1 Fri May 1 17:27:01 2009
+++ src/lib/libc/string/stpcpy.c Wed Nov 6 21:05:27 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: stpcpy.c,v 1.1 2009/05/01 17:27:01 perry Exp $ */
+/* $NetBSD: stpcpy.c,v 1.2 2013/11/06 21:05:27 tron Exp $ */
/*
* Copyright (c) 1999
@@ -36,13 +36,17 @@
#if 0
static char sccsid[] = "@(#)strcpy.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: stpcpy.c,v 1.1 2009/05/01 17:27:01 perry Exp $");
+__RCSID("$NetBSD: stpcpy.c,v 1.2 2013/11/06 21:05:27 tron Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
/* FreeBSD: src/lib/libc/string/stpcpy.c,v 1.2 2009/02/28 06:05:37 das Exp */
#include <string.h>
+#ifdef _FORTIFY_SOURCE
+#undef stpcpy
+#endif
+
char *
stpcpy(char * __restrict to, const char * __restrict from)
{
Index: src/lib/libc/string/stpncpy.c
diff -u src/lib/libc/string/stpncpy.c:1.1 src/lib/libc/string/stpncpy.c:1.2
--- src/lib/libc/string/stpncpy.c:1.1 Fri May 1 17:27:01 2009
+++ src/lib/libc/string/stpncpy.c Wed Nov 6 21:05:27 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: stpncpy.c,v 1.1 2009/05/01 17:27:01 perry Exp $ */
+/* $NetBSD: stpncpy.c,v 1.2 2013/11/06 21:05:27 tron Exp $ */
/*-
* Copyright (c) 2009 David Schultz <[email protected]>
@@ -28,12 +28,16 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: stpncpy.c,v 1.1 2009/05/01 17:27:01 perry Exp $");
+__RCSID("$NetBSD: stpncpy.c,v 1.2 2013/11/06 21:05:27 tron Exp $");
#endif /* LIBC_SCCS and not lint */
/* FreeBSD: src/lib/libc/string/stpncpy.c,v 1.1 2009/02/28 06:00:58 das Exp */
#include <string.h>
+#ifdef _FORTIFY_SOURCE
+#undef stpncpy
+#endif
+
char *
stpncpy(char * __restrict dst, const char * __restrict src, size_t n)
{
