diff options
| -rw-r--r-- | lib/libc/gen/shm_open.c | 8 | ||||
| -rw-r--r-- | lib/libc/gen/sysconf.c | 4 | ||||
| -rw-r--r-- | lib/libc/termios/tcflow.c | 5 | ||||
| -rw-r--r-- | lib/libc/termios/tcsendbreak.c | 4 |
4 files changed, 11 insertions, 10 deletions
diff --git a/lib/libc/gen/shm_open.c b/lib/libc/gen/shm_open.c index de17de65d22..106c7e2261d 100644 --- a/lib/libc/gen/shm_open.c +++ b/lib/libc/gen/shm_open.c @@ -1,4 +1,4 @@ -/* $OpenBSD: shm_open.c,v 1.8 2015/12/10 13:03:22 tedu Exp $ */ +/* $OpenBSD: shm_open.c,v 1.9 2017/09/10 18:20:00 guenther Exp $ */ /* * Copyright (c) 2013 Ted Unangst <tedu@openbsd.org> * @@ -61,16 +61,16 @@ shm_open(const char *path, int flags, mode_t mode) makeshmpath(path, shmpath, sizeof(shmpath)); - fd = open(shmpath, flags, mode); + fd = HIDDEN(open)(shmpath, flags, mode); if (fd == -1) return -1; if (fstat(fd, &sb) == -1 || !S_ISREG(sb.st_mode)) { - close(fd); + HIDDEN(close)(fd); errno = EINVAL; return -1; } if (sb.st_uid != geteuid()) { - close(fd); + HIDDEN(close)(fd); errno = EPERM; return -1; } diff --git a/lib/libc/gen/sysconf.c b/lib/libc/gen/sysconf.c index 03becb59eec..e73bc437dab 100644 --- a/lib/libc/gen/sysconf.c +++ b/lib/libc/gen/sysconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sysconf.c,v 1.24 2016/03/20 02:32:40 guenther Exp $ */ +/* $OpenBSD: sysconf.c,v 1.25 2017/09/10 18:20:00 guenther Exp $ */ /*- * Copyright (c) 1993 * The Regents of the University of California. All rights reserved. @@ -241,7 +241,7 @@ sysconf(int name) value = socket(PF_INET6, SOCK_DGRAM, 0); errno = sverrno; if (value >= 0) { - close(value); + HIDDEN(close)(value); return (200112L); } else return (0); diff --git a/lib/libc/termios/tcflow.c b/lib/libc/termios/tcflow.c index 458999da488..0f1659691c9 100644 --- a/lib/libc/termios/tcflow.c +++ b/lib/libc/termios/tcflow.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcflow.c,v 1.5 2005/08/05 13:03:00 espie Exp $ */ +/* $OpenBSD: tcflow.c,v 1.6 2017/09/10 18:20:00 guenther Exp $ */ /*- * Copyright (c) 1989, 1993 * The Regents of the University of California. All rights reserved. @@ -49,7 +49,8 @@ tcflow(int fd, int action) if (tcgetattr(fd, &term) == -1) return (-1); c = term.c_cc[action == TCIOFF ? VSTOP : VSTART]; - if (c != _POSIX_VDISABLE && write(fd, &c, sizeof(c)) == -1) + if (c != _POSIX_VDISABLE && + HIDDEN(write)(fd, &c, sizeof(c)) == -1) return (-1); return (0); default: diff --git a/lib/libc/termios/tcsendbreak.c b/lib/libc/termios/tcsendbreak.c index f35838509f3..5419d7c41bf 100644 --- a/lib/libc/termios/tcsendbreak.c +++ b/lib/libc/termios/tcsendbreak.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcsendbreak.c,v 1.9 2015/11/01 03:45:29 guenther Exp $ */ +/* $OpenBSD: tcsendbreak.c,v 1.10 2017/09/10 18:20:00 guenther Exp $ */ /*- * Copyright (c) 1989, 1993 * The Regents of the University of California. All rights reserved. @@ -42,7 +42,7 @@ tcsendbreak(int fd, int len) if (ioctl(fd, TIOCSBRK, 0) == -1) return (-1); - (void)nanosleep(&sleepytime, NULL); + HIDDEN(nanosleep)(&sleepytime, NULL); if (ioctl(fd, TIOCCBRK, 0) == -1) return (-1); return (0); |