reuse openfile file descriptor for setting time (obviosly Win does not like writing from one handle and setting time by another)

Author: virco

gitcommit.h

@@ -1,8 +1,8 @@
 #ifndef _GITCOMMIT_H
 #define _GITCOMMIT_H
 
-#define GIT_PREV_COMMIT_ID "02ea1b5c3daeec50572b1de6cc7ed0b8ad402d2c"
-#define GIT_PREV_COMMIT_DATE "2016-12-12 15:16:21 +0200"
-#define GIT_COMMIT_DATE "2016-12-12 20:33:12 +0200"
+#define GIT_PREV_COMMIT_ID "cd1b259fc6415d7ba9078da20941d4da65a02bf6"
+#define GIT_PREV_COMMIT_DATE "2016-12-12 20:33:28 +0200"
+#define GIT_COMMIT_DATE "2016-12-19 16:02:18 +0200"
 
 #endif

pcompat.c

@@ -2827,6 +2827,71 @@ int psync_set_crtime_mtime(const char *path, time_t crtime, time_t mtime){
 #endif
 }
 
+int psync_set_crtime_mtime_by_fd(psync_file_t fd, const char *path, time_t crtime, time_t mtime){
+#if defined(P_OS_WINDOWS)
+  FILETIME fctime, fmtime, *pfctime, *pfmtime;
+  uint64_t tm64;
+  int ret;
+  if (crtime){
+    tm64=Int32x32To64(crtime, 10000000)+116444736000000000;
+    fctime.dwLowDateTime=(DWORD)tm64;
+    fctime.dwHighDateTime=tm64>>32;
+    pfctime=&fctime;
+  }
+  else
+    pfctime=NULL;
+  if (mtime){
+    tm64=Int32x32To64(mtime, 10000000)+116444736000000000;
+    fmtime.dwLowDateTime=(DWORD)tm64;
+    fmtime.dwHighDateTime=tm64>>32;
+    pfmtime=&fmtime;
+  }
+  else
+    pfmtime=NULL;
+  ret=psync_bool_to_zero(SetFileTime(fd, pfctime, NULL, pfmtime));
+  return ret;
+#elif defined(P_OS_MACOSX)
+  if (crtime){
+    struct attrlist attr;
+    struct timespec crtime;
+    memset(&attr, 0, sizeof(attr));
+    attr.bitmapcount=ATTR_BIT_MAP_COUNT;
+    attr.commonattr=ATTR_CMN_CRTIME;
+    crtime.tv_sec=ctime;
+    crtime.tv_nsec=0;
+    if (fsetattrlist(fd, &attr, &crtime, sizeof(struct timespec), FSOPT_NOFOLLOW))
+      return -1;
+  }
+  if (mtime){
+    struct timeval tm[2];
+    tm[0].tv_sec=mtime;
+    tm[0].tv_usec=0;
+    tm[1].tv_sec=mtime;
+    tm[1].tv_usec=0;
+    return futimes(fd, tm);
+  }
+  return 0;
+#elif defined(_BSD_SOURCE) || defined(P_OS_BSD)
+  if (mtime){
+    struct timeval tm[2];
+    tm[0].tv_sec=mtime;
+    tm[0].tv_usec=0;
+    tm[1].tv_sec=mtime;
+    tm[1].tv_usec=0;
+    if (unlikely(futimes(fd, tm))){
+      debug(D_NOTICE, "got errno %d while setting modification time of %s to %lu: %s", errno, path, (unsigned long)mtime, strerror(errno));
+      return -1;
+    }
+    else
+      return 0;
+  }
+  else
+    return 0;
+#else
+  return psync_set_crtime_mtime(path, crtime, mtime);
+#endif
+}
+
 typedef struct {
   uint64_t offset;
   size_t count;

pcompat.h

@@ -492,6 +492,7 @@ int psync_folder_sync(const char *path);
 psync_file_t psync_file_dup(psync_file_t fd);
 int psync_file_set_creation(psync_file_t fd, time_t ctime);
 int psync_set_crtime_mtime(const char *path, time_t crtime, time_t mtime);
+int psync_set_crtime_mtime_by_fd(psync_file_t fd, const char *path, time_t crtime, time_t mtime);
 int psync_file_preread(psync_file_t fd, uint64_t offset, size_t count);
 int psync_file_readahead(psync_file_t fd, uint64_t offset, size_t count);
 ssize_t psync_file_read(psync_file_t fd, void *buf, size_t count);

pfs.c

@@ -2758,17 +2758,42 @@ static int psync_fs_set_filetime_locked(psync_fsfileid_t fileid, const struct ti
   else{
     char fileidhex[sizeof(psync_fsfileid_t)*2+2], *filename;
     const char *cachepath;
+    psync_tree *tr;
+    psync_openfile_t *fl;
+    int64_t d;
     int ret;
+    tr=openfiles;
+    fl=NULL;
+    while (tr){
+      d=fileid-psync_tree_element(tr, psync_openfile_t, tree)->fileid;
+      if (d<0)
+        tr=tr->left;
+      else if (d>0)
+        tr=tr->right;
+      else{
+        fl=psync_tree_element(tr, psync_openfile_t, tree);
+        break;
+      }
+    }
     fileid=-fileid;
     psync_binhex(fileidhex, &fileid, sizeof(psync_fsfileid_t));
     fileidhex[sizeof(psync_fsfileid_t)]='d';
     fileidhex[sizeof(psync_fsfileid_t)+1]=0;
     cachepath=psync_setting_get_string(_PS(fscachepath));
     filename=psync_strcat(cachepath, PSYNC_DIRECTORY_SEPARATOR, fileidhex, NULL);
-    if (crtime)
-      ret=psync_set_crtime_mtime(filename, tv->tv_sec, 0);
-    else
-      ret=psync_set_crtime_mtime(filename, 0, tv->tv_sec);
+    if (fl && fl->datafile!=INVALID_HANDLE_VALUE){
+      debug(D_NOTICE, "found open file for file id %ld", (long)fl->fileid);
+      if (crtime)
+        ret=psync_set_crtime_mtime_by_fd(fl->datafile, filename, tv->tv_sec, 0);
+      else
+        ret=psync_set_crtime_mtime_by_fd(fl->datafile, filename, 0, tv->tv_sec);
+    }
+    else{
+      if (crtime)
+        ret=psync_set_crtime_mtime(filename, tv->tv_sec, 0);
+      else
+        ret=psync_set_crtime_mtime(filename, 0, tv->tv_sec);
+    }
     debug(D_NOTICE, "setting %s time of %s to %lu=%d", crtime?"creation":"modification", filename, (unsigned long)tv->tv_sec, ret);
     psync_free(filename);
     return ret?-EACCES:0;

pupload.c

@@ -225,8 +225,9 @@ static int task_createfolder(psync_syncid_t syncid, psync_folderid_t localfolder
     psync_sql_run_free(res);
     ret=psync_sql_commit_transaction();
     psync_diff_unlock();
+    if (psync_find_result(bres, "created", PARAM_BOOL)->num)
+      psync_diff_wake();
     psync_free(bres);
-    psync_diff_wake();
     return ret;
   }
 }