Fixed failing hunks.

[rsync/rsync-patches.git] / fsync.diff

diff --git a/fsync.diff b/fsync.diff
index 7d7b6ee..103964f 100644 (file)
--- a/fsync.diff
+++ b/fsync.diff
@@ -1,9 +1,9 @@
 This patch from Sami Farin lets you specify --fsync if you want fsync()
 to be called on every file we write.
 
---- orig/options.c     2005-10-15 16:39:46
-+++ options.c  2005-08-27 21:21:34
-@@ -41,6 +41,7 @@ int whole_file = -1;
+--- 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;
@@ -11,15 +11,15 @@ to be called on every file we write.
  int preserve_links = 0;
  int preserve_hard_links = 0;
  int preserve_perms = 0;
-@@ -313,6 +314,7 @@ void usage(enum logcode F)
-   rprintf(F,"     --partial               keep partially transferred files\n");
+@@ -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,"     --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");
-@@ -471,6 +473,7 @@ static struct poptOption long_options[] 
+@@ -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},
@@ -27,7 +27,7 @@ to be called on every file we write.
    {"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 },
-@@ -1560,6 +1563,9 @@ void server_options(char **args,int *arg
+@@ -1698,6 +1701,9 @@ void server_options(char **args,int *arg
                args[ac++] = tmpdir;
        }
  
@@ -37,8 +37,8 @@ to be called on every file we write.
        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
---- orig/receiver.c    2005-09-16 05:41:02
-+++ receiver.c 2005-02-20 00:17:37
+--- old/receiver.c
++++ new/receiver.c
 @@ -38,6 +38,7 @@ extern int keep_dirlinks;
  extern int preserve_hard_links;
  extern int preserve_perms;
@@ -47,7 +47,7 @@ to be called on every file we write.
  extern int basis_dir_cnt;
  extern int make_backups;
  extern int cleanup_got_literal;
-@@ -319,6 +320,12 @@ static int receive_data(int f_in, char *
+@@ -256,6 +257,12 @@ static int receive_data(int f_in, char *
                exit_cleanup(RERR_FILEIO);
        }
  
@@ -60,27 +60,27 @@ to be called on every file we write.
        sum_end(file_sum1);
  
        if (mapbuf)
---- orig/t_stub.c      2005-10-16 22:38:39
-+++ t_stub.c   2005-10-18 08:16:12
-@@ -29,6 +29,7 @@
+--- 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;
-+int do_fsync;
- char *partial_dir;
- struct filter_list_struct server_filter_list;
- 
---- orig/util.c        2005-10-16 22:38:40
-+++ util.c     2005-10-18 08:17:00
-@@ -32,6 +32,7 @@ extern int dry_run;
+--- old/util.c
++++ new/util.c
+@@ -30,6 +30,7 @@
+ extern int verbose;
+ extern int dry_run;
  extern int module_id;
++extern int do_fsync;
  extern int modify_window;
  extern int relative_paths;
-+extern int do_fsync;
- extern char *partial_dir;
- extern struct filter_list_struct server_filter_list;
- 
-@@ -311,6 +312,12 @@ int copy_file(char *source, char *dest, 
+ extern int human_readable;
+@@ -318,6 +319,12 @@ int copy_file(const char *source, const 
                return -1;
        }