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

2 files changed, 5 insertions, 5 deletions

diff --git a/lib/libc/db/btree/bt_close.c b/lib/libc/db/btree/bt_close.c
index fbe6a21..c5e0d52 100644
--- a/lib/libc/db/btree/bt_close.c
+++ b/lib/libc/db/btree/bt_close.c
@@ -105,7 +105,7 @@ __bt_close(dbp)
 	fd = t->bt_fd;
 	free(t);
 	free(dbp);
-	return (_libc_close(fd) ? RET_ERROR : RET_SUCCESS);
+	return (_close(fd) ? RET_ERROR : RET_SUCCESS);
 }
 
 /*
diff --git a/lib/libc/db/btree/bt_open.c b/lib/libc/db/btree/bt_open.c
index d306993..e838f25 100644
--- a/lib/libc/db/btree/bt_open.c
+++ b/lib/libc/db/btree/bt_open.c
@@ -203,7 +203,7 @@ __bt_open(fname, flags, mode, openinfo, dflags)
 			goto einval;
 		}
 		
-		if ((t->bt_fd = _libc_open(fname, flags, mode)) < 0)
+		if ((t->bt_fd = _open(fname, flags, mode)) < 0)
 			goto err;
 
 	} else {
@@ -214,13 +214,13 @@ __bt_open(fname, flags, mode, openinfo, dflags)
 		F_SET(t, B_INMEM);
 	}
 
-	if (_libc_fcntl(t->bt_fd, F_SETFD, 1) == -1)
+	if (_fcntl(t->bt_fd, F_SETFD, 1) == -1)
 		goto err;
 
 	if (fstat(t->bt_fd, &sb))
 		goto err;
 	if (sb.st_size) {
-		if ((nr = _libc_read(t->bt_fd, &m, sizeof(BTMETA))) < 0)
+		if ((nr = _read(t->bt_fd, &m, sizeof(BTMETA))) < 0)
 			goto err;
 		if (nr != sizeof(BTMETA))
 			goto eftype;
@@ -336,7 +336,7 @@ err:	if (t) {
 		if (t->bt_dbp)
 			free(t->bt_dbp);
 		if (t->bt_fd != -1)
-			(void)_libc_close(t->bt_fd);
+			(void)_close(t->bt_fd);
 		free(t);
 	}
 	return (NULL);