Module Name: src
Committed By: roy
Date: Tue Dec 1 00:52:13 UTC 2009
Modified Files:
src/lib/libc/include: namespace.h
src/lib/libc/stdio: getdelim.c getline.c
Log Message:
Protect getdelim when used internally.
To generate a diff of this commit:
cvs rdiff -u -r1.138 -r1.139 src/lib/libc/include/namespace.h
cvs rdiff -u -r1.8 -r1.9 src/lib/libc/stdio/getdelim.c
cvs rdiff -u -r1.1 -r1.2 src/lib/libc/stdio/getline.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/include/namespace.h
diff -u src/lib/libc/include/namespace.h:1.138 src/lib/libc/include/namespace.h:1.139
--- src/lib/libc/include/namespace.h:1.138 Tue May 26 08:04:12 2009
+++ src/lib/libc/include/namespace.h Tue Dec 1 00:52:13 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: namespace.h,v 1.138 2009/05/26 08:04:12 joerg Exp $ */
+/* $NetBSD: namespace.h,v 1.139 2009/12/01 00:52:13 roy Exp $ */
/*-
* Copyright (c) 1997-2004 The NetBSD Foundation, Inc.
@@ -275,6 +275,7 @@
#define getaddrinfo _getaddrinfo
#define getbsize _getbsize
#define getcwd _getcwd
+#define getdelim _getdelim
#define getdevmajor _getdevmajor
#define getdiskbyname _getdiskbyname
#define getdomainname _getdomainname
Index: src/lib/libc/stdio/getdelim.c
diff -u src/lib/libc/stdio/getdelim.c:1.8 src/lib/libc/stdio/getdelim.c:1.9
--- src/lib/libc/stdio/getdelim.c:1.8 Tue Dec 1 00:03:53 2009
+++ src/lib/libc/stdio/getdelim.c Tue Dec 1 00:52:13 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: getdelim.c,v 1.8 2009/12/01 00:03:53 roy Exp $ */
+/* $NetBSD: getdelim.c,v 1.9 2009/12/01 00:52:13 roy Exp $ */
/*
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: getdelim.c,v 1.8 2009/12/01 00:03:53 roy Exp $");
+__RCSID("$NetBSD: getdelim.c,v 1.9 2009/12/01 00:52:13 roy Exp $");
#include "namespace.h"
@@ -44,6 +44,10 @@
#include "reentrant.h"
#include "local.h"
+#ifdef __weak_alias
+__weak_alias(getdelim, _getdelim)
+#endif
+
/* Minimum buffer size we create.
* This should allow config files to fit into our power of 2 buffer growth
* without the need for a realloc. */
Index: src/lib/libc/stdio/getline.c
diff -u src/lib/libc/stdio/getline.c:1.1 src/lib/libc/stdio/getline.c:1.2
--- src/lib/libc/stdio/getline.c:1.1 Mon Jul 13 22:19:25 2009
+++ src/lib/libc/stdio/getline.c Tue Dec 1 00:52:13 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: getline.c,v 1.1 2009/07/13 22:19:25 roy Exp $ */
+/* $NetBSD: getline.c,v 1.2 2009/12/01 00:52:13 roy Exp $ */
/*
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -28,7 +28,9 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: getline.c,v 1.1 2009/07/13 22:19:25 roy Exp $");
+__RCSID("$NetBSD: getline.c,v 1.2 2009/12/01 00:52:13 roy Exp $");
+
+#include "namespace.h"
#include <stdio.h>
