Module Name: src
Committed By: christos
Date: Thu Jan 20 02:57:00 UTC 2011
Modified Files:
src/lib/libc/gen: getcwd.c
Log Message:
provide a _sys_getcwd() entry like all the rest of the system calls to be
used by SSP.
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/lib/libc/gen/getcwd.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/gen/getcwd.c
diff -u src/lib/libc/gen/getcwd.c:1.46 src/lib/libc/gen/getcwd.c:1.47
--- src/lib/libc/gen/getcwd.c:1.46 Fri Jan 1 14:59:21 2010
+++ src/lib/libc/gen/getcwd.c Wed Jan 19 21:57:00 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: getcwd.c,v 1.46 2010/01/01 19:59:21 dholland Exp $ */
+/* $NetBSD: getcwd.c,v 1.47 2011/01/20 02:57:00 christos 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.47 2011/01/20 02:57:00 christos Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -54,8 +54,15 @@
#include "extern.h"
#ifdef __weak_alias
-__weak_alias(getcwd,_getcwd)
+__weak_alias(getcwd,_sys_getcwd)
+__weak_alias(_getcwd,_sys_getcwd)
__weak_alias(realpath,_realpath)
+
+#if defined(_FORTIFY_SOURCE) && !defined(__lint__)
+#undef getcwd
+#define getcwd _sys_getcwd
+#endif
+
#endif
/*
@@ -205,12 +212,6 @@
goto loop;
}
-
-#if defined(_FORTIFY_SOURCE) && !defined(__lint__)
-#undef getcwd
-#define getcwd _getcwd
-#endif
-
char *
getcwd(char *pt, size_t size)
{