Fixed 2 failing hunks.

diff --git a/compare-dest.diff b/compare-dest.diff
index 17b95d6..ec4cdaa 100644 (file)
--- a/compare-dest.diff
+++ b/compare-dest.diff
@@ -82,8 +82,8 @@ Before compiling, be sure to run "make proto".
  
        /* The receiving side mustn't obey this, or an existing symlink that
         * points to an identical file won't be replaced by the referent. */
---- orig/options.c     2004-10-08 20:16:26
-+++ options.c  2004-10-09 03:38:38
+--- orig/options.c     2004-10-14 17:11:40
++++ options.c  2004-10-14 17:13:57
 @@ -114,12 +114,13 @@ int write_batch = 0;
  int read_batch = 0;
  int backup_dir_len = 0;
@@ -107,27 +107,27 @@ Before compiling, be sure to run "make proto".
  
  /** Local address to bind.  As a character string because it's
   * interpreted by the IPv6 layer: should be a numeric IP4 or IP6
-@@ -317,7 +319,7 @@ void usage(enum logcode F)
+@@ -310,7 +312,7 @@ void usage(enum logcode F)
  }
  
- enum {OPT_VERSION = 1000, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
+ enum {OPT_VERSION = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
 -      OPT_DELETE_AFTER, OPT_DELETE_EXCLUDED, OPT_LINK_DEST,
 +      OPT_DELETE_AFTER, OPT_DELETE_EXCLUDED, OPT_COMPARE_DEST, OPT_LINK_DEST,
        OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW,
        OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_TIMEOUT,
        OPT_REFUSED_BASE = 9000};
-@@ -376,8 +378,8 @@ static struct poptOption long_options[] 
+@@ -369,8 +371,8 @@ static struct poptOption long_options[] 
    {"max-delete",       0,  POPT_ARG_INT,    &max_delete, 0, 0, 0 },
    {"timeout",          0,  POPT_ARG_INT,    &io_timeout, OPT_TIMEOUT, 0, 0 },
    {"temp-dir",        'T', POPT_ARG_STRING, &tmpdir, 0, 0, 0 },
 -  {"compare-dest",     0,  POPT_ARG_STRING, &compare_dest, 0, 0, 0 },
--  {"link-dest",        0,  POPT_ARG_STRING, &compare_dest,  OPT_LINK_DEST, 0, 0 },
-+  {"compare-dest",     0,  POPT_ARG_STRING, 0,              OPT_COMPARE_DEST, 0, 0 },
-+  {"link-dest",        0,  POPT_ARG_STRING, 0,              OPT_LINK_DEST, 0, 0 },
+-  {"link-dest",        0,  POPT_ARG_STRING, &compare_dest, OPT_LINK_DEST, 0, 0 },
++  {"compare-dest",     0,  POPT_ARG_STRING, 0, OPT_COMPARE_DEST, 0, 0 },
++  {"link-dest",        0,  POPT_ARG_STRING, 0, OPT_LINK_DEST, 0, 0 },
    /* TODO: Should this take an optional int giving the compression level? */
    {"compress",        'z', POPT_ARG_NONE,   &do_compression, 0, 0, 0 },
-   {"daemon",           0,  POPT_ARG_NONE,   &daemon_opt, 0, 0, 0 },
-@@ -605,8 +607,28 @@ int parse_arguments(int *argc, const cha
+   {"stats",            0,  POPT_ARG_NONE,   &do_stats, 0, 0, 0 },
+@@ -672,8 +674,28 @@ int parse_arguments(int *argc, const cha
                                select_timeout = io_timeout;
                        break;
  
@@ -156,7 +156,7 @@ Before compiling, be sure to run "make proto".
                        link_dest = 1;
                        break;
  #else
-@@ -699,6 +721,11 @@ int parse_arguments(int *argc, const cha
+@@ -765,6 +787,11 @@ int parse_arguments(int *argc, const cha
                return 0;
        }
  
@@ -168,7 +168,7 @@ Before compiling, be sure to run "make proto".
        if (archive_mode) {
                if (!files_from)
                        recurse = 1;
-@@ -729,8 +756,6 @@ int parse_arguments(int *argc, const cha
+@@ -792,8 +819,6 @@ int parse_arguments(int *argc, const cha
                        tmpdir = sanitize_path(NULL, tmpdir, NULL, 0);
                if (partial_dir)
                        partial_dir = sanitize_path(NULL, partial_dir, NULL, 0);
@@ -177,7 +177,7 @@ Before compiling, be sure to run "make proto".
                if (backup_dir)
                        backup_dir = sanitize_path(NULL, backup_dir, NULL, 0);
                if (files_from)
-@@ -738,6 +763,7 @@ int parse_arguments(int *argc, const cha
+@@ -801,6 +826,7 @@ int parse_arguments(int *argc, const cha
        }
        if (server_exclude_list.head && !am_sender) {
                struct exclude_list_struct *elp = &server_exclude_list;
@@ -185,7 +185,7 @@ Before compiling, be sure to run "make proto".
                if (tmpdir) {
                        clean_fname(tmpdir, 1);
                        if (check_exclude(elp, tmpdir, 1) < 0)
-@@ -748,9 +774,9 @@ int parse_arguments(int *argc, const cha
+@@ -811,9 +837,9 @@ int parse_arguments(int *argc, const cha
                        if (check_exclude(elp, partial_dir, 1) < 0)
                                goto options_rejected;
                }
@@ -198,7 +198,7 @@ Before compiling, be sure to run "make proto".
                                goto options_rejected;
                }
                if (backup_dir) {
-@@ -827,7 +853,7 @@ int parse_arguments(int *argc, const cha
+@@ -884,7 +910,7 @@ int parse_arguments(int *argc, const cha
                         am_server ? "server" : "client");
                return 0;
  #endif
@@ -207,7 +207,7 @@ Before compiling, be sure to run "make proto".
                        snprintf(err_buf, sizeof err_buf,
                                 "--inplace does not yet work with %s\n",
                                 link_dest ? "--link-dest" : "--compare-dest");
-@@ -894,8 +920,8 @@ int parse_arguments(int *argc, const cha
+@@ -951,8 +977,8 @@ int parse_arguments(int *argc, const cha
   **/
  void server_options(char **args,int *argc)
  {
@@ -217,7 +217,7 @@ Before compiling, be sure to run "make proto".
        char *arg;
  
        int i, x;
-@@ -1078,13 +1104,16 @@ void server_options(char **args,int *arg
+@@ -1135,13 +1161,16 @@ void server_options(char **args,int *arg
                args[ac++] = tmpdir;
        }
  

diff --git a/remove-sent-files.diff b/remove-sent-files.diff
index c400b43..7e5fa2c 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-09-29 17:58:26
+--- orig/main.c        2004-10-08 20:16:26
 +++ main.c     2004-08-13 08:24:23
 @@ -42,6 +42,7 @@ extern int list_only;
  extern int local_server;
@@ -67,8 +67,8 @@ command before "make":
        if (argc == 0)
                list_only = 1;
  
---- orig/options.c     2004-09-23 17:42:07
-+++ options.c  2004-07-16 20:09:54
+--- orig/options.c     2004-10-14 17:11:40
++++ options.c  2004-10-14 17:17:53
 @@ -87,8 +87,10 @@ int size_only = 0;
  int bwlimit = 0;
  size_t bwlimit_writemax = 0;
@@ -88,10 +88,10 @@ 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)
+@@ -310,8 +313,8 @@ void usage(enum logcode F)
  }
  
- enum {OPT_VERSION = 1000, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
+ enum {OPT_VERSION = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
 -      OPT_DELETE_AFTER, OPT_DELETE_EXCLUDED, OPT_LINK_DEST,
 -      OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW,
 +      OPT_DELETE_AFTER, OPT_DELETE_EXCLUDED, OPT_DELETE_SENT_FILES,
@@ -99,15 +99,15 @@ command before "make":
        OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_TIMEOUT,
        OPT_REFUSED_BASE = 9000};
  
-@@ -337,6 +340,7 @@ static struct poptOption long_options[] 
+@@ -330,6 +333,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 },
-+  {"delete-sent-files",0,  POPT_ARG_NONE,   0,              OPT_DELETE_SENT_FILES, 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 },
++  {"delete-sent-files",0,  POPT_ARG_NONE,   0, OPT_DELETE_SENT_FILES, 0, 0 },
    {"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 },
-@@ -539,6 +543,11 @@ int parse_arguments(int *argc, const cha
+   {"exclude",          0,  POPT_ARG_STRING, 0, OPT_EXCLUDE, 0, 0 },
+@@ -606,6 +610,11 @@ int parse_arguments(int *argc, const cha
                        delete_mode = 1;
                        break;
  
@@ -119,7 +119,7 @@ command before "make":
                case OPT_EXCLUDE:
                        add_exclude(&exclude_list, poptGetOptArg(pc), 0);
                        break;
-@@ -1099,6 +1108,9 @@ void server_options(char **args,int *arg
+@@ -1156,6 +1165,9 @@ void server_options(char **args,int *arg
                }
        }
  
@@ -174,7 +174,7 @@ command before "make":
                        }
                }
        }
---- orig/rsync.h       2004-09-22 08:47:31
+--- orig/rsync.h       2004-10-09 03:21:56
 +++ 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-09-24 16:42:30
+--- orig/rsync.yo      2004-10-06 00:12:16
 +++ rsync.yo   2004-07-03 20:17:10
 @@ -343,6 +343,7 @@ verb(
       --delete                delete files that don't exist on sender