diff options
| author | christos <christos@NetBSD.org> | 2007-06-04 18:19:26 +0000 |
|---|---|---|
| committer | christos <christos@NetBSD.org> | 2007-06-04 18:19:26 +0000 |
| commit | a8565cf99b88ffe6143bc83dbb95eb10c476ce23 (patch) | |
| tree | e91c2bc1334427d8e8a680abdbd68e88a49f9096 /common/lib/libc/string/bcopy.c | |
| parent | 2219d66ee753e7e806b94d82a436684259184fbf (diff) | |
handle fortify, ansify.
Diffstat (limited to 'common/lib/libc/string/bcopy.c')
| -rw-r--r-- | common/lib/libc/string/bcopy.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/common/lib/libc/string/bcopy.c b/common/lib/libc/string/bcopy.c index b61de64ea26..2a6571fedd3 100644 --- a/common/lib/libc/string/bcopy.c +++ b/common/lib/libc/string/bcopy.c @@ -1,4 +1,4 @@ -/* $NetBSD: bcopy.c,v 1.2 2006/02/05 06:47:48 ross Exp $ */ +/* $NetBSD: bcopy.c,v 1.3 2007/06/04 18:19:27 christos Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)bcopy.c 8.1 (Berkeley) 6/4/93"; #else -__RCSID("$NetBSD: bcopy.c,v 1.2 2006/02/05 06:47:48 ross Exp $"); +__RCSID("$NetBSD: bcopy.c,v 1.3 2007/06/04 18:19:27 christos Exp $"); #endif #endif /* LIBC_SCCS and not lint */ @@ -48,6 +48,12 @@ __RCSID("$NetBSD: bcopy.c,v 1.2 2006/02/05 06:47:48 ross Exp $"); #include <lib/libkern/libkern.h> #endif +#ifdef _FORTIFY_SOURCE +#undef bcopy +#undef memcpy +#undef memmove +#endif + /* * sizeof(word) MUST BE A POWER OF TWO * SO THAT wmask BELOW IS ALL ONES @@ -64,19 +70,16 @@ typedef long word; /* "word" used for optimal copy speed */ */ #ifdef MEMCOPY void * -memcpy(dst0, src0, length) +memcpy(void *dst0, const void *src0, size_t length) #else #ifdef MEMMOVE void * -memmove(dst0, src0, length) +memmove(void *dst0, const void *src0, size_t length) #else void -bcopy(src0, dst0, length) +bcopy(const void *src0, void *dst0, size_t length) #endif #endif - void *dst0; - const void *src0; - size_t length; { char *dst = dst0; const char *src = src0; |
