generic-library/libbsd
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libbsd/libbsd.git synced 2025-01-23 18:42:30 +01:00
Code Issues Projects Releases Wiki Activity

Use lockf() when flock() is not available

Browse Source 
On Solaris flock() is not available, and we should use instead lockf()
or fcntl().
This commit is contained in:
Guillem Jover 2023-04-10 23:10:40 +02:00
parent fe16f3863e
commit 1fb6c3f4ce
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -290,6 +290,7 @@ __register_atfork(NULL, NULL, NULL, __dso_handle);
AC_CHECK_FUNCS([\ AC_CHECK_FUNCS([\
clearenv \ clearenv \
dirfd \ dirfd \
flock \
fopencookie \ fopencookie \
__fpurge \ __fpurge \
getauxval \ getauxval \

29
src/flopen.c
View File

@ -38,6 +38,27 @@
#include <libutil.h> #include <libutil.h>
static int
lock_file(int fd, int flags)
{
int operation;
#if HAVE_FLOCK
operation = LOCK_EX;
if (flags & O_NONBLOCK)
operation |= LOCK_NB;
return flock(fd, operation);
#else
if (flags & O_NONBLOCK)
operation = F_TLOCK;
else
operation = F_LOCK;
return lockf(fd, operation, 0);
#endif
}
/* /*
* Reliably open and lock a file. * Reliably open and lock a file.
* *
@ -49,7 +70,7 @@
static int static int
vflopenat(int dirfd, const char *path, int flags, va_list ap) vflopenat(int dirfd, const char *path, int flags, va_list ap)
{ {
int fd, operation, serrno, trunc; int fd, serrno, trunc;
struct stat sb, fsb; struct stat sb, fsb;
mode_t mode; mode_t mode;
@ -62,10 +83,6 @@ vflopenat(int dirfd, const char *path, int flags, va_list ap)
mode = (mode_t)va_arg(ap, int); /* mode_t promoted to int */ mode = (mode_t)va_arg(ap, int); /* mode_t promoted to int */
} }
operation = LOCK_EX;
if (flags & O_NONBLOCK)
operation |= LOCK_NB;
trunc = (flags & O_TRUNC); trunc = (flags & O_TRUNC);
flags &= ~O_TRUNC; flags &= ~O_TRUNC;
@ -73,7 +90,7 @@ vflopenat(int dirfd, const char *path, int flags, va_list ap)
if ((fd = openat(dirfd, path, flags, mode)) == -1) if ((fd = openat(dirfd, path, flags, mode)) == -1)
/* non-existent or no access */ /* non-existent or no access */
return (-1); return (-1);
if (flock(fd, operation) == -1) { if (lock_file(fd, flags) == -1) {
/* unsupported or interrupted */ /* unsupported or interrupted */
serrno = errno; serrno = errno;
(void)close(fd); (void)close(fd);