[sync]

Author: Marc Lehmann

cvs-vers

@@ -1,4 +1,4 @@
-Changes:1.65
+Changes:1.67
 LICENSE:1.1
 Makefile.am:1.4
 aclocal.m4:1.3
@@ -7,9 +7,9 @@ configure.ac:1.11
 demo.c:1.4
 ecb.h:1.28
 eio.3:1.1
-eio.c:1.157
+eio.c:1.158
 eio.h:1.63
 eio.pod:1.36
 etp.c:1.14
-libeio.m4:1.32
+libeio.m4:1.33
 xthread.h:1.19

src/Changes

@@ -93,5 +93,8 @@ TODO: pthread_condattr_setclock(..., CLOCK_MONOTONIC) and clock_gettime(CLOCK_MO
  - use O_NONBLOCK when opening directories and in truncateat and statvfsat.
  - add EIO_MCL_ONFAULT.
  - add eio_mlockall_sync.
+ - fix configure tests for readahead and sync_file_range, they were based on the
+ manpages, which turned out to be wrong.
+ - protect wd_open against fd being 0, which is used for the value of EIO_CWD.
 
 

src/eio.c

@@ -1,7 +1,7 @@
 /*
  * libeio implementation
  *
- * Copyright (c) 2007,2008,2009,2010,2011,2012,2013,2016,2017,2018 Marc Alexander Lehmann <libeio@schmorp.de>
+ * Copyright (c) 2007,2008,2009,2010,2011,2012,2013,2016,2017,2018,2019 Marc Alexander Lehmann <libeio@schmorp.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modifica-
@@ -1681,6 +1681,20 @@ eio__wd_open_sync (struct etp_tmpbuf *tmpbuf, eio_wd wd, const char *path)
 #if HAVE_AT
  fd = openat (WD2FD (wd), path, O_CLOEXEC | O_SEARCH | O_DIRECTORY | O_NONBLOCK);
 
+ /* 0 is a valid fd, but we use it for EIO_CWD, so in the very unlikely */
+ /* case of fd 0 being available (almost certainly an a pplication bug) */
+ /* make sure we use another fd value */
+ #if EIO_CWD
+ error EIO_CWD must be 0
+ #endif
+ if (ecb_expect_false (fd == 0))
+ {
+ int fd2 = fcntl (fd, F_DUPFD_CLOEXEC ? F_DUPFD_CLOEXEC : F_DUPFD);
+ fcntl (fd2, F_SETFD, FD_CLOEXEC);
+ eio__close (fd);
+ fd = fd2;
+ }
+
  if (fd < 0)
  return EIO_INVALID_WD;
 #endif

src/libeio.m4

@@ -39,6 +39,7 @@ int main (void)
 test $ac_cv_futimes = yes && AC_DEFINE(HAVE_FUTIMES, 1, futimes(2) is available)
 
 AC_CACHE_CHECK(for readahead, ac_cv_readahead, [AC_LINK_IFELSE([AC_LANG_SOURCE([
+#include <sys/types.h>
 #include <fcntl.h>
 int main (void)
 {
@@ -93,6 +94,7 @@ int main (void)
 test $ac_cv_sendfile = yes && AC_DEFINE(HAVE_SENDFILE, 1, sendfile(2) is available and supported)
 
 AC_CACHE_CHECK(for sync_file_range, ac_cv_sync_file_range, [AC_LINK_IFELSE([AC_LANG_SOURCE([
+#include <sys/types.h>
 #include <fcntl.h>
 int main (void)
 {