From 8abe2a2d86ee5f72093b3feeabf05c9f6f963576 Mon Sep 17 00:00:00 2001 From: jasone 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/libc/gen/nlist.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/libc/gen/nlist.c') diff --git a/lib/libc/gen/nlist.c b/lib/libc/gen/nlist.c index 09e93aa..f459067 100644 --- a/lib/libc/gen/nlist.c +++ b/lib/libc/gen/nlist.c @@ -66,11 +66,11 @@ nlist(name, list) { int fd, n; - fd = _libc_open(name, O_RDONLY, 0); + fd = _open(name, O_RDONLY, 0); if (fd < 0) return (-1); n = __fdnlist(fd, list); - (void)_libc_close(fd); + (void)_close(fd); return (n); } @@ -255,7 +255,7 @@ __elf_fdnlist(fd, list) /* Make sure obj is OK */ if (lseek(fd, (off_t)0, SEEK_SET) == -1 || - _libc_read(fd, &ehdr, sizeof(Elf_Ehdr)) != sizeof(Elf_Ehdr) || + _read(fd, &ehdr, sizeof(Elf_Ehdr)) != sizeof(Elf_Ehdr) || !__elf_is_okay__(&ehdr) || fstat(fd, &st) < 0) return (-1); @@ -339,7 +339,7 @@ __elf_fdnlist(fd, list) while (symsize > 0 && nent > 0) { cc = MIN(symsize, sizeof(sbuf)); - if (_libc_read(fd, sbuf, cc) != cc) + if (_read(fd, sbuf, cc) != cc) break; symsize -= cc; for (s = sbuf; cc > 0 && nent > 0; ++s, cc -= sizeof(*s)) { -- cgit v1.1