Add weak definitions for wrapped system calls. In general:

	_foo - wrapped system call
	foo - weak definition to _foo

and for cancellation points:

	_foo - wrapped system call
	__foo - enter cancellation point, call _foo(), leave
	        cancellation point
	foo - weak definition to __foo

Change use of global _thread_run to call a function to get the
currently running thread.

Make all pthread_foo functions weak definitions to _pthread_foo,
where _pthread_foo is the implementation.  This allows an application
to provide its own pthread functions.

Provide slightly different versions of pthread_mutex_lock and
pthread_mutex_init so that we can tell the difference between
a libc mutex and an application mutex.  Threads holding mutexes
internal to libc should never be allowed to exit, call signal
handlers, or cancel.

Approved by:	-arch

1 files changed, 4 insertions, 6 deletions

diff --git a/lib/libc_r/uthread/uthread_dup2.c b/lib/libc_r/uthread/uthread_dup2.c
index b1e8b5e..4057a6f 100644
--- a/lib/libc_r/uthread/uthread_dup2.c
+++ b/lib/libc_r/uthread/uthread_dup2.c
@@ -33,10 +33,11 @@
  */
 #include <errno.h>
 #include <unistd.h>
-#ifdef _THREAD_SAFE
 #include <pthread.h>
 #include "pthread_private.h"
 
+#pragma weak	dup2=_dup2
+
 int
 _dup2(int fd, int newfd)
 {
@@ -56,12 +57,12 @@ _dup2(int fd, int newfd)
 		if (!(newfd_opened = (_thread_fd_table[newfd] != NULL)) || 
 		    (ret = _FD_LOCK(newfd, FD_RDWR, NULL)) == 0) {
 			/* Perform the 'dup2' syscall: */
-			if ((ret = _thread_sys_dup2(fd, newfd)) < 0) {
+			if ((ret = __sys_dup2(fd, newfd)) < 0) {
 			}
 			/* Initialise the file descriptor table entry: */
 			else if (_thread_fd_table_init(ret) != 0) {
 				/* Quietly close the file: */
-				_thread_sys_close(ret);
+				__sys_close(ret);
 
 				/* Reset the file descriptor: */
 				ret = -1;
@@ -83,6 +84,3 @@ _dup2(int fd, int newfd)
 	/* Return the completion status: */
 	return (ret);
 }
-
-__strong_reference(_dup2, dup2);
-#endif