The patches for 3.0.9.

[rsync.git/patches.git] / fsync.diff

diff --git a/fsync.diff b/fsync.diff
index a1892550ec35a4456846e0e5080c58763d3777d2..1e2a07667ec17b386233b12e28e5b9e73b4cb0a7 100644 (file)
--- a/fsync.diff
+++ b/fsync.diff
@@ -7,10 +7,11 @@ To use this patch, run these commands for a successful build:
     ./configure                         (optional if already run)
     make
 
+based-on: 40afd365cc8ca968fd16e161d24df5b8a8a520cc
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c
-@@ -46,6 +46,7 @@ int append_mode = 0;
+@@ -48,6 +48,7 @@ int append_mode = 0;
  int keep_dirlinks = 0;
  int copy_dirlinks = 0;
  int copy_links = 0;
@@ -18,7 +19,7 @@ diff --git a/options.c b/options.c
  int preserve_links = 0;
  int preserve_hard_links = 0;
  int preserve_acls = 0;
-@@ -377,6 +378,7 @@ void usage(enum logcode F)
+@@ -382,6 +383,7 @@ void usage(enum logcode F)
    rprintf(F,"     --partial-dir=DIR       put a partially transferred file into DIR\n");
    rprintf(F,"     --delay-updates         put all updated files into place at transfer's end\n");
    rprintf(F," -m, --prune-empty-dirs      prune empty directory chains from the file-list\n");
@@ -26,15 +27,15 @@ diff --git a/options.c b/options.c
    rprintf(F,"     --numeric-ids           don't map uid/gid values by user/group name\n");
    rprintf(F,"     --timeout=SECONDS       set I/O timeout in seconds\n");
    rprintf(F,"     --contimeout=SECONDS    set daemon connection timeout in seconds\n");
-@@ -606,6 +608,7 @@ static struct poptOption long_options[] = {
-   {"timeout",          0,  POPT_ARG_INT,    &io_timeout, 0, 0, 0 },
+@@ -625,6 +627,7 @@ static struct poptOption long_options[] = {
    {"no-timeout",       0,  POPT_ARG_VAL,    &io_timeout, 0, 0, 0 },
    {"contimeout",       0,  POPT_ARG_INT,    &connect_timeout, 0, 0, 0 },
+   {"no-contimeout",    0,  POPT_ARG_VAL,    &connect_timeout, 0, 0, 0 },
 +  {"fsync",            0,  POPT_ARG_NONE,   &do_fsync, 0, 0, 0 },
    {"rsh",             'e', POPT_ARG_STRING, &shell_cmd, 0, 0, 0 },
    {"rsync-path",       0,  POPT_ARG_STRING, &rsync_path, 0, 0, 0 },
    {"temp-dir",        'T', POPT_ARG_STRING, &tmpdir, 0, 0, 0 },
-@@ -1946,6 +1949,9 @@ void server_options(char **args, int *argc_p)
+@@ -2030,6 +2033,9 @@ void server_options(char **args, int *argc_p)
                        args[ac++] = tmpdir;
                }
  
@@ -47,7 +48,7 @@ diff --git a/options.c b/options.c
 diff --git a/receiver.c b/receiver.c
 --- a/receiver.c
 +++ b/receiver.c
-@@ -39,6 +39,7 @@ extern int relative_paths;
+@@ -40,6 +40,7 @@ extern int relative_paths;
  extern int preserve_hard_links;
  extern int preserve_perms;
  extern int preserve_xattrs;
@@ -55,7 +56,7 @@ diff --git a/receiver.c b/receiver.c
  extern int basis_dir_cnt;
  extern int make_backups;
  extern int cleanup_got_literal;
-@@ -298,6 +299,12 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
+@@ -322,6 +323,12 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
                exit_cleanup(RERR_FILEIO);
        }
  
@@ -82,15 +83,15 @@ diff --git a/t_stub.c b/t_stub.c
 diff --git a/util.c b/util.c
 --- a/util.c
 +++ b/util.c
-@@ -26,6 +26,7 @@
+@@ -25,6 +25,7 @@
+ 
  extern int verbose;
- extern int dry_run;
  extern int module_id;
 +extern int do_fsync;
  extern int modify_window;
  extern int relative_paths;
- extern int human_readable;
-@@ -314,6 +315,13 @@ int copy_file(const char *source, const char *dest, int ofd,
+ extern int preserve_times;
+@@ -344,6 +345,13 @@ int copy_file(const char *source, const char *dest, int ofd,
                        full_fname(source));
        }
  
@@ -102,5 +103,5 @@ diff --git a/util.c b/util.c
 +      }
 +
        if (close(ofd) < 0) {
+               int save_errno = errno;
                rsyserr(FERROR_XFER, errno, "close failed on %s",
-                       full_fname(dest));