Got rid of fuzz.

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

diff --git a/remove-sent-files.diff b/remove-sent-files.diff
index 6a984c4..6508a58 100644 (file)
--- a/remove-sent-files.diff
+++ b/remove-sent-files.diff
@@ -4,7 +4,7 @@ command before "make":
     make proto
 
 
---- orig/io.c  2004-07-29 16:08:03
+--- orig/io.c  2004-08-02 02:44:26
 +++ io.c       2004-07-03 20:17:10
 @@ -240,6 +240,14 @@ static void read_msg_fd(void)
                read_loop(fd, buf, 4);
@@ -38,7 +38,7 @@ command before "make":
                case MSG_INFO:
                case MSG_ERROR:
                        if (remaining >= sizeof line) {
---- orig/main.c        2004-07-29 16:08:03
+--- orig/main.c        2004-07-31 16:41:04
 +++ main.c     2004-07-22 03:06:20
 @@ -42,6 +42,7 @@ extern int list_only;
  extern int local_server;
@@ -46,9 +46,9 @@ command before "make":
  extern int module_id;
 +extern int need_messages_from_generator;
  extern int orig_umask;
+ extern int copy_links;
  extern int keep_dirlinks;
- extern int preserve_hard_links;
-@@ -612,6 +613,8 @@ void start_server(int f_in, int f_out, i
+@@ -617,6 +618,8 @@ void start_server(int f_in, int f_out, i
  
        if (am_sender) {
                keep_dirlinks = 0; /* Must be disabled on the sender. */
@@ -57,7 +57,7 @@ command before "make":
  
                recv_exclude_list(f_in);
                if (cvs_exclude)
-@@ -683,6 +686,9 @@ int client_run(int f_in, int f_out, pid_
+@@ -688,6 +691,9 @@ int client_run(int f_in, int f_out, pid_
                exit_cleanup(status);
        }
  
@@ -67,9 +67,9 @@ command before "make":
        if (argc == 0)
                list_only = 1;
  
---- orig/options.c     2004-07-29 16:08:03
+--- orig/options.c     2004-08-03 15:41:32
 +++ options.c  2004-07-16 20:09:54
-@@ -87,8 +87,10 @@ int size_only = 0;
+@@ -88,8 +88,10 @@ int size_only = 0;
  int bwlimit = 0;
  size_t bwlimit_writemax = 0;
  int delete_after = 0;
@@ -80,7 +80,7 @@ command before "make":
  int max_delete = 0;
  int ignore_errors = 0;
  int modify_window = 0;
-@@ -266,6 +268,7 @@ void usage(enum logcode F)
+@@ -267,6 +269,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,"     --partial               keep partially transferred files\n");
-@@ -317,8 +320,8 @@ void usage(enum logcode F)
+@@ -318,8 +321,8 @@ void usage(enum logcode F)
  }
  
  enum {OPT_VERSION = 1000, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
@@ -99,7 +99,7 @@ command before "make":
        OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_TIMEOUT,
        OPT_REFUSED_BASE = 9000};
  
-@@ -337,6 +340,7 @@ static struct poptOption long_options[] 
+@@ -338,6 +341,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 },
@@ -107,7 +107,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 },
-@@ -524,6 +528,11 @@ int parse_arguments(int *argc, const cha
+@@ -537,6 +541,11 @@ int parse_arguments(int *argc, const cha
                        delete_mode = 1;
                        break;
  
@@ -119,7 +119,7 @@ command before "make":
                case OPT_EXCLUDE:
                        if (am_server || sanitize_paths)
                                return 0; /* Impossible... */
-@@ -1042,6 +1051,9 @@ void server_options(char **args,int *arg
+@@ -1088,6 +1097,9 @@ void server_options(char **args,int *arg
                }
        }
  
@@ -129,9 +129,9 @@ command before "make":
        *argc = ac;
        return;
  
---- orig/receiver.c    2004-07-29 16:08:03
+--- orig/receiver.c    2004-08-03 15:34:32
 +++ receiver.c 2004-07-29 16:11:11
-@@ -46,6 +46,7 @@ extern char *backup_dir;
+@@ -45,6 +45,7 @@ extern char *backup_dir;
  extern char *backup_suffix;
  extern int backup_suffix_len;
  extern int cleanup_got_literal;
@@ -148,7 +148,7 @@ command before "make":
        char fnamecmpbuf[MAXPATHLEN];
        struct file_struct *file;
        struct stats initial_stats;
-@@ -576,7 +577,12 @@ int recv_files(int f_in, struct file_lis
+@@ -571,7 +572,12 @@ int recv_files(int f_in, struct file_lis
  
                cleanup_disable();
  
@@ -162,7 +162,7 @@ command before "make":
                        int msgtype = csum_length == SUM_LENGTH || read_batch ?
                                FERROR : FINFO;
                        if (msgtype == FERROR || verbose) {
-@@ -600,9 +606,8 @@ int recv_files(int f_in, struct file_lis
+@@ -595,9 +601,8 @@ int recv_files(int f_in, struct file_lis
                                        keptstr, redostr);
                        }
                        if (csum_length != SUM_LENGTH) {
@@ -174,7 +174,7 @@ command before "make":
                        }
                }
        }
---- orig/rsync.h       2004-07-29 16:08:03
+--- orig/rsync.h       2004-08-03 15:41:32
 +++ rsync.h    2004-07-03 20:17:10
 @@ -60,6 +60,7 @@
  #define FLAG_TOP_DIR (1<<0)
@@ -192,7 +192,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      2004-07-29 16:08:04
+--- orig/rsync.yo      2004-08-03 15:34:32
 +++ rsync.yo   2004-07-03 20:17:10
 @@ -314,6 +314,7 @@ verb(
       --delete                delete files that don't exist on sender
@@ -202,7 +202,7 @@ command before "make":
       --ignore-errors         delete even if there are I/O errors
       --max-delete=NUM        don't delete more than NUM files
       --partial               keep partially transferred files
-@@ -619,6 +620,11 @@ receiving side before transferring files
+@@ -625,6 +626,11 @@ receiving side before transferring files
  sufficient space on the receiving filesystem. If you want to delete
  after transferring, use the --delete-after switch. Implies --delete.
  
@@ -214,7 +214,7 @@ command before "make":
  dit(bf(--ignore-errors)) Tells --delete to go ahead and delete files
  even when there are I/O errors.
  
---- orig/sender.c      2004-07-26 16:27:00
+--- orig/sender.c      2004-08-03 15:34:32
 +++ sender.c   2004-07-26 16:49:19
 @@ -26,6 +26,7 @@ extern int io_error;
  extern int dry_run;
@@ -263,7 +263,7 @@ command before "make":
        while (1) {
                unsigned int offset;
  
-@@ -248,6 +273,9 @@ void send_files(struct file_list *flist,
+@@ -252,6 +277,9 @@ void send_files(struct file_list *flist,
                        rprintf(FINFO, "sender finished %s\n",
                                safe_fname(fname));
                }