Fixed 2-line fuzz.

[rsync/rsync-patches.git] / remove-sent-files.diff

diff --git a/remove-sent-files.diff b/remove-sent-files.diff
index 471cb94..4c48179 100644 (file)
--- a/remove-sent-files.diff
+++ b/remove-sent-files.diff
@@ -4,7 +4,7 @@ command before "make":
     make proto
 
 
---- orig/io.c  2005-01-17 23:11:45
+--- orig/io.c  2005-01-19 20:11:10
 +++ io.c       2005-01-10 10:49:17
 @@ -244,6 +244,14 @@ static void read_msg_fd(void)
                read_loop(fd, buf, 4);
@@ -67,9 +67,9 @@ command before "make":
        if (argc == 0)
                list_only = 1;
  
---- orig/options.c     2005-01-17 23:11:45
+--- orig/options.c     2005-01-20 23:05:34
 +++ options.c  2005-01-10 10:46:47
-@@ -88,8 +88,10 @@ int daemon_bwlimit = 0;
+@@ -89,8 +89,10 @@ int daemon_bwlimit = 0;
  int bwlimit = 0;
  size_t bwlimit_writemax = 0;
  int delete_after = 0;
@@ -80,7 +80,7 @@ command before "make":
  int max_delete = 0;
  OFF_T max_size = 0;
  int ignore_errors = 0;
-@@ -273,6 +275,7 @@ void usage(enum logcode F)
+@@ -274,6 +276,7 @@ void usage(enum logcode F)
    rprintf(F,"     --delete                delete files that don't exist on the sending side\n");
    rprintf(F,"     --delete-excluded       also delete excluded files on the receiving side\n");
    rprintf(F,"     --delete-after          receiver deletes after transferring, not before\n");
@@ -88,7 +88,7 @@ command before "make":
    rprintf(F,"     --ignore-errors         delete even if there are I/O errors\n");
    rprintf(F,"     --max-delete=NUM        don't delete more than NUM files\n");
    rprintf(F,"     --max-size=SIZE         don't transfer any file larger than SIZE\n");
-@@ -341,6 +344,7 @@ static struct poptOption long_options[] 
+@@ -342,6 +345,7 @@ static struct poptOption long_options[] 
    {"ignore-existing",  0,  POPT_ARG_NONE,   &opt_ignore_existing, 0, 0, 0 },
    {"delete-after",     0,  POPT_ARG_NONE,   0, OPT_DELETE_AFTER, 0, 0 },
    {"delete-excluded",  0,  POPT_ARG_NONE,   0, OPT_DELETE_EXCLUDED, 0, 0 },
@@ -96,7 +96,7 @@ command before "make":
    {"force",            0,  POPT_ARG_NONE,   &force_delete, 0, 0, 0 },
    {"numeric-ids",      0,  POPT_ARG_NONE,   &numeric_ids, 0, 0, 0 },
    {"exclude",          0,  POPT_ARG_STRING, 0, OPT_EXCLUDE, 0, 0 },
-@@ -854,6 +858,9 @@ int parse_arguments(int *argc, const cha
+@@ -858,6 +862,9 @@ int parse_arguments(int *argc, const cha
        if (relative_paths < 0)
                relative_paths = files_from? 1 : 0;
  
@@ -106,9 +106,9 @@ command before "make":
        *argv = poptGetArgs(pc);
        *argc = count_args(*argv);
  
-@@ -1234,6 +1241,9 @@ void server_options(char **args,int *arg
-                       args[ac++] = "--no-relative";
-       }
+@@ -1241,6 +1248,9 @@ void server_options(char **args,int *arg
+       if (!implied_dirs && !am_sender)
+               args[ac++] = "--no-implied-dirs";
  
 +      if (delete_sent_files)
 +              args[ac++] = "--delete-sent-files";
@@ -116,7 +116,7 @@ command before "make":
        *argc = ac;
        return;
  
---- orig/receiver.c    2005-01-17 23:11:45
+--- orig/receiver.c    2005-01-21 00:35:26
 +++ receiver.c 2004-08-13 08:38:51
 @@ -47,6 +47,7 @@ extern char *backup_dir;
  extern char *backup_suffix;
@@ -126,7 +126,7 @@ command before "make":
  extern int module_id;
  extern int ignore_errors;
  extern int orig_umask;
-@@ -343,7 +344,7 @@ int recv_files(int f_in, struct file_lis
+@@ -322,7 +323,7 @@ int recv_files(int f_in, struct file_lis
        char *fname, fbuf[MAXPATHLEN];
        char template[MAXPATHLEN];
        char fnametmp[MAXPATHLEN];
@@ -135,7 +135,7 @@ command before "make":
        char fnamecmpbuf[MAXPATHLEN];
        struct file_struct *file;
        struct stats initial_stats;
-@@ -589,7 +590,12 @@ int recv_files(int f_in, struct file_lis
+@@ -568,7 +569,12 @@ int recv_files(int f_in, struct file_lis
  
                cleanup_disable();
  
@@ -149,7 +149,7 @@ command before "make":
                        int msgtype = csum_length == SUM_LENGTH || read_batch ?
                                FERROR : FINFO;
                        if (msgtype == FERROR || verbose) {
-@@ -613,9 +619,8 @@ int recv_files(int f_in, struct file_lis
+@@ -592,9 +598,8 @@ int recv_files(int f_in, struct file_lis
                                        keptstr, redostr);
                        }
                        if (csum_length != SUM_LENGTH) {
@@ -161,17 +161,17 @@ command before "make":
                        }
                }
        }
---- orig/rsync.h       2005-01-17 23:11:45
+--- orig/rsync.h       2005-01-21 00:35:26
 +++ rsync.h    2004-07-03 20:17:10
 @@ -60,6 +60,7 @@
- #define FLAG_TOP_DIR (1<<0)
+ #define FLAG_DEL_START (1<<0)
  #define FLAG_HLINK_EOL (1<<1) /* generator only */
  #define FLAG_MOUNT_POINT (1<<2)       /* sender only */
 +#define FLAG_SENT (1<<7)      /* sender only */
  
  /* update this if you make incompatible changes */
  #define PROTOCOL_VERSION 29
-@@ -137,6 +138,7 @@ enum logcode { FERROR=1, FINFO=2, FLOG=3
+@@ -142,6 +143,7 @@ enum logcode { FERROR=1, FINFO=2, FLOG=3
  /* Messages types that are sent over the message channel.  The logcode
   * values must all be present here with identical numbers. */
  enum msgcode {
@@ -179,7 +179,7 @@ command before "make":
        MSG_DONE=5,     /* current phase is done */
        MSG_REDO=4,     /* reprocess indicated flist index */
        MSG_ERROR=FERROR, MSG_INFO=FINFO, MSG_LOG=FLOG, /* remote logging */
---- orig/rsync.yo      2005-01-17 23:11:46
+--- orig/rsync.yo      2005-01-20 19:47:08
 +++ rsync.yo   2004-07-03 20:17:10
 @@ -343,6 +343,7 @@ verb(
       --delete                delete files that don't exist on sender