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

1 files changed, 29 insertions, 6 deletions

diff --git a/lib/libpthread/thread/thr_fcntl.c b/lib/libpthread/thread/thr_fcntl.c
index 6cd2b12..06e2e3b 100644
--- a/lib/libpthread/thread/thr_fcntl.c
+++ b/lib/libpthread/thread/thr_fcntl.c
@@ -39,7 +39,7 @@
 #include "pthread_private.h"
 
 int
-_libc_fcntl(int fd, int cmd,...)
+_fcntl(int fd, int cmd,...)
 {
 	int             flags = 0;
 	int		nonblock;
@@ -47,8 +47,6 @@ _libc_fcntl(int fd, int cmd,...)
 	int             ret;
 	va_list         ap;
 
-	_thread_enter_cancellation_point();
-
 	/* Lock the file descriptor: */
 	if ((ret = _FD_LOCK(fd, FD_RDWR, NULL)) == 0) {
 		/* Initialise the variable argument list: */
@@ -137,11 +135,36 @@ _libc_fcntl(int fd, int cmd,...)
 		/* Unlock the file descriptor: */
 		_FD_UNLOCK(fd, FD_RDWR);
 	}
-	_thread_leave_cancellation_point();
-
 	/* Return the completion status: */
 	return (ret);
 }
 
-__weak_reference(_libc_fcntl, fcntl);
+int
+fcntl(int fd, int cmd,...)
+{
+	int	ret;
+	va_list	ap;
+	
+	_thread_enter_cancellation_point();
+
+	va_start(ap, cmd);
+	switch (cmd) {
+		case F_DUPFD:
+		case F_SETFD:
+		case F_SETFL:
+			ret = fcntl(fd, cmd, va_arg(ap, int));
+			break;
+		case F_GETFD:
+		case F_GETFL:
+			ret = fcntl(fd, cmd);
+			break;
+		default:
+			ret = fcntl(fd, cmd, va_arg(ap, void *));
+	}
+	va_end(ap);
+
+	_thread_leave_cancellation_point();
+
+	return ret;
+}
 #endif