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, 7 insertions, 7 deletions

diff --git a/lib/libc/stdtime/localtime.c b/lib/libc/stdtime/localtime.c
index 34c978b..4fa411f 100644
--- a/lib/libc/stdtime/localtime.c
+++ b/lib/libc/stdtime/localtime.c
@@ -314,7 +314,7 @@ register struct state * const	sp;
 		}
 		if (doaccess && access(name, R_OK) != 0)
 		     	return -1;
-		if ((fid = _libc_open(name, OPEN_MODE)) == -1)
+		if ((fid = _open(name, OPEN_MODE)) == -1)
 			return -1;
 		if ((fstat(fid, &stab) < 0) || !S_ISREG(stab.st_mode))
 			return -1;
@@ -325,8 +325,8 @@ register struct state * const	sp;
 		int		ttisstdcnt;
 		int		ttisgmtcnt;
 
-		i = _libc_read(fid, buf, sizeof buf);
-		if (_libc_close(fid) != 0)
+		i = _read(fid, buf, sizeof buf);
+		if (_close(fid) != 0)
 			return -1;
 		p = buf;
 		p += (sizeof tzhp->tzh_magic) + (sizeof tzhp->tzh_reserved);
diff --git a/lib/libc/stdtime/timelocal.c b/lib/libc/stdtime/timelocal.c
index f95dda0..c765cf4 100644
--- a/lib/libc/stdtime/timelocal.c
+++ b/lib/libc/stdtime/timelocal.c
@@ -157,7 +157,7 @@ __time_load_locale(const char *name)
 	strcat(filename, "/");
 	strcat(filename, name);
 	strcat(filename, "/LC_TIME");
-	fd = _libc_open(filename, O_RDONLY);
+	fd = _open(filename, O_RDONLY);
 	if (fd < 0)
 		goto no_locale;
 	if (fstat(fd, &st) != 0)
@@ -173,9 +173,9 @@ __time_load_locale(const char *name)
 	(void) strcpy(lbuf, name);
 	p = lbuf + namesize;
 	plim = p + st.st_size;
-	if (_libc_read(fd, p, (size_t) st.st_size) != st.st_size)
+	if (_read(fd, p, (size_t) st.st_size) != st.st_size)
 		goto bad_lbuf;
-	if (_libc_close(fd) != 0)
+	if (_close(fd) != 0)
 		goto bad_lbuf;
 	/*
 	** Parse the locale file into localebuf.
@@ -211,7 +211,7 @@ reset_locale:
 bad_lbuf:
 	free(lbuf);
 bad_locale:
-	(void)_libc_close(fd);
+	(void)_close(fd);
 no_locale:
 	_time_using_locale = save_using_locale;
 	return -1;