Fixed some patch fuzz.

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

diff --git a/fsync.diff b/fsync.diff
index ec5f269..f6674ab 100644 (file)
--- a/fsync.diff
+++ b/fsync.diff
@@ -1,17 +1,17 @@
 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-03-16 02:19:30.152741841
-+++ options.c  2005-01-28 19:30:47
-@@ -39,6 +39,7 @@ int make_backups = 0;
-  **/
- int whole_file = -1;
- 
-+int do_fsync = 0;
- int archive_mode = 0;
+--- orig/options.c     2005-08-27 21:11:26
++++ options.c  2005-08-27 21:21:34
+@@ -41,6 +41,7 @@ int whole_file = -1;
+ int append_mode = 0;
  int keep_dirlinks = 0;
  int copy_links = 0;
-@@ -310,6 +311,7 @@ void usage(enum logcode F)
++int do_fsync = 0;
+ int preserve_links = 0;
+ int preserve_hard_links = 0;
+ int preserve_perms = 0;
+@@ -312,6 +313,7 @@ void usage(enum logcode F)
    rprintf(F,"     --partial               keep partially transferred files\n");
    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");
@@ -19,15 +19,15 @@ to be called on every file we write.
    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");
-@@ -391,6 +393,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 },
+@@ -467,6 +469,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 },
-@@ -1431,6 +1434,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 },
+@@ -1495,6 +1498,9 @@ void server_options(char **args,int *arg
                args[ac++] = tmpdir;
        }
  
@@ -37,9 +37,9 @@ 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-03-16 02:19:30.248733487
+--- orig/receiver.c    2005-08-17 06:45:08
 +++ receiver.c 2005-02-20 00:17:37
-@@ -37,6 +37,7 @@ extern int keep_dirlinks;
+@@ -38,6 +38,7 @@ extern int keep_dirlinks;
  extern int preserve_hard_links;
  extern int preserve_perms;
  extern int io_error;
@@ -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;
-@@ -289,6 +290,12 @@ static int receive_data(int f_in, char *
+@@ -318,6 +319,12 @@ static int receive_data(int f_in, char *
                exit_cleanup(RERR_FILEIO);
        }
  
@@ -70,7 +70,7 @@ to be called on every file we write.
  char *partial_dir;
  struct filter_list_struct server_filter_list;
  
---- orig/util.c        2005-03-11 17:36:35
+--- orig/util.c        2005-08-17 06:45:08
 +++ util.c     2004-07-03 20:18:13
 @@ -33,6 +33,7 @@ extern int module_id;
  extern int modify_window;
@@ -80,7 +80,7 @@ to be called on every file we write.
  
  int sanitize_paths = 0;
  
-@@ -299,6 +300,12 @@ int copy_file(char *source, char *dest, 
+@@ -310,6 +311,12 @@ int copy_file(char *source, char *dest, 
                return -1;
        }