This patch from Sami Farin lets you specify --fsync if you want fsync()
to be called on every file we write.
---- options.c 7 Jun 2004 22:05:22 -0000 1.156
-+++ options.c 18 Jun 2004 17:26:45 -0000
-@@ -38,6 +38,7 @@ int make_backups = 0;
- **/
- int whole_file = -1;
-
-+int do_fsync = 0;
- int archive_mode = 0;
+--- old/options.c
++++ new/options.c
+@@ -42,6 +42,7 @@ int whole_file = -1;
+ int append_mode = 0;
int keep_dirlinks = 0;
int copy_links = 0;
-@@ -233,6 +234,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_perms = 0;
+@@ -327,6 +328,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," -K, --keep-dirlinks treat symlinked dir on receiver as dir\n");
- rprintf(F," -l, --links copy symlinks as symlinks\n");
-@@ -337,6 +339,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=TIME set I/O timeout in seconds\n");
+ rprintf(F," -I, --ignore-times don't skip files that match in size and mod-time\n");
+@@ -500,6 +502,7 @@ static struct poptOption long_options[]
+ {"only-write-batch", 0, POPT_ARG_STRING, &batch_name, OPT_ONLY_WRITE_BATCH, 0, 0 },
+ {"files-from", 0, POPT_ARG_STRING, &files_from, 0, 0, 0 },
+ {"from0", '0', POPT_ARG_NONE, &eol_nulls, 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 },
-@@ -968,6 +971,9 @@ void server_options(char **args,int *arg
+ {"numeric-ids", 0, POPT_ARG_NONE, &numeric_ids, 0, 0, 0 },
+ {"timeout", 0, POPT_ARG_INT, &io_timeout, 0, 0, 0 },
+ {"rsh", 'e', POPT_ARG_STRING, &shell_cmd, 0, 0, 0 },
+@@ -1698,6 +1701,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 14 Jun 2004 15:09:36 -0000 1.82
-+++ receiver.c 18 Jun 2004 17:26:45 -0000
-@@ -48,6 +48,7 @@ extern int ignore_errors;
- extern int orig_umask;
- extern int keep_partial;
- extern int checksum_seed;
+--- old/receiver.c
++++ new/receiver.c
+@@ -38,6 +38,7 @@ extern int keep_dirlinks;
+ extern int preserve_hard_links;
+ extern int preserve_perms;
+ extern int io_error;
+extern int do_fsync;
-
- static void delete_one(char *fn, int is_dir)
- {
-@@ -276,6 +277,12 @@ static int receive_data(int f_in,struct
+ extern int basis_dir_cnt;
+ extern int make_backups;
+ extern int cleanup_got_literal;
+@@ -256,6 +257,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 9 Jun 2004 21:51:07 -0000 1.149
-+++ util.c 18 Jun 2004 17:26:46 -0000
-@@ -32,6 +32,7 @@ extern int dry_run;
+ if (mapbuf)
+--- old/t_stub.c
++++ new/t_stub.c
+@@ -26,6 +26,7 @@
+ * functions, so that module test harnesses can run standalone.
+ **/
+
++int do_fsync = 0;
+ int modify_window = 0;
+ int module_id = -1;
+ int relative_paths = 0;
+--- old/util.c
++++ new/util.c
+@@ -30,6 +30,7 @@
+ extern int verbose;
+ extern int dry_run;
extern int module_id;
- extern int modify_window;
- 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,
+ extern int modify_window;
+ extern int relative_paths;
+ extern int human_readable;
+@@ -318,6 +319,12 @@ int copy_file(const char *source, const
return -1;
}
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff