diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2020-12-02 05:24:24 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2020-12-02 05:24:24 +0000 |
| commit | 8873c303fefaed17f6777989f929612a99675a00 (patch) | |
| tree | 26efa9863177ec574d4351e8db84a47566a2af98 /src/libs6/s6lockd-helper.c | |
| parent | 2a73901e12a1f3b498e6901ef607b55f9f193097 (diff) | |
| download | s6-8873c303fefaed17f6777989f929612a99675a00.tar.xz | |
Fix build against skalibs-2.10.0.0
Diffstat (limited to 'src/libs6/s6lockd-helper.c')
| -rw-r--r-- | src/libs6/s6lockd-helper.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/libs6/s6lockd-helper.c b/src/libs6/s6lockd-helper.c index 8979c67..469a417 100644 --- a/src/libs6/s6lockd-helper.c +++ b/src/libs6/s6lockd-helper.c @@ -1,24 +1,25 @@ /* ISC license. */ +#include <errno.h> + #include <skalibs/allreadwrite.h> #include <skalibs/strerr2.h> -#include <skalibs/env.h> #include <skalibs/djbunix.h> #define USAGE "s6lockd-helper lockfile" #define dieusage() strerr_dieusage(100, USAGE) -int main (int argc, char const *const *argv, char const *const *envp) +int main (int argc, char const *const *argv) { - int fd ; - char const *x = env_get2(envp, "S6LOCK_EX") ; + int fd, r ; char c ; PROG = "s6lockd-helper" ; - if (argc < 2) dieusage() ; - fd = open_create(argv[1]) ; + if (argc < 3) dieusage() ; + fd = open_create(argv[2]) ; if (fd < 0) strerr_diefu2sys(111, "open ", argv[1]) ; - if (((x && *x) ? lock_ex(fd) : lock_sh(fd)) < 0) - strerr_diefu2sys(111, "lock ", argv[1]) ; + r = fd_lock(fd, argv[1][0] == 'w', 0) ; + if (!r) errno = EBUSY ; + if (r < 1) strerr_diefu2sys(111, "lock ", argv[2]) ; if (fd_write(1, "!", 1) <= 0) strerr_diefu1sys(111, "write to stdout") ; if (fd_read(0, &c, 1) < 0) |