summaryrefslogtreecommitdiffstats
path: root/lib/libc/gen/getcap.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/getcap.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/getcap.c')
-rw-r--r--lib/libc/gen/getcap.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/libc/gen/getcap.c b/lib/libc/gen/getcap.c
index aaa1372..4e41a79 100644
--- a/lib/libc/gen/getcap.c
+++ b/lib/libc/gen/getcap.c
@@ -268,7 +268,7 @@ getent(cap, len, db_array, fd, name, depth, nfield)
*cap = cbuf;
return (retval);
} else {
- fd = _libc_open(*db_p, O_RDONLY, 0);
+ fd = _open(*db_p, O_RDONLY, 0);
if (fd < 0)
continue;
myfd = 1;
@@ -303,10 +303,10 @@ getent(cap, len, db_array, fd, name, depth, nfield)
if (bp >= b_end) {
int n;
- n = _libc_read(fd, buf, sizeof(buf));
+ n = _read(fd, buf, sizeof(buf));
if (n <= 0) {
if (myfd)
- (void)_libc_close(fd);
+ (void)_close(fd);
if (n < 0) {
free(record);
return (-2);
@@ -345,7 +345,7 @@ getent(cap, len, db_array, fd, name, depth, nfield)
if (record == NULL) {
errno = ENOMEM;
if (myfd)
- (void)_libc_close(fd);
+ (void)_close(fd);
return (-2);
}
r_end = record + newsize;
@@ -435,7 +435,7 @@ tc_exp: {
/* an error */
if (iret < -1) {
if (myfd)
- (void)_libc_close(fd);
+ (void)_close(fd);
free(record);
return (iret);
}
@@ -485,7 +485,7 @@ tc_exp: {
if (record == NULL) {
errno = ENOMEM;
if (myfd)
- (void)_libc_close(fd);
+ (void)_close(fd);
free(icap);
return (-2);
}
@@ -517,7 +517,7 @@ tc_exp: {
* return capability, length and success.
*/
if (myfd)
- (void)_libc_close(fd);
+ (void)_close(fd);
*len = rp - record - 1; /* don't count NUL */
if (r_end > rp)
if ((record =
OpenPOWER on IntegriCloud