Module Name: src
Committed By: kamil
Date: Wed Jan 17 01:24:30 UTC 2018
Modified Files:
src/lib/libc/gen: closefrom.c exect.c
src/lib/libc/include: namespace.h
src/lib/libc/stdio: fopen.c freopen.c
Log Message:
Revert to commits as they broke few rump tests
"Include namespace.h in a few of libc source files
[...]
This change finishes elimination of usage of the global name of the
following symbols:
- close -> _close
- execve -> _execve
- fcntl -> _fcntl
- setcontext -> _setcontext
- wait6 -> _wait6
- write -> _write
- writev -> _writev"
"Register more syscalls in namespace.h (of libc)
Add weak symbols for:
- fcntl
- close
- execve
- setcontext
- wait6
- write
- writev"
These changes broke:
fs/nfs/t_rquotad:get_nfs_be_1_both
fs/nfs/t_rquotad:get_nfs_be_1_group
fs/nfs/t_rquotad:get_nfs_be_1_user
fs/nfs/t_rquotad:get_nfs_le_1_both
fs/nfs/t_rquotad:get_nfs_le_1_group
fs/nfs/t_rquotad:get_nfs_le_1_user
lib/librumphijack/t_config:fdoff
lib/librumphijack/t_tcpip:http
lib/librumphijack/t_tcpip:nfs
lib/librumphijack/t_vfs:cpcopy
lib/librumphijack/t_vfs:mv_x
lib/librumphijack/t_vfs:paxcopy
net/net/t_forwarding:ipforwarding_fastforward_v4
net/net/t_forwarding:ipforwarding_fastforward_v6
net/net/t_forwarding:ipforwarding_fragment_v4
net/net/t_forwarding:ipforwarding_misc
net/net/t_mtudisc6:mtudisc6_basic
This revert fixes the failures, except lib/librumphijack/t_vfs.
The original changes were added in order to facilitate a usage of
sanitizers against programs linked with NetBSD's libc. It is no longer
needed, so abandon these changes.
Sponsored by <The NetBSD Foundation>
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/lib/libc/gen/closefrom.c
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/gen/exect.c
cvs rdiff -u -r1.195 -r1.196 src/lib/libc/include/namespace.h
cvs rdiff -u -r1.18 -r1.19 src/lib/libc/stdio/fopen.c
cvs rdiff -u -r1.21 -r1.22 src/lib/libc/stdio/freopen.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/closefrom.c
diff -u src/lib/libc/gen/closefrom.c:1.3 src/lib/libc/gen/closefrom.c:1.4
--- src/lib/libc/gen/closefrom.c:1.3 Fri Jan 5 19:01:36 2018
+++ src/lib/libc/gen/closefrom.c Wed Jan 17 01:24:29 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: closefrom.c,v 1.3 2018/01/05 19:01:36 kamil Exp $ */
+/* $NetBSD: closefrom.c,v 1.4 2018/01/17 01:24:29 kamil Exp $ */
/*
* Copyright (C) 2004 WIDE Project.
@@ -31,10 +31,9 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: closefrom.c,v 1.3 2018/01/05 19:01:36 kamil Exp $");
+__RCSID("$NetBSD: closefrom.c,v 1.4 2018/01/17 01:24:29 kamil Exp $");
#endif /* LIBC_SCCS and not lint */
-#include "namespace.h"
#include <fcntl.h>
#include <unistd.h>
Index: src/lib/libc/gen/exect.c
diff -u src/lib/libc/gen/exect.c:1.2 src/lib/libc/gen/exect.c:1.3
--- src/lib/libc/gen/exect.c:1.2 Fri Jan 5 19:01:36 2018
+++ src/lib/libc/gen/exect.c Wed Jan 17 01:24:29 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: exect.c,v 1.2 2018/01/05 19:01:36 kamil Exp $ */
+/* $NetBSD: exect.c,v 1.3 2018/01/17 01:24:29 kamil Exp $ */
/*-
* Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -28,10 +28,9 @@
#include <sys/cdefs.h>
#if !defined(lint)
-__RCSID("$NetBSD: exect.c,v 1.2 2018/01/05 19:01:36 kamil Exp $");
+__RCSID("$NetBSD: exect.c,v 1.3 2018/01/17 01:24:29 kamil Exp $");
#endif
-#include "namespace.h"
#include <unistd.h>
__warn_references(exect,
Index: src/lib/libc/include/namespace.h
diff -u src/lib/libc/include/namespace.h:1.195 src/lib/libc/include/namespace.h:1.196
--- src/lib/libc/include/namespace.h:1.195 Sun Jan 7 21:19:35 2018
+++ src/lib/libc/include/namespace.h Wed Jan 17 01:24:29 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: namespace.h,v 1.195 2018/01/07 21:19:35 kamil Exp $ */
+/* $NetBSD: namespace.h,v 1.196 2018/01/17 01:24:29 kamil Exp $ */
/*-
* Copyright (c) 1997-2004 The NetBSD Foundation, Inc.
@@ -45,7 +45,6 @@
#define err _err
#define errc _errc
#define errx _errx
-#define fcntl _fcntl
#ifdef _REENTRANT
#define fileno _fileno
#endif /* _REENTRANT */
@@ -275,7 +274,6 @@
#define clock_gettime _clock_gettime
#define clock_getres _clock_getres
#define clock_settime _clock_settime
-#define close _close
#define closedir _closedir
#define closelog _closelog
#define closelog_r _closelog_r
@@ -320,7 +318,6 @@
#define execlp _execlp
#define execlpe _execlpe
#define execv _execv
-#define execve _execve
#define execvp _execvp
#define execvpe _execvpe
#define explicit_memset _explicit_memset
@@ -620,7 +617,6 @@
#define seekdir _seekdir
#define select _select
#define send _send
-#define setcontext _setcontext
#define setdomainname _setdomainname
#define setenv _setenv
#define setfsent _setfsent
@@ -798,7 +794,6 @@
#define wait _wait
#define wait3 _wait3
#define wait4 _wait4
-#define wait6 _wait6
#define waitid _waitid
#define waitpid _waitpid
#define wcscasecmp _wcscasecmp
@@ -816,8 +811,6 @@
#define wcwidth _wcwidth
#define wcwidth_l _wcwidth_l
#define wprintf_l _wprintf_l
-#define write _write
-#define writev _writev
#define wscanf_l _wscanf_l
#define xdr_accepted_reply _xdr_accepted_reply
#define xdr_array _xdr_array
Index: src/lib/libc/stdio/fopen.c
diff -u src/lib/libc/stdio/fopen.c:1.18 src/lib/libc/stdio/fopen.c:1.19
--- src/lib/libc/stdio/fopen.c:1.18 Fri Jan 5 19:01:36 2018
+++ src/lib/libc/stdio/fopen.c Wed Jan 17 01:24:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: fopen.c,v 1.18 2018/01/05 19:01:36 kamil Exp $ */
+/* $NetBSD: fopen.c,v 1.19 2018/01/17 01:24:30 kamil Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -37,11 +37,10 @@
#if 0
static char sccsid[] = "@(#)fopen.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: fopen.c,v 1.18 2018/01/05 19:01:36 kamil Exp $");
+__RCSID("$NetBSD: fopen.c,v 1.19 2018/01/17 01:24:30 kamil Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
-#include "namespace.h"
#include <sys/types.h>
#include <sys/stat.h>
#include <assert.h>
Index: src/lib/libc/stdio/freopen.c
diff -u src/lib/libc/stdio/freopen.c:1.21 src/lib/libc/stdio/freopen.c:1.22
--- src/lib/libc/stdio/freopen.c:1.21 Fri Jan 5 19:01:36 2018
+++ src/lib/libc/stdio/freopen.c Wed Jan 17 01:24:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: freopen.c,v 1.21 2018/01/05 19:01:36 kamil Exp $ */
+/* $NetBSD: freopen.c,v 1.22 2018/01/17 01:24:30 kamil Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -37,11 +37,10 @@
#if 0
static char sccsid[] = "@(#)freopen.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: freopen.c,v 1.21 2018/01/05 19:01:36 kamil Exp $");
+__RCSID("$NetBSD: freopen.c,v 1.22 2018/01/17 01:24:30 kamil Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
-#include "namespace.h"
#include <sys/types.h>
#include <sys/stat.h>
