Updated to apply cleanly.

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

diff --git a/remove-sent-files.diff b/remove-sent-files.diff
index 6508a58..b2ec241 100644 (file)
--- a/remove-sent-files.diff
+++ b/remove-sent-files.diff
@@ -38,7 +38,7 @@ command before "make":
                case MSG_INFO:
                case MSG_ERROR:
                        if (remaining >= sizeof line) {
---- orig/main.c        2004-07-31 16:41:04
+--- orig/main.c        2004-08-05 18:24:21
 +++ main.c     2004-07-22 03:06:20
 @@ -42,6 +42,7 @@ extern int list_only;
  extern int local_server;
@@ -48,7 +48,7 @@ command before "make":
  extern int orig_umask;
  extern int copy_links;
  extern int keep_dirlinks;
-@@ -617,6 +618,8 @@ void start_server(int f_in, int f_out, i
+@@ -621,6 +622,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)
-@@ -688,6 +691,9 @@ int client_run(int f_in, int f_out, pid_
+@@ -692,6 +695,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-08-03 15:41:32
+--- orig/options.c     2004-08-11 23:42:23
 +++ options.c  2004-07-16 20:09:54
-@@ -88,8 +88,10 @@ int size_only = 0;
+@@ -87,8 +87,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;
-@@ -267,6 +269,7 @@ void usage(enum logcode F)
+@@ -266,6 +268,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");
-@@ -318,8 +321,8 @@ void usage(enum logcode F)
+@@ -317,8 +320,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};
  
-@@ -338,6 +341,7 @@ static struct poptOption long_options[] 
+@@ -337,6 +340,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 },
-@@ -537,6 +541,11 @@ int parse_arguments(int *argc, const cha
+@@ -539,6 +543,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... */
-@@ -1088,6 +1097,9 @@ void server_options(char **args,int *arg
+@@ -1090,6 +1099,9 @@ void server_options(char **args,int *arg
                }
        }
  
@@ -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-08-03 15:34:32
+--- orig/rsync.yo      2004-08-11 17:26:27
 +++ rsync.yo   2004-07-03 20:17:10
 @@ -314,6 +314,7 @@ verb(
       --delete                delete files that don't exist on sender