This patch from Sami Farin lets you specify --fsync if you want fsync()
to be called on every file we write.
---- options.c 6 May 2004 21:08:01 -0000 1.148
-+++ options.c 21 May 2004 08:59:11 -0000
-@@ -37,6 +37,7 @@ int make_backups = 0;
+--- orig/options.c 2005-01-17 23:11:45
++++ 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 in-place (SEE MAN PAGE)\n");
+ rprintf(F," -K, --keep-dirlinks treat symlinked dir on receiver as dir\n");
+@@ -350,6 +352,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 },
-@@ -944,6 +947,9 @@ void server_options(char **args,int *arg
+@@ -1208,6 +1211,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,
* and it may be an older version that doesn't know this
---- receiver.c 21 May 2004 08:27:04 -0000 1.79
-+++ receiver.c 21 May 2004 08:59:11 -0000
-@@ -47,6 +47,7 @@ extern int ignore_errors;
- extern int orig_umask;
- extern int keep_partial;
- extern int checksum_seed;
+--- orig/receiver.c 2005-01-17 23:11:45
++++ 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;
-
- static void delete_one(char *fn, int is_dir)
- {
-@@ -271,6 +272,12 @@ static int receive_data(int f_in,struct
+ extern char *tmpdir;
+ extern char *partial_dir;
+ extern char *basis_dir[];
+@@ -310,6 +311,12 @@ static int receive_data(int f_in, char *
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);
- read_buf(f_in,file_sum2,MD4_SUM_LENGTH);
---- util.c 21 May 2004 08:40:25 -0000 1.144
-+++ util.c 21 May 2004 08:59:11 -0000
-@@ -32,6 +32,7 @@ extern int dry_run;
- extern int module_id;
+ 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;
-@@ -297,6 +298,12 @@ int copy_file(char *source, char *dest,
+@@ -298,6 +299,12 @@ int copy_file(char *source, char *dest,
return -1;
}
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff