summaryrefslogtreecommitdiff
path: root/src/daemontools-extras
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2017-07-16 15:57:07 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2017-07-16 15:57:07 +0000
commitc84b8ade3f2d1349a6e4b68b1bd497b0909cfcda (patch)
treef6a3a51e47e613a0271e0296b0a80fb04816d818 /src/daemontools-extras
parentd945bca329f7a13741e1d3afcf9f0f73f6c70ce9 (diff)
downloads6-c84b8ade3f2d1349a6e4b68b1bd497b0909cfcda.tar.xz
Propagate fd_close() changes, fix deps for ftrigr_updateb()
Diffstat (limited to 'src/daemontools-extras')
-rw-r--r--src/daemontools-extras/s6-log.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/src/daemontools-extras/s6-log.c b/src/daemontools-extras/s6-log.c
index c57e6d7..4a138fe 100644
--- a/src/daemontools-extras/s6-log.c
+++ b/src/daemontools-extras/s6-log.c
@@ -369,17 +369,13 @@ static int rotator (logdir_t *ldp)
}
if (coe(fd) < 0)
{
- int e = errno ;
fd_close(fd) ;
- errno = e ;
if (verbosity) strerr_warnwu2sys("coe ", x) ;
goto fail ;
}
if (fd_chmod(fd, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH) < 0)
{
- int e = errno ;
fd_close(fd) ;
- errno = e ;
if (verbosity) strerr_warnwu3sys("fchmod ", x, " to 0644") ;
goto fail ;
}
@@ -441,18 +437,14 @@ static int rotator (logdir_t *ldp)
}
if (fd_sync(fd) < 0)
{
- int e = errno ;
fd_close(fd) ;
- errno = e ;
if (verbosity) strerr_warnwu2sys("fd_sync ", x) ;
goto fail ;
}
tain_now_g() ;
if (fd_chmod(fd, S_IRWXU | S_IRGRP | S_IROTH) < 0)
{
- int e = errno ;
fd_close(fd) ;
- errno = e ;
if (verbosity) strerr_warnwu3sys("fd_chmod ", x, " to 0744") ;
goto fail ;
}