./configure (optional if already run)
make
---- old/options.c
-+++ new/options.c
-@@ -45,6 +45,7 @@ int append_mode = 0;
+based-on: a01e3b490eb36ccf9e704840e1b6683dab867550
+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;
+int do_fsync = 0;
int preserve_links = 0;
int preserve_hard_links = 0;
- int preserve_perms = 0;
-@@ -336,6 +337,7 @@ void usage(enum logcode F)
+ int preserve_acls = 0;
+@@ -731,6 +732,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," --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");
-@@ -523,6 +525,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},
+ rprintf(F," --usermap=STRING custom username mapping\n");
+ rprintf(F," --groupmap=STRING custom groupname mapping\n");
+@@ -989,6 +991,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 },
- {"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 },
-@@ -1743,6 +1746,9 @@ void server_options(char **args,int *arg
- args[ac++] = tmpdir;
- }
+ {"rsync-path", 0, POPT_ARG_STRING, &rsync_path, 0, 0, 0 },
+ {"temp-dir", 'T', POPT_ARG_STRING, &tmpdir, 0, 0, 0 },
+@@ -2607,6 +2610,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 (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
---- old/receiver.c
-+++ new/receiver.c
-@@ -38,6 +38,7 @@ extern int protocol_version;
- extern int relative_paths;
+ 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
+@@ -38,6 +38,7 @@ extern int relative_paths;
extern int preserve_hard_links;
extern int preserve_perms;
+ extern int preserve_xattrs;
+extern int do_fsync;
extern int basis_dir_cnt;
extern int make_backups;
extern int cleanup_got_literal;
-@@ -258,6 +259,12 @@ static int receive_data(int f_in, char *
- exit_cleanup(RERR_FILEIO);
- }
+@@ -337,6 +338,12 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
+ if (sum_end(file_sum1) != checksum_len)
+ overflow_exit("checksum_len"); /* Impossible... */
+ if (do_fsync && fd != -1 && fsync(fd) != 0) {
+ rsyserr(FERROR, errno, "fsync failed on %s",
+ exit_cleanup(RERR_FILEIO);
+ }
+
- sum_end(file_sum1);
-
if (mapbuf)
---- old/t_stub.c
-+++ new/t_stub.c
-@@ -22,6 +22,7 @@
+ unmap_file(mapbuf);
+
+diff --git a/t_stub.c b/t_stub.c
+--- a/t_stub.c
++++ b/t_stub.c
+@@ -21,6 +21,7 @@
#include "rsync.h"
int modify_window = 0;
int module_id = -1;
int relative_paths = 0;
---- old/util.c
-+++ new/util.c
-@@ -26,6 +26,7 @@
- extern int verbose;
+diff --git a/util.c b/util.c
+--- a/util.c
++++ b/util.c
+@@ -27,6 +27,7 @@
+
extern int dry_run;
extern int module_id;
+extern int do_fsync;
extern int modify_window;
extern int relative_paths;
- extern int human_readable;
-@@ -316,6 +317,12 @@ int copy_file(const char *source, const
- return -1;
+ extern int preserve_xattrs;
+@@ -382,6 +383,13 @@ int copy_file(const char *source, const char *dest, int ofd, mode_t mode)
+ 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",
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff