Module Name: src
Committed By: joerg
Date: Wed Sep 17 00:39:29 UTC 2014
Modified Files:
src/lib/libc/ssp: memcpy_chk.c memmove_chk.c memset_chk.c strcat_chk.c
strcpy_chk.c strncat_chk.c strncpy_chk.c
Log Message:
Provide explicit prototypes in case HAVE_SSP=no.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/lib/libc/ssp/memcpy_chk.c \
src/lib/libc/ssp/memmove_chk.c src/lib/libc/ssp/memset_chk.c \
src/lib/libc/ssp/strcat_chk.c src/lib/libc/ssp/strncat_chk.c \
src/lib/libc/ssp/strncpy_chk.c
cvs rdiff -u -r1.6 -r1.7 src/lib/libc/ssp/strcpy_chk.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/ssp/memcpy_chk.c
diff -u src/lib/libc/ssp/memcpy_chk.c:1.4 src/lib/libc/ssp/memcpy_chk.c:1.5
--- src/lib/libc/ssp/memcpy_chk.c:1.4 Mon Apr 28 20:23:00 2008
+++ src/lib/libc/ssp/memcpy_chk.c Wed Sep 17 00:39:28 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: memcpy_chk.c,v 1.4 2008/04/28 20:23:00 martin Exp $ */
+/* $NetBSD: memcpy_chk.c,v 1.5 2014/09/17 00:39:28 joerg Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: memcpy_chk.c,v 1.4 2008/04/28 20:23:00 martin Exp $");
+__RCSID("$NetBSD: memcpy_chk.c,v 1.5 2014/09/17 00:39:28 joerg Exp $");
/*LINTLIBRARY*/
@@ -38,6 +38,8 @@ __RCSID("$NetBSD: memcpy_chk.c,v 1.4 200
#undef memcpy
+void *__memcpy_chk(void * __restrict, const void * __restrict, size_t, size_t);
+
void *
__memcpy_chk(void * __restrict dst, const void * __restrict src, size_t len,
size_t slen)
Index: src/lib/libc/ssp/memmove_chk.c
diff -u src/lib/libc/ssp/memmove_chk.c:1.4 src/lib/libc/ssp/memmove_chk.c:1.5
--- src/lib/libc/ssp/memmove_chk.c:1.4 Mon Apr 28 20:23:00 2008
+++ src/lib/libc/ssp/memmove_chk.c Wed Sep 17 00:39:28 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: memmove_chk.c,v 1.4 2008/04/28 20:23:00 martin Exp $ */
+/* $NetBSD: memmove_chk.c,v 1.5 2014/09/17 00:39:28 joerg Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: memmove_chk.c,v 1.4 2008/04/28 20:23:00 martin Exp $");
+__RCSID("$NetBSD: memmove_chk.c,v 1.5 2014/09/17 00:39:28 joerg Exp $");
/*LINTLIBRARY*/
@@ -38,6 +38,8 @@ __RCSID("$NetBSD: memmove_chk.c,v 1.4 20
#undef memmove
+void *__memmove_chk(void *, void *src, size_t, size_t);
+
void *
__memmove_chk(void *dst, void *src, size_t len,
size_t slen)
Index: src/lib/libc/ssp/memset_chk.c
diff -u src/lib/libc/ssp/memset_chk.c:1.4 src/lib/libc/ssp/memset_chk.c:1.5
--- src/lib/libc/ssp/memset_chk.c:1.4 Mon Apr 28 20:23:00 2008
+++ src/lib/libc/ssp/memset_chk.c Wed Sep 17 00:39:28 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: memset_chk.c,v 1.4 2008/04/28 20:23:00 martin Exp $ */
+/* $NetBSD: memset_chk.c,v 1.5 2014/09/17 00:39:28 joerg Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: memset_chk.c,v 1.4 2008/04/28 20:23:00 martin Exp $");
+__RCSID("$NetBSD: memset_chk.c,v 1.5 2014/09/17 00:39:28 joerg Exp $");
/*LINTLIBRARY*/
@@ -38,6 +38,8 @@ __RCSID("$NetBSD: memset_chk.c,v 1.4 200
#undef memset
+void *__memset_chk(void * __restrict, int, size_t, size_t);
+
void *
__memset_chk(void * __restrict dst, int val, size_t len, size_t slen)
{
Index: src/lib/libc/ssp/strcat_chk.c
diff -u src/lib/libc/ssp/strcat_chk.c:1.4 src/lib/libc/ssp/strcat_chk.c:1.5
--- src/lib/libc/ssp/strcat_chk.c:1.4 Tue Nov 17 20:44:26 2009
+++ src/lib/libc/ssp/strcat_chk.c Wed Sep 17 00:39:28 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: strcat_chk.c,v 1.4 2009/11/17 20:44:26 drochner Exp $ */
+/* $NetBSD: strcat_chk.c,v 1.5 2014/09/17 00:39:28 joerg Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -29,13 +29,15 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: strcat_chk.c,v 1.4 2009/11/17 20:44:26 drochner Exp $");
+__RCSID("$NetBSD: strcat_chk.c,v 1.5 2014/09/17 00:39:28 joerg Exp $");
/*LINTLIBRARY*/
#include <ssp/ssp.h>
#include <string.h>
+char *__strcat_chk(char * __restrict, const char * __restrict, size_t);
+
char *
__strcat_chk(char * __restrict dst, const char * __restrict src, size_t slen)
{
Index: src/lib/libc/ssp/strncat_chk.c
diff -u src/lib/libc/ssp/strncat_chk.c:1.4 src/lib/libc/ssp/strncat_chk.c:1.5
--- src/lib/libc/ssp/strncat_chk.c:1.4 Tue Nov 17 20:44:26 2009
+++ src/lib/libc/ssp/strncat_chk.c Wed Sep 17 00:39:28 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: strncat_chk.c,v 1.4 2009/11/17 20:44:26 drochner Exp $ */
+/* $NetBSD: strncat_chk.c,v 1.5 2014/09/17 00:39:28 joerg Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: strncat_chk.c,v 1.4 2009/11/17 20:44:26 drochner Exp $");
+__RCSID("$NetBSD: strncat_chk.c,v 1.5 2014/09/17 00:39:28 joerg Exp $");
/*LINTLIBRARY*/
@@ -37,6 +37,9 @@ __RCSID("$NetBSD: strncat_chk.c,v 1.4 20
#include <string.h>
#include <stdio.h>
+char *__strncat_chk(char * __restrict, const char * __restrict, size_t,
+ size_t);
+
char *
__strncat_chk(char * __restrict dst, const char * __restrict src, size_t len,
size_t slen)
Index: src/lib/libc/ssp/strncpy_chk.c
diff -u src/lib/libc/ssp/strncpy_chk.c:1.4 src/lib/libc/ssp/strncpy_chk.c:1.5
--- src/lib/libc/ssp/strncpy_chk.c:1.4 Mon Apr 28 20:23:00 2008
+++ src/lib/libc/ssp/strncpy_chk.c Wed Sep 17 00:39:28 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: strncpy_chk.c,v 1.4 2008/04/28 20:23:00 martin Exp $ */
+/* $NetBSD: strncpy_chk.c,v 1.5 2014/09/17 00:39:28 joerg Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: strncpy_chk.c,v 1.4 2008/04/28 20:23:00 martin Exp $");
+__RCSID("$NetBSD: strncpy_chk.c,v 1.5 2014/09/17 00:39:28 joerg Exp $");
/*LINTLIBRARY*/
@@ -38,6 +38,9 @@ __RCSID("$NetBSD: strncpy_chk.c,v 1.4 20
#undef strncpy
+char *__strncpy_chk(char * __restrict, const char * __restrict, size_t,
+ size_t);
+
char *
__strncpy_chk(char * __restrict dst, const char * __restrict src, size_t len,
size_t slen)
Index: src/lib/libc/ssp/strcpy_chk.c
diff -u src/lib/libc/ssp/strcpy_chk.c:1.6 src/lib/libc/ssp/strcpy_chk.c:1.7
--- src/lib/libc/ssp/strcpy_chk.c:1.6 Wed Nov 6 16:30:27 2013
+++ src/lib/libc/ssp/strcpy_chk.c Wed Sep 17 00:39:28 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: strcpy_chk.c,v 1.6 2013/11/06 16:30:27 christos Exp $ */
+/* $NetBSD: strcpy_chk.c,v 1.7 2014/09/17 00:39:28 joerg Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: strcpy_chk.c,v 1.6 2013/11/06 16:30:27 christos Exp $");
+__RCSID("$NetBSD: strcpy_chk.c,v 1.7 2014/09/17 00:39:28 joerg Exp $");
/*LINTLIBRARY*/
@@ -38,6 +38,8 @@ __RCSID("$NetBSD: strcpy_chk.c,v 1.6 201
#undef memcpy
+char *__strcpy_chk(char * __restrict, const char * __restrict, size_t);
+
char *
__strcpy_chk(char * __restrict dst, const char * __restrict src, size_t slen)
{
