Fixed failing hunks.

diff --git a/fname-convert.diff b/fname-convert.diff
index 4ff573f..3eb4b7f 100644 (file)
--- a/fname-convert.diff
+++ b/fname-convert.diff
@@ -77,17 +77,17 @@ Note that you'll need to run 'make proto' after applying this patch.
        if (cleanup_fname)
                do_unlink(cleanup_fname);
        if (code)
---- orig/errcode.h     2005-04-13 02:59:47
-+++ errcode.h  2004-07-02 21:38:59
-@@ -34,6 +34,7 @@
- #define RERR_STREAMIO   12      /* error in rsync protocol data stream */
- #define RERR_MESSAGEIO  13      /* errors with program diagnostics */
+--- orig/errcode.h     2005-09-26 17:09:27
++++ errcode.h  2005-09-29 17:23:35
+@@ -36,6 +36,7 @@
  #define RERR_IPC        14      /* error in IPC code */
-+#define RERR_FNAMECONV  15      /* error in filename conversion */
+ #define RERR_CRASHED    15      /* sibling crashed */
+ #define RERR_TERMINATED 16      /* sibling terminated abnormally */
++#define RERR_FNAMECONV  17      /* error in filename conversion */
  
  #define RERR_SIGNAL     20      /* status returned when sent SIGUSR1, SIGINT */
  #define RERR_WAITCHILD  21      /* some error returned by waitpid() */
---- orig/flist.c       2005-08-17 06:45:07
+--- orig/flist.c       2005-09-29 07:43:17
 +++ flist.c    2005-03-05 00:29:08
 @@ -57,6 +57,7 @@ extern int copy_unsafe_links;
  extern int protocol_version;
@@ -109,7 +109,7 @@ Note that you'll need to run 'make proto' after applying this patch.
  
        flags = base_flags;
  
-@@ -555,6 +559,9 @@ static struct file_struct *receive_file_
+@@ -550,6 +554,9 @@ static struct file_struct *receive_file_
  
        strlcpy(lastname, thisname, MAXPATHLEN);
  
@@ -119,7 +119,7 @@ Note that you'll need to run 'make proto' after applying this patch.
        clean_fname(thisname, 0);
  
        if (sanitize_paths)
-@@ -1085,6 +1092,9 @@ struct file_list *send_file_list(int f, 
+@@ -1077,6 +1084,9 @@ struct file_list *send_file_list(int f, 
        start_write = stats.total_written;
        gettimeofday(&start_tv, NULL);
  
@@ -129,7 +129,7 @@ Note that you'll need to run 'make proto' after applying this patch.
        flist = flist_new(WITH_HLINK, "send_file_list");
  
        io_start_buffering_out();
-@@ -1288,6 +1298,9 @@ struct file_list *send_file_list(int f, 
+@@ -1281,6 +1291,9 @@ struct file_list *send_file_list(int f, 
        stats.flist_size = stats.total_written - start_write;
        stats.num_files = flist->count;
  
@@ -139,7 +139,7 @@ Note that you'll need to run 'make proto' after applying this patch.
        if (verbose > 3)
                output_flist(flist);
  
-@@ -1309,6 +1322,9 @@ struct file_list *recv_file_list(int f)
+@@ -1302,6 +1315,9 @@ struct file_list *recv_file_list(int f)
  
        start_read = stats.total_read;
  
@@ -149,7 +149,7 @@ Note that you'll need to run 'make proto' after applying this patch.
        flist = flist_new(WITH_HLINK, "recv_file_list");
  
        flist->count = 0;
-@@ -1361,6 +1377,9 @@ struct file_list *recv_file_list(int f)
+@@ -1354,6 +1370,9 @@ struct file_list *recv_file_list(int f)
                        io_error |= read_int(f);
        }
  
@@ -382,7 +382,7 @@ Note that you'll need to run 'make proto' after applying this patch.
 +      if (verbose > 2)
 +              rprintf(FINFO, "Converted filename: %s -> %s\n", src, dest);
 +}
---- orig/generator.c   2005-08-17 06:45:07
+--- orig/generator.c   2005-09-29 17:02:40
 +++ generator.c        2005-03-05 00:29:37
 @@ -593,7 +593,13 @@ static int phase = 0;
   * start sending checksums.
@@ -399,19 +399,19 @@ Note that you'll need to run 'make proto' after applying this patch.
  static void recv_generator(char *fname, struct file_struct *file, int ndx,
                           int itemizing, int maybe_PERMS_REPORT,
                           enum logcode code, int f_out)
---- orig/log.c 2005-06-10 21:33:28
-+++ log.c      2004-07-03 20:18:02
-@@ -65,6 +65,7 @@ struct {
-       { RERR_STREAMIO   , "error in rsync protocol data stream" },
-       { RERR_MESSAGEIO  , "errors with program diagnostics" },
+--- orig/log.c 2005-09-26 17:09:36
++++ log.c      2005-09-29 17:23:54
+@@ -67,6 +67,7 @@ struct {
        { RERR_IPC        , "error in IPC code" },
+       { RERR_CRASHED    , "sibling process crashed" },
+       { RERR_TERMINATED , "sibling process terminated abnormally" },
 +      { RERR_FNAMECONV  , "error in filename conversion" },
        { RERR_SIGNAL     , "received SIGUSR1 or SIGINT" },
        { RERR_WAITCHILD  , "some error returned by waitpid()" },
        { RERR_MALLOC     , "error allocating core memory buffers" },
---- orig/main.c        2005-07-27 23:31:12
+--- orig/main.c        2005-09-29 07:30:01
 +++ main.c     2004-07-22 00:31:47
-@@ -368,7 +368,7 @@ static pid_t do_cmd(char *cmd, char *mac
+@@ -384,7 +384,7 @@ static pid_t do_cmd(char *cmd, char *mac
                        whole_file = 1;
                ret = local_child(argc, args, f_in, f_out, child_main);
        } else
@@ -420,7 +420,7 @@ Note that you'll need to run 'make proto' after applying this patch.
  
        if (dir)
                free(dir);
---- orig/options.c     2005-08-27 21:11:26
+--- orig/options.c     2005-09-29 07:42:04
 +++ options.c  2005-08-27 21:20:59
 @@ -138,6 +138,7 @@ char *basis_dir[MAX_BASIS_DIRS+1];
  char *config_file = NULL;
@@ -430,7 +430,7 @@ Note that you'll need to run 'make proto' after applying this patch.
  char *password_file = NULL;
  char *rsync_path = RSYNC_PATH;
  char *backup_dir = NULL;
-@@ -322,6 +323,7 @@ void usage(enum logcode F)
+@@ -321,6 +322,7 @@ void usage(enum logcode F)
    rprintf(F,"     --compare-dest=DIR      also compare destination files relative to DIR\n");
    rprintf(F,"     --copy-dest=DIR         ... and include copies of unchanged files\n");
    rprintf(F,"     --link-dest=DIR         hardlink to files in DIR when unchanged\n");
@@ -477,9 +477,9 @@ Note that you'll need to run 'make proto' after applying this patch.
        if (pid == -1) {
                rsyserr(FERROR, errno, "fork");
                exit_cleanup(RERR_IPC);
---- orig/syscall.c     2005-07-27 23:31:12
+--- orig/syscall.c     2005-09-15 18:09:15
 +++ syscall.c  2004-07-02 21:39:00
-@@ -270,3 +270,34 @@ char *d_name(struct dirent *di)
+@@ -274,3 +274,34 @@ char *d_name(struct dirent *di)
        return di->d_name;
  #endif
  }

diff --git a/ignore-case.diff b/ignore-case.diff
index 732c2ee..4d4d045 100644 (file)
--- a/ignore-case.diff
+++ b/ignore-case.diff
@@ -35,8 +35,8 @@ in a case-insensitive manner.
          case '?':
            /* Match anything but '/'. */
            if (*text == '/')
---- orig/options.c     2005-08-27 21:11:26
-+++ options.c  2005-08-27 21:22:04
+--- orig/options.c     2005-09-29 18:06:38
++++ options.c  2005-09-29 18:08:37
 @@ -101,6 +101,7 @@ int max_delete = 0;
  OFF_T max_size = 0;
  int ignore_errors = 0;
@@ -45,7 +45,7 @@ in a case-insensitive manner.
  int blocking_io = -1;
  int checksum_seed = 0;
  int inplace = 0;
-@@ -333,6 +334,7 @@ void usage(enum logcode F)
+@@ -332,6 +333,7 @@ void usage(enum logcode F)
    rprintf(F,"     --include-from=FILE     read include patterns from FILE\n");
    rprintf(F,"     --files-from=FILE       read list of source-file names from FILE\n");
    rprintf(F," -0, --from0                 all *-from/filter files are delimited by 0s\n");
@@ -53,15 +53,15 @@ in a case-insensitive manner.
    rprintf(F,"     --address=ADDRESS       bind address for outgoing socket to daemon\n");
    rprintf(F,"     --port=PORT             specify double-colon alternate port number\n");
    rprintf(F,"     --blocking-io           use blocking I/O for the remote shell\n");
-@@ -417,6 +419,7 @@ static struct poptOption long_options[] 
-   {"update",          'u', POPT_ARG_NONE,   &update_only, 0, 0, 0 },
-   {"existing",         0,  POPT_ARG_NONE,   &only_existing, 0, 0, 0 },
-   {"ignore-existing",  0,  POPT_ARG_NONE,   &opt_ignore_existing, 0, 0, 0 },
+@@ -418,6 +420,7 @@ static struct poptOption long_options[] 
+   {"existing",         0,  POPT_ARG_NONE,   &ignore_non_existing, 0, 0, 0 },
+   {"ignore-existing",  0,  POPT_ARG_NONE,   &ignore_existing, 0, 0, 0 },
+   {"ignore-non-existing",0,POPT_ARG_NONE,   &ignore_non_existing, 0, 0, 0 },
 +  {"ignore-case",      0,  POPT_ARG_NONE,   &ignore_case, 0, 0, 0 },
    {"max-size",         0,  POPT_ARG_STRING, &max_size_arg,  OPT_MAX_SIZE, 0, 0 },
    {"sparse",          'S', POPT_ARG_NONE,   &sparse_files, 0, 0, 0 },
    {"inplace",          0,  POPT_ARG_NONE,   &inplace, 0, 0, 0 },
-@@ -1457,6 +1460,9 @@ void server_options(char **args,int *arg
+@@ -1477,6 +1480,9 @@ void server_options(char **args,int *arg
                args[ac++] = arg;
        }
  

diff --git a/min-size.diff b/min-size.diff
index 5493855..f32f70b 100644 (file)
--- a/min-size.diff
+++ b/min-size.diff
@@ -1,6 +1,6 @@
---- orig/generator.c   2005-08-17 06:45:07
-+++ generator.c        2005-04-28 16:19:24
-@@ -59,6 +59,7 @@ extern int make_backups;
+--- orig/generator.c   2005-09-29 18:03:00
++++ generator.c        2005-09-29 18:09:27
+@@ -60,6 +60,7 @@ extern int make_backups;
  extern int csum_length;
  extern int ignore_times;
  extern int size_only;
@@ -8,7 +8,7 @@
  extern OFF_T max_size;
  extern int io_error;
  extern int allowed_lull;
-@@ -864,6 +865,15 @@ static void recv_generator(char *fname, 
+@@ -863,6 +864,15 @@ static void recv_generator(char *fname, 
                return;
        }
  
@@ -24,19 +24,19 @@
        if (max_size && file->length > max_size) {
                if (verbose > 1) {
                        if (the_file_list->count == 1)
-@@ -1269,7 +1279,7 @@ void generate_files(int f_out, struct fi
+@@ -1265,7 +1275,7 @@ void generate_files(int f_out, struct fi
  
        phase++;
        csum_length = SUM_LENGTH;
--      only_existing = max_size = opt_ignore_existing = 0;
-+      only_existing = min_size = max_size = opt_ignore_existing = 0;
+-      max_size = ignore_existing = ignore_non_existing = 0;
++      min_size = max_size = ignore_existing = ignore_non_existing = 0;
        update_only = always_checksum = size_only = 0;
        ignore_times = 1;
        if (append_mode)  /* resend w/o append mode */
---- orig/options.c     2005-08-27 21:11:26
-+++ options.c  2005-08-27 21:23:36
-@@ -98,6 +98,7 @@ int only_existing = 0;
- int opt_ignore_existing = 0;
+--- orig/options.c     2005-09-29 18:06:38
++++ options.c  2005-09-29 18:09:56
+@@ -98,6 +98,7 @@ int ignore_existing = 0;
+ int ignore_non_existing = 0;
  int need_messages_from_generator = 0;
  int max_delete = 0;
 +OFF_T min_size = 0;
@@ -52,7 +52,7 @@
  static char partialdir_for_delayupdate[] = ".~tmp~";
  
  /** Local address to bind.  As a character string because it's
-@@ -308,6 +309,7 @@ void usage(enum logcode F)
+@@ -307,6 +308,7 @@ void usage(enum logcode F)
    rprintf(F,"     --ignore-errors         delete even if there are I/O errors\n");
    rprintf(F,"     --force                 force deletion of directories even if not empty\n");
    rprintf(F,"     --max-delete=NUM        don't delete more than NUM files\n");
@@ -60,7 +60,7 @@
    rprintf(F,"     --max-size=SIZE         don't transfer any file larger than SIZE\n");
    rprintf(F,"     --partial               keep partially transferred files\n");
    rprintf(F,"     --partial-dir=DIR       put a partially transferred file into DIR\n");
-@@ -362,7 +364,7 @@ void usage(enum logcode F)
+@@ -361,7 +363,7 @@ void usage(enum logcode F)
  
  enum {OPT_VERSION = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
        OPT_FILTER, OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST,
@@ -69,15 +69,15 @@
        OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_ONLY_WRITE_BATCH, OPT_MAX_SIZE,
        OPT_REFUSED_BASE = 9000};
  
-@@ -417,6 +419,7 @@ static struct poptOption long_options[] 
-   {"update",          'u', POPT_ARG_NONE,   &update_only, 0, 0, 0 },
-   {"existing",         0,  POPT_ARG_NONE,   &only_existing, 0, 0, 0 },
-   {"ignore-existing",  0,  POPT_ARG_NONE,   &opt_ignore_existing, 0, 0, 0 },
-+  {"min-size",         0,  POPT_ARG_STRING, &min_size_arg,  OPT_MIN_SIZE, 0, 0 },
+@@ -418,6 +420,7 @@ static struct poptOption long_options[] 
+   {"existing",         0,  POPT_ARG_NONE,   &ignore_non_existing, 0, 0, 0 },
+   {"ignore-existing",  0,  POPT_ARG_NONE,   &ignore_existing, 0, 0, 0 },
+   {"ignore-non-existing",0,POPT_ARG_NONE,   &ignore_non_existing, 0, 0, 0 },
++  {"min-size",         0,  POPT_ARG_STRING, &min_size_arg, OPT_MIN_SIZE, 0, 0 },
    {"max-size",         0,  POPT_ARG_STRING, &max_size_arg,  OPT_MAX_SIZE, 0, 0 },
    {"sparse",          'S', POPT_ARG_NONE,   &sparse_files, 0, 0, 0 },
    {"inplace",          0,  POPT_ARG_NONE,   &inplace, 0, 0, 0 },
-@@ -874,6 +877,15 @@ int parse_arguments(int *argc, const cha
+@@ -886,6 +889,15 @@ int parse_arguments(int *argc, const cha
                        read_batch = 1;
                        break;
  
@@ -93,7 +93,7 @@
                case OPT_MAX_SIZE:
                        if ((max_size = parse_size_arg(max_size_arg)) <= 0) {
                                snprintf(err_buf, sizeof err_buf,
-@@ -1395,6 +1407,11 @@ void server_options(char **args,int *arg
+@@ -1415,6 +1427,11 @@ void server_options(char **args,int *arg
                args[ac++] = arg;
        }
  
@@ -105,9 +105,9 @@
        if (max_size && am_sender) {
                args[ac++] = "--max-size";
                args[ac++] = max_size_arg;
---- orig/rsync.yo      2005-08-27 21:05:12
+--- orig/rsync.yo      2005-09-29 17:02:16
 +++ rsync.yo   2005-05-06 19:12:35
-@@ -342,6 +342,7 @@ to the detailed description below for a 
+@@ -340,6 +340,7 @@ to the detailed description below for a 
       --ignore-errors         delete even if there are I/O errors
       --force                 force deletion of dirs even if not empty
       --max-delete=NUM        don't delete more than NUM files
@@ -115,7 +115,7 @@
       --max-size=SIZE         don't transfer any file larger than SIZE
       --partial               keep partially transferred files
       --partial-dir=DIR       put a partially transferred file into DIR
-@@ -794,10 +795,16 @@ dit(bf(--max-delete=NUM)) This tells rsy
+@@ -797,10 +798,16 @@ dit(bf(--max-delete=NUM)) This tells rsy
  files or directories (NUM must be non-zero).
  This is useful when mirroring very large trees to prevent disasters.