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

diff --git a/fsync.diff b/fsync.diff
index f48325d..f350bc3 100644
--- a/fsync.diff
+++ b/fsync.diff
@@ -1,85 +1,95 @@
 This patch from Sami Farin lets you specify --fsync if you want fsync()
 to be called on every file we write.
 
---- options.c	17 Apr 2004 17:07:23 -0000	1.147
-+++ options.c	27 Apr 2004 20:05:03 -0000
-@@ -37,6 +37,7 @@ int make_backups = 0;
+--- orig/options.c	2004-11-27 17:53:24
++++ options.c	2004-11-27 18:10:44
+@@ -38,6 +38,7 @@ int make_backups = 0;
   **/
  int whole_file = -1;
  
 +int do_fsync = 0;
  int archive_mode = 0;
+ int keep_dirlinks = 0;
  int copy_links = 0;
- int preserve_links = 0;
-@@ -230,6 +231,7 @@ void usage(enum logcode F)
+@@ -247,6 +248,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);
 +  rprintf(F,"     --fsync                 fsync every written file\n");
    rprintf(F," -u, --update                update only (don't overwrite newer files)\n");
-   rprintf(F," -l, --links                 copy symlinks as symlinks\n");
-   rprintf(F," -L, --copy-links            copy the referent of all symlinks\n");
-@@ -332,6 +334,7 @@ static struct poptOption long_options[] 
+   rprintf(F,"     --inplace               update destination files inplace (SEE MAN PAGE)\n");
+   rprintf(F," -K, --keep-dirlinks         treat symlinked dir on receiver as dir\n");
+@@ -349,6 +351,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 },
+   {"help",            'h', POPT_ARG_NONE,   0, 'h', 0, 0 },
    {"backup",          'b', POPT_ARG_NONE,   &make_backups, 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 },
-@@ -943,6 +946,9 @@ void server_options(char **args,int *arg
- 		args[ac++] = "--temp-dir";
+@@ -1213,6 +1216,9 @@ void server_options(char **args,int *arg
  		args[ac++] = tmpdir;
  	}
-+
+ 
 +	if (do_fsync && am_sender)
 +		args[ac++] = "--fsync";
- 
- 	if (compare_dest && am_sender) {
++
+ 	if (basis_dir[0] && am_sender) {
  		/* the server only needs this option if it is not the sender,
---- receiver.c	27 Apr 2004 19:51:33 -0000	1.76
-+++ receiver.c	27 Apr 2004 20:05:03 -0000
-@@ -45,6 +45,7 @@ extern int cleanup_got_literal;
- extern int module_id;
- extern int ignore_errors;
- extern int orig_umask;
+ 		 *   and it may be an older version that doesn't know this
+--- orig/receiver.c	2004-11-27 17:57:31
++++ receiver.c	2004-07-16 20:13:31
+@@ -37,6 +37,7 @@ extern int preserve_hard_links;
+ extern int preserve_perms;
+ extern int cvs_exclude;
+ extern int io_error;
 +extern int do_fsync;
+ extern char *tmpdir;
+ extern char *partial_dir;
+ extern char *basis_dir[];
+@@ -306,6 +307,12 @@ static int receive_data(int f_in, char *
+ 		exit_cleanup(RERR_FILEIO);
+ 	}
  
- static void delete_one(char *fn, int is_dir)
- {
-@@ -264,6 +265,12 @@ static int receive_data(int f_in,struct 
- 
- 	if (fd != -1 && offset > 0 && sparse_end(fd) != 0) {
- 		rprintf(FERROR, "write failed on %s: %s\n",
-+			full_fname(fname), strerror(errno));
++	if (do_fsync && fd != -1 && fsync(fd) != 0) {
++		rsyserr(FERROR, errno, "fsync failed on %s",
++			full_fname(fname));
 +		exit_cleanup(RERR_FILEIO);
 +	}
 +
-+	if (do_fsync && (fd != -1) && (fsync(fd) != 0)) {
-+		rprintf(FERROR, "fsync failed on %s: %s\n",
- 			full_fname(fname), strerror(errno));
- 		exit_cleanup(RERR_FILEIO);
- 	}
---- util.c	27 Apr 2004 19:59:37 -0000	1.141
-+++ util.c	27 Apr 2004 20:05:04 -0000
-@@ -29,6 +29,7 @@
+ 	sum_end(file_sum1);
  
- extern int verbose;
+ 	if (mapbuf)
+--- orig/t_stub.c	2004-07-29 16:08:04
++++ t_stub.c	2004-10-09 04:03:09
+@@ -28,6 +28,7 @@
+ 
+ int modify_window = 0;
+ int module_id = -1;
++int do_fsync;
+ char *partial_dir;
+ struct exclude_list_struct server_exclude_list;
+ 
+--- orig/util.c	2004-09-07 21:45:30
++++ 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;
  
  int sanitize_paths = 0;
  
-@@ -296,6 +297,12 @@ int copy_file(char *source, char *dest, 
+@@ -298,6 +299,12 @@ int copy_file(char *source, char *dest, 
+ 		return -1;
+ 	}
  
- 	if (close(ofd) < 0) {
- 		rprintf(FERROR, "close failed on %s: %s\n",
-+			full_fname(dest), strerror(errno));
++	if (do_fsync && fsync(ofd) < 0) {
++		rsyserr(FERROR, errno, "fsync failed on %s",
++			full_fname(dest));
 +		return -1;
 +	}
 +
-+	if (do_fsync && fsync(ofd) < 0) {
-+		rprintf(FERROR, "fsync failed on %s: %s\n",
- 			full_fname(dest), strerror(errno));
- 		return -1;
- 	}
+ 	return 0;
+ }
+