Clean up the synopsis section & fix mandoc warnings

[pw-darwin.git] / libutil / flopen.c

diff --git a/libutil/flopen.c b/libutil/flopen.c
index 89297290796e32dd7d0381e4172d1eb19c487d31..485eee4c1109b00b179acd3daeadd9bc6d0f6049 100644 (file)
--- a/libutil/flopen.c
+++ b/libutil/flopen.c
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2007-2009 Dag-Erling Coïdan Smørgrav
  * All rights reserved.
  *
@@ -45,8 +47,8 @@ __FBSDID("$FreeBSD$");
  * code's apparent simplicity; there would be no need for this function if it
  * was easy to get right.
  */
-int
-flopen(const char *path, int flags, ...)
+static int
+vflopenat(int dirfd, const char *path, int flags, va_list ap)
 {
        int fd, operation, serrno, trunc;
        struct stat sb, fsb;
@@ -58,11 +60,7 @@ flopen(const char *path, int flags, ...)
 
        mode = 0;
        if (flags & O_CREAT) {
-               va_list ap;
-
-               va_start(ap, flags);
                mode = (mode_t)va_arg(ap, int); /* mode_t promoted to int */
-               va_end(ap);
        }
 
         operation = LOCK_EX;
@@ -73,7 +71,7 @@ flopen(const char *path, int flags, ...)
        flags &= ~O_TRUNC;
 
        for (;;) {
-               if ((fd = open(path, flags, mode)) == -1)
+               if ((fd = openat(dirfd, path, flags, mode)) == -1)
                        /* non-existent or no access */
                        return (-1);
                if (flock(fd, operation) == -1) {
@@ -83,7 +81,7 @@ flopen(const char *path, int flags, ...)
                        errno = serrno;
                        return (-1);
                }
-               if (stat(path, &sb) == -1) {
+               if (fstatat(dirfd, path, &sb, 0) == -1) {
                        /* disappeared from under our feet */
                        (void)close(fd);
                        continue;
@@ -123,3 +121,27 @@ flopen(const char *path, int flags, ...)
                return (fd);
        }
 }
+
+int
+flopen(const char *path, int flags, ...)
+{
+       va_list ap;
+       int ret;
+
+       va_start(ap, flags);
+       ret = vflopenat(AT_FDCWD, path, flags, ap);
+       va_end(ap);
+       return (ret);
+}
+
+int
+flopenat(int dirfd, const char *path, int flags, ...)
+{
+       va_list ap;
+       int ret;
+
+       va_start(ap, flags);
+       ret = vflopenat(dirfd, path, flags, ap);
+       va_end(ap);
+       return (ret);
+}