Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/lib/libc/gen/getcwd.c,v retrieving revision 1.46 retrieving revision 1.46.2.3 diff -u -p -r1.46 -r1.46.2.3 --- src/lib/libc/gen/getcwd.c 2010/01/01 19:59:21 1.46 +++ src/lib/libc/gen/getcwd.c 2011/03/05 15:09:19 1.46.2.3 @@ -1,4 +1,4 @@ -/* $NetBSD: getcwd.c,v 1.46 2010/01/01 19:59:21 dholland Exp $ */ +/* $NetBSD: getcwd.c,v 1.46.2.3 2011/03/05 15:09:19 bouyer Exp $ */ /* * Copyright (c) 1989, 1991, 1993, 1995 @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)getcwd.c 8.5 (Berkeley) 2/7/95"; #else -__RCSID("$NetBSD: getcwd.c,v 1.46 2010/01/01 19:59:21 dholland Exp $"); +__RCSID("$NetBSD: getcwd.c,v 1.46.2.3 2011/03/05 15:09:19 bouyer Exp $"); #endif #endif /* LIBC_SCCS and not lint */ @@ -50,11 +50,13 @@ __RCSID("$NetBSD: getcwd.c,v 1.46 2010/0 #include #include #include +#include #include "extern.h" #ifdef __weak_alias __weak_alias(getcwd,_getcwd) +__weak_alias(_sys_getcwd,_getcwd) __weak_alias(realpath,_realpath) #endif @@ -205,14 +207,8 @@ loop: goto loop; } - -#if defined(_FORTIFY_SOURCE) && !defined(__lint__) -#undef getcwd -#define getcwd _getcwd -#endif - char * -getcwd(char *pt, size_t size) +__ssp_real(getcwd)(char *pt, size_t size) { char *npt;