1 This patch from Sami Farin lets you specify --fsync if you want fsync()
2 to be called on every file we write.
4 --- orig/options.c 2004-06-20 19:30:00
5 +++ options.c 2004-07-03 20:18:13
6 @@ -38,6 +38,7 @@ int make_backups = 0;
12 int keep_dirlinks = 0;
14 @@ -233,6 +234,7 @@ void usage(enum logcode F)
15 rprintf(F," -b, --backup make backups (see --suffix & --backup-dir)\n");
16 rprintf(F," --backup-dir make backups into this directory\n");
17 rprintf(F," --suffix=SUFFIX backup suffix (default %s w/o --backup-dir)\n",BACKUP_SUFFIX);
18 + rprintf(F," --fsync fsync every written file\n");
19 rprintf(F," -u, --update update only (don't overwrite newer files)\n");
20 rprintf(F," -K, --keep-dirlinks treat symlinked dir on receiver as dir\n");
21 rprintf(F," -l, --links copy symlinks as symlinks\n");
22 @@ -337,6 +339,7 @@ static struct poptOption long_options[]
23 {"safe-links", 0, POPT_ARG_NONE, &safe_symlinks, 0, 0, 0 },
24 {"help", 'h', POPT_ARG_NONE, 0, 'h', 0, 0 },
25 {"backup", 'b', POPT_ARG_NONE, &make_backups, 0, 0, 0 },
26 + {"fsync", 0, POPT_ARG_NONE, &do_fsync, 0, 0, 0 },
27 {"dry-run", 'n', POPT_ARG_NONE, &dry_run, 0, 0, 0 },
28 {"sparse", 'S', POPT_ARG_NONE, &sparse_files, 0, 0, 0 },
29 {"cvs-exclude", 'C', POPT_ARG_NONE, &cvs_exclude, 0, 0, 0 },
30 @@ -968,6 +971,9 @@ void server_options(char **args,int *arg
34 + if (do_fsync && am_sender)
35 + args[ac++] = "--fsync";
37 if (compare_dest && am_sender) {
38 /* the server only needs this option if it is not the sender,
39 * and it may be an older version that doesn't know this
40 --- orig/receiver.c 2004-07-02 18:23:01
41 +++ receiver.c 2004-07-03 20:18:13
42 @@ -48,6 +48,7 @@ extern int ignore_errors;
43 extern int orig_umask;
44 extern int keep_partial;
45 extern int checksum_seed;
48 static void delete_one(char *fn, int is_dir)
50 @@ -274,6 +275,12 @@ static int receive_data(int f_in,struct
51 exit_cleanup(RERR_FILEIO);
54 + if (do_fsync && (fd != -1) && (fsync(fd) != 0)) {
55 + rsyserr(FERROR, errno, "fsync failed on %s",
57 + exit_cleanup(RERR_FILEIO);
62 read_buf(f_in,file_sum2,MD4_SUM_LENGTH);
63 --- orig/util.c 2004-06-09 21:54:47
64 +++ util.c 2004-07-03 20:18:13
65 @@ -32,6 +32,7 @@ extern int dry_run;
67 extern int modify_window;
68 extern struct exclude_list_struct server_exclude_list;
71 int sanitize_paths = 0;
73 @@ -297,6 +298,12 @@ int copy_file(char *source, char *dest,
77 + if (do_fsync && fsync(ofd) < 0) {
78 + rsyserr(FERROR, errno, "fsync failed on %s",