X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/f635ed27f83ebab4537882eeb80f202deccc6a60..0ef5abcbbb95298fa9faf1d3eb275a9e76e1d951:/fsync.diff

diff --git a/fsync.diff b/fsync.diff
index 7b09b62..1cfee20 100644
--- a/fsync.diff
+++ b/fsync.diff
@@ -1,85 +1,106 @@
 This patch from Sami Farin lets you specify --fsync if you want fsync()
 to be called on every file we write.
 
---- orig/options.c	2004-08-11 23:42:23
-+++ options.c	2004-07-03 20:18:13
-@@ -38,6 +38,7 @@ int make_backups = 0;
-  **/
- int whole_file = -1;
- 
-+int do_fsync = 0;
- int archive_mode = 0;
+To use this patch, run these commands for a successful build:
+
+    patch -p1 <patches/fsync.diff
+    ./configure                         (optional if already run)
+    make
+
+diff --git a/options.c b/options.c
+--- a/options.c
++++ b/options.c
+@@ -48,6 +48,7 @@ int append_mode = 0;
  int keep_dirlinks = 0;
+ int copy_dirlinks = 0;
  int copy_links = 0;
-@@ -240,6 +241,7 @@ void usage(enum logcode F)
-   rprintf(F," -b, --backup                make backups (see --suffix & --backup-dir)\n");
-   rprintf(F,"     --backup-dir            make backups into this directory\n");
-   rprintf(F,"     --suffix=SUFFIX         backup suffix (default %s w/o --backup-dir)\n",BACKUP_SUFFIX);
++int do_fsync = 0;
+ int preserve_links = 0;
+ int preserve_hard_links = 0;
+ int preserve_acls = 0;
+@@ -384,6 +385,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");
 +  rprintf(F,"     --fsync                 fsync every written file\n");
-   rprintf(F," -u, --update                update only (don't overwrite newer files)\n");
-   rprintf(F,"     --inplace               update destination files inplace (SEE MAN PAGE)\n");
-   rprintf(F," -K, --keep-dirlinks         treat symlinked dir on receiver as dir\n");
-@@ -346,6 +348,7 @@ static struct poptOption long_options[] 
-   {"safe-links",       0,  POPT_ARG_NONE,   &safe_symlinks, 0, 0, 0 },
-   {"help",            'h', POPT_ARG_NONE,   0,              'h', 0, 0 },
-   {"backup",          'b', POPT_ARG_NONE,   &make_backups, 0, 0, 0 },
+   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");
+@@ -627,6 +629,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 },
-   {"dry-run",         'n', POPT_ARG_NONE,   &dry_run, 0, 0, 0 },
-   {"sparse",          'S', POPT_ARG_NONE,   &sparse_files, 0, 0, 0 },
-   {"cvs-exclude",     'C', POPT_ARG_NONE,   &cvs_exclude, 0, 0, 0 },
-@@ -1069,6 +1072,9 @@ void server_options(char **args,int *arg
- 		args[ac++] = tmpdir;
- 	}
+   {"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 },
+@@ -2019,6 +2022,9 @@ void server_options(char **args, int *argc_p)
+ 			args[ac++] = tmpdir;
+ 		}
  
-+	if (do_fsync && am_sender)
-+		args[ac++] = "--fsync";
++		if (do_fsync)
++			args[ac++] = "--fsync";
 +
- 	if (compare_dest && am_sender) {
- 		/* the server only needs this option if it is not the sender,
- 		 *   and it may be an older version that doesn't know this
---- orig/receiver.c	2004-08-03 15:34:32
-+++ receiver.c	2004-07-16 20:13:31
-@@ -36,6 +36,7 @@ extern int preserve_hard_links;
+ 		if (basis_dir[0]) {
+ 			/* the server only needs this option if it is not the sender,
+ 			 *   and it may be an older version that doesn't know this
+diff --git a/receiver.c b/receiver.c
+--- a/receiver.c
++++ b/receiver.c
+@@ -39,6 +39,7 @@ extern int relative_paths;
+ extern int preserve_hard_links;
  extern int preserve_perms;
- extern int cvs_exclude;
- extern int io_error;
+ extern int preserve_xattrs;
 +extern int do_fsync;
- extern char *tmpdir;
- extern char *partial_dir;
- extern char *compare_dest;
-@@ -309,6 +310,12 @@ static int receive_data(int f_in, char *
+ extern int basis_dir_cnt;
+ extern int make_backups;
+ extern int cleanup_got_literal;
+@@ -302,6 +303,12 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
  		exit_cleanup(RERR_FILEIO);
  	}
  
-+	if (do_fsync && (fd != -1) && (fsync(fd) != 0)) {
++	if (do_fsync && fd != -1 && fsync(fd) != 0) {
 +		rsyserr(FERROR, errno, "fsync failed on %s",
 +			full_fname(fname));
 +		exit_cleanup(RERR_FILEIO);
 +	}
 +
- 	sum_end(file_sum1);
+ 	sum_len = sum_end(file_sum1);
  
  	if (mapbuf)
---- orig/util.c	2004-08-11 23:42:23
-+++ util.c	2004-07-03 20:18:13
-@@ -33,6 +33,7 @@ extern int module_id;
- extern int modify_window;
- extern char *partial_dir;
- extern struct exclude_list_struct server_exclude_list;
-+extern int do_fsync;
+diff --git a/t_stub.c b/t_stub.c
+--- a/t_stub.c
++++ b/t_stub.c
+@@ -21,6 +21,7 @@
  
- int sanitize_paths = 0;
+ #include "rsync.h"
  
-@@ -298,6 +299,12 @@ int copy_file(char *source, char *dest, 
- 		return -1;
++int do_fsync = 0;
+ int modify_window = 0;
+ int module_id = -1;
+ int relative_paths = 0;
+diff --git a/util.c b/util.c
+--- a/util.c
++++ b/util.c
+@@ -26,6 +26,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;
+@@ -334,6 +335,13 @@ int copy_file(const char *source, const char *dest, int ofd,
+ 			full_fname(source));
  	}
  
 +	if (do_fsync && fsync(ofd) < 0) {
 +		rsyserr(FERROR, errno, "fsync failed on %s",
 +			full_fname(dest));
++		close(ofd);
 +		return -1;
 +	}
 +
- 	return 0;
- }
- 
+ 	if (close(ofd) < 0) {
+ 		int save_errno = errno;
+ 		rsyserr(FERROR_XFER, errno, "close failed on %s",