summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjilles <jilles@FreeBSD.org>2015-12-20 16:33:56 +0000
committerjilles <jilles@FreeBSD.org>2015-12-20 16:33:56 +0000
commit507e66a915c4322dfe0e3980f73e9d59b6c29bd9 (patch)
treee700df492b1a137d9101f1c29f4c521d54dd635c
parent68c345265bbdb53395a7c7510b9df586dabb0a22 (diff)
downloadFreeBSD-src-507e66a915c4322dfe0e3980f73e9d59b6c29bd9.zip
FreeBSD-src-507e66a915c4322dfe0e3980f73e9d59b6c29bd9.tar.gz
libthr: Don't use both __sys_open() and __sys_openat().
-rw-r--r--lib/libthr/thread/thr_init.c2
-rw-r--r--lib/libthr/thread/thr_private.h1
2 files changed, 1 insertions, 2 deletions
diff --git a/lib/libthr/thread/thr_init.c b/lib/libthr/thread/thr_init.c
index 9a1a67a..e0400e4 100644
--- a/lib/libthr/thread/thr_init.c
+++ b/lib/libthr/thread/thr_init.c
@@ -332,7 +332,7 @@ _libpthread_init(struct pthread *curthread)
PANIC("Can't set session ID");
if (revoke(_PATH_CONSOLE) != 0)
PANIC("Can't revoke console");
- if ((fd = __sys_open(_PATH_CONSOLE, O_RDWR)) < 0)
+ if ((fd = __sys_openat(AT_FDCWD, _PATH_CONSOLE, O_RDWR)) < 0)
PANIC("Can't open console");
if (setlogin("root") == -1)
PANIC("Can't set login to root");
diff --git a/lib/libthr/thread/thr_private.h b/lib/libthr/thread/thr_private.h
index ed24c38..0ba123d 100644
--- a/lib/libthr/thread/thr_private.h
+++ b/lib/libthr/thread/thr_private.h
@@ -803,7 +803,6 @@ void _pthread_cancel_leave(int maycancel);
/* #include <fcntl.h> */
#ifdef _SYS_FCNTL_H_
int __sys_fcntl(int, int, ...);
-int __sys_open(const char *, int, ...);
int __sys_openat(int, const char *, int, ...);
#endif
OpenPOWER on IntegriCloud