diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2017-08-22 10:27:47 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2017-08-22 10:27:47 +0000 |
| commit | 83cd31ed0679300cb7ac9335785f1b3ec9633712 (patch) | |
| tree | cd9a29ca6e410f19c98d97999b68ef4d362160af /src/libs6rc/s6rc_lock.c | |
| parent | 5589e71de950b2baca33c38c6632e374b2211dfb (diff) | |
| download | s6-rc-83cd31ed0679300cb7ac9335785f1b3ec9633712.tar.xz | |
Prepare for 0.2.1.2
Diffstat (limited to 'src/libs6rc/s6rc_lock.c')
| -rw-r--r-- | src/libs6rc/s6rc_lock.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/libs6rc/s6rc_lock.c b/src/libs6rc/s6rc_lock.c index 43b60bb..d3ae2b5 100644 --- a/src/libs6rc/s6rc_lock.c +++ b/src/libs6rc/s6rc_lock.c @@ -17,7 +17,6 @@ static inline int locksh (int fd, int blocking) int s6rc_lock (char const *live, int lwhat, int *llfd, char const *compiled, int cwhat, int *ccfd, int blocking) { - int e = 0 ; int lfd = -1, cfd = -1 ; if (lwhat) @@ -28,8 +27,8 @@ int s6rc_lock (char const *live, int lwhat, int *llfd, char const *compiled, int memcpy(lfn + llen, "/lock", 6) ; lfd = open_create(lfn) ; if (lfd < 0) return 0 ; - if (coe(lfd) < 0) { e = errno ; goto lerr ; } - if ((lwhat > 1 ? lockex(lfd, blocking) : locksh(lfd, blocking)) < 0) { e = errno ; goto lerr ; } + if (coe(lfd) < 0) goto lerr ; + if ((lwhat > 1 ? lockex(lfd, blocking) : locksh(lfd, blocking)) < 0) goto lerr ; } if (cwhat) @@ -40,12 +39,12 @@ int s6rc_lock (char const *live, int lwhat, int *llfd, char const *compiled, int memcpy(cfn + clen, "/lock", 6) ; cfd = open_create(cfn) ; if (cfd < 0) - if (cwhat > 1 || errno != EROFS) { e = errno ; goto lerr ; } + if (cwhat > 1 || errno != EROFS) goto lerr ; else cfd = -errno ; else { - if (coe(cfd) < 0) { e = errno ; goto cerr ; } - if ((cwhat > 1 ? lockex(cfd, blocking) : locksh(cfd, blocking)) < 0) { e = errno ; goto cerr ; } + if (coe(cfd) < 0) goto cerr ; + if ((cwhat > 1 ? lockex(cfd, blocking) : locksh(cfd, blocking)) < 0) goto cerr ; } } @@ -57,6 +56,5 @@ int s6rc_lock (char const *live, int lwhat, int *llfd, char const *compiled, int fd_close(cfd) ; lerr: if (lwhat) fd_close(lfd) ; - errno = e ; return 0 ; } |