Updated.

[rsync/rsync-patches.git] / compare-dest.diff

diff --git a/compare-dest.diff b/compare-dest.diff
index c79c406..a6e84bd 100644 (file)
--- a/compare-dest.diff
+++ b/compare-dest.diff
@@ -20,7 +20,7 @@ Before compiling, be sure to run "make proto".
  extern int link_dest;
  extern int whole_file;
  extern int local_server;
-@@ -79,13 +79,12 @@ static int skip_file(char *fname, struct
+@@ -80,13 +80,12 @@ static int skip_file(char *fname, struct
        if (always_checksum && S_ISREG(st->st_mode)) {
                char sum[MD4_SUM_LENGTH];
                char fnamecmpdest[MAXPATHLEN];
@@ -39,7 +39,7 @@ Before compiling, be sure to run "make proto".
                }
                file_checksum(fname,sum,st->st_size);
                return memcmp(sum, file->u.sum, protocol_version < 21 ? 2
-@@ -408,13 +407,18 @@ static void recv_generator(char *fname, 
+@@ -411,13 +410,18 @@ static void recv_generator(char *fname, 
  
        fnamecmp = fname;
  
@@ -63,9 +63,9 @@ Before compiling, be sure to run "make proto".
                if (statret < 0) {
                        errno = saveerrno;
                        *fnamecmpbuf = '\0';
---- orig/options.c     2004-07-15 16:51:50
+--- orig/options.c     2004-07-16 20:07:22
 +++ options.c  2004-07-03 17:33:30
-@@ -117,7 +117,8 @@ unsigned int backup_dir_remainder;
+@@ -118,7 +118,8 @@ unsigned int backup_dir_remainder;
  
  char *backup_suffix = NULL;
  char *tmpdir = NULL;
@@ -75,7 +75,7 @@ Before compiling, be sure to run "make proto".
  char *config_file = NULL;
  char *shell_cmd = NULL;
  char *log_format = NULL;
-@@ -138,6 +139,7 @@ char *batch_name = NULL;
+@@ -139,6 +140,7 @@ char *batch_name = NULL;
  
  static int daemon_opt;   /* sets am_daemon after option error-reporting */
  static int modify_window_set;
@@ -83,7 +83,7 @@ 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
-@@ -307,7 +309,7 @@ void usage(enum logcode F)
+@@ -314,7 +316,7 @@ void usage(enum logcode F)
  }
  
  enum {OPT_VERSION = 1000, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
@@ -92,7 +92,7 @@ Before compiling, be sure to run "make proto".
        OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW,
        OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_TIMEOUT,
        OPT_REFUSED_BASE = 9000};
-@@ -365,8 +367,8 @@ static struct poptOption long_options[] 
+@@ -373,8 +375,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 },
@@ -103,7 +103,7 @@ Before compiling, be sure to run "make proto".
    /* 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 },
-@@ -582,8 +584,36 @@ int parse_arguments(int *argc, const cha
+@@ -590,8 +592,36 @@ int parse_arguments(int *argc, const cha
                                select_timeout = io_timeout;
                        break;
  
@@ -140,7 +140,7 @@ Before compiling, be sure to run "make proto".
                        link_dest = 1;
                        break;
  #else
-@@ -660,6 +690,11 @@ int parse_arguments(int *argc, const cha
+@@ -684,6 +714,11 @@ int parse_arguments(int *argc, const cha
                exit_cleanup(RERR_SYNTAX);
        }
  
@@ -152,7 +152,7 @@ Before compiling, be sure to run "make proto".
        if (archive_mode) {
                if (!files_from)
                        recurse = 1;
-@@ -688,8 +723,6 @@ int parse_arguments(int *argc, const cha
+@@ -712,8 +747,6 @@ int parse_arguments(int *argc, const cha
                        (*argv)[i] = alloc_sanitize_path((*argv)[i], NULL);
                if (tmpdir)
                        tmpdir = alloc_sanitize_path(tmpdir, curr_dir);
@@ -161,7 +161,7 @@ Before compiling, be sure to run "make proto".
                if (backup_dir)
                        backup_dir = alloc_sanitize_path(backup_dir, curr_dir);
                if (files_from)
-@@ -784,8 +817,8 @@ int parse_arguments(int *argc, const cha
+@@ -819,8 +852,8 @@ int parse_arguments(int *argc, const cha
   **/
  void server_options(char **args,int *argc)
  {
@@ -171,7 +171,7 @@ Before compiling, be sure to run "make proto".
        char *arg;
  
        int i, x;
-@@ -960,13 +993,16 @@ void server_options(char **args,int *arg
+@@ -998,13 +1031,16 @@ void server_options(char **args,int *arg
                args[ac++] = tmpdir;
        }
  
@@ -201,7 +201,7 @@ Before compiling, be sure to run "make proto".
  extern int make_backups;
  extern int do_progress;
  extern char *backup_dir;
---- orig/rsync.h       2004-07-07 08:27:00
+--- orig/rsync.h       2004-07-16 20:07:23
 +++ rsync.h    2004-07-03 17:33:30
 @@ -98,6 +98,8 @@