From 8abe2a2d86ee5f72093b3feeabf05c9f6f963576 Mon Sep 17 00:00:00 2001
From: jasone <jasone@FreeBSD.org>
Date: Thu, 27 Jan 2000 23:07:25 +0000
Subject: Simplify sytem call renaming.  Instead of _foo() <-- _libc_foo <--
 foo(), just use _foo() <-- foo().  In the case of a libpthread that doesn't
 do call conversion (such as linuxthreads and our upcoming libpthread), this
 is adequate.  In the case of libc_r, we still need three names, which are now
 _thread_sys_foo() <-- _foo() <-- foo().

Convert all internal libc usage of: aio_suspend(), close(), fsync(), msync(),
nanosleep(), open(), fcntl(), read(), and write() to _foo() instead of foo().

Remove all internal libc usage of: creat(), pause(), sleep(), system(),
tcdrain(), wait(), and waitpid().

Make thread cancellation fully POSIX-compliant.

Suggested by:	deischen
---
 lib/libkse/thread/thr_open.c | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

(limited to 'lib/libkse/thread/thr_open.c')

diff --git a/lib/libkse/thread/thr_open.c b/lib/libkse/thread/thr_open.c
index 4bc2f1a..e7fef91 100644
--- a/lib/libkse/thread/thr_open.c
+++ b/lib/libkse/thread/thr_open.c
@@ -42,14 +42,12 @@
 #include "pthread_private.h"
 
 int
-_libc_open(const char *path, int flags,...)
+_open(const char *path, int flags,...)
 {
 	int	fd;
 	int	mode = 0;
 	va_list	ap;
 
-	_thread_enter_cancellation_point();
-
 	/* Check if the file is being created: */
 	if (flags & O_CREAT) {
 		/* Get the creation mode: */
@@ -69,11 +67,30 @@ _libc_open(const char *path, int flags,...)
 		fd = -1;
 	}
 
-	_thread_leave_cancellation_point();
-
 	/* Return the file descriptor or -1 on error: */
 	return (fd);
 }
 
-__weak_reference(_libc_open, open);
+int
+open(const char *path, int flags,...)
+{
+	int	ret;
+	int	mode = 0;
+	va_list	ap;
+
+	_thread_enter_cancellation_point();
+	
+	/* Check if the file is being created: */
+	if (flags & O_CREAT) {
+		/* Get the creation mode: */
+		va_start(ap, flags);
+		mode = va_arg(ap, int);
+		va_end(ap);
+	}
+	
+	ret = _open(path, flags, mode);
+	_thread_leave_cancellation_point();
+
+	return ret;
+}
 #endif
-- 
cgit v1.1