summaryrefslogtreecommitdiffstats
path: root/lib/libc/gen/opendir.c
diff options
context:
space:
mode:
authorjasone <jasone@FreeBSD.org>2000-01-27 23:07:25 +0000
committerjasone <jasone@FreeBSD.org>2000-01-27 23:07:25 +0000
commit8abe2a2d86ee5f72093b3feeabf05c9f6f963576 (patch)
tree2ebe01199c17764ebcd26435b5ce1c06ebb67ad5 /lib/libc/gen/opendir.c
parent1731b249ccd9d7586d511eda8756f5c6b57b871c (diff)
downloadFreeBSD-src-8abe2a2d86ee5f72093b3feeabf05c9f6f963576.zip
FreeBSD-src-8abe2a2d86ee5f72093b3feeabf05c9f6f963576.tar.gz
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
Diffstat (limited to 'lib/libc/gen/opendir.c')
-rw-r--r--lib/libc/gen/opendir.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/libc/gen/opendir.c b/lib/libc/gen/opendir.c
index 077805d..d94b9af 100644
--- a/lib/libc/gen/opendir.c
+++ b/lib/libc/gen/opendir.c
@@ -80,7 +80,7 @@ __opendir2(name, flags)
errno = ENOTDIR;
return (NULL);
}
- if ((fd = _libc_open(name, O_RDONLY | O_NONBLOCK)) == -1)
+ if ((fd = _open(name, O_RDONLY | O_NONBLOCK)) == -1)
return (NULL);
dirp = NULL;
if (fstat(fd, &statb) != 0)
@@ -89,7 +89,7 @@ __opendir2(name, flags)
errno = ENOTDIR;
goto fail;
}
- if (_libc_fcntl(fd, F_SETFD, FD_CLOEXEC) == -1 ||
+ if (_fcntl(fd, F_SETFD, FD_CLOEXEC) == -1 ||
(dirp = malloc(sizeof(DIR))) == NULL)
goto fail;
@@ -163,8 +163,8 @@ __opendir2(name, flags)
* which has also been read -- see fts.c.
*/
if (flags & DTF_REWIND) {
- (void)_libc_close(fd);
- if ((fd = _libc_open(name, O_RDONLY)) == -1) {
+ (void)_close(fd);
+ if ((fd = _open(name, O_RDONLY)) == -1) {
saved_errno = errno;
free(buf);
free(dirp);
@@ -270,7 +270,7 @@ __opendir2(name, flags)
fail:
saved_errno = errno;
free(dirp);
- (void)_libc_close(fd);
+ (void)_close(fd);
errno = saved_errno;
return (NULL);
}
OpenPOWER on IntegriCloud