Updated to apply cleanly.

[rsync/rsync-patches.git] / link-by-hash.diff

diff --git a/link-by-hash.diff b/link-by-hash.diff
index f0ba55d..2e1fecd 100644 (file)
--- a/link-by-hash.diff
+++ b/link-by-hash.diff
@@ -11,7 +11,7 @@ will only store one copy of the unique contents of each file, regardless of
 the file's name.
 
 
---- orig/Makefile.in   2004-07-04 08:59:17
+--- orig/Makefile.in   2004-08-09 21:07:09
 +++ Makefile.in        2004-07-03 20:20:15
 @@ -35,7 +35,7 @@ OBJS1=rsync.o generator.o receiver.o cle
        main.o checksum.o match.o syscall.o log.o backup.o
@@ -367,9 +367,9 @@ the file's name.
 +}
 +
 +#endif
---- orig/options.c     2004-08-03 15:41:32
+--- orig/options.c     2004-08-11 23:42:23
 +++ options.c  2004-07-03 20:20:15
-@@ -127,6 +127,7 @@ char *log_format = NULL;
+@@ -126,6 +126,7 @@ char *log_format = NULL;
  char *password_file = NULL;
  char *rsync_path = RSYNC_PATH;
  char *backup_dir = NULL;
@@ -377,7 +377,7 @@ the file's name.
  char backup_dir_buf[MAXPATHLEN];
  int rsync_port = RSYNC_PORT;
  int link_dest = 0;
-@@ -280,6 +281,7 @@ void usage(enum logcode F)
+@@ -279,6 +280,7 @@ void usage(enum logcode F)
    rprintf(F," -T, --temp-dir=DIR          create temporary files in directory DIR\n");
    rprintf(F,"     --compare-dest=DIR      also compare destination files relative to DIR\n");
    rprintf(F,"     --link-dest=DIR         create hardlinks to DIR for unchanged files\n");
@@ -385,7 +385,7 @@ the file's name.
    rprintf(F," -P                          equivalent to --partial --progress\n");
    rprintf(F," -z, --compress              compress file data\n");
    rprintf(F," -C, --cvs-exclude           auto ignore files in the same way CVS does\n");
-@@ -320,7 +322,7 @@ void usage(enum logcode F)
+@@ -319,7 +321,7 @@ void usage(enum logcode F)
  enum {OPT_VERSION = 1000, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
        OPT_DELETE_AFTER, OPT_DELETE_EXCLUDED, OPT_LINK_DEST,
        OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW,
@@ -394,7 +394,7 @@ the file's name.
        OPT_REFUSED_BASE = 9000};
  
  static struct poptOption long_options[] = {
-@@ -379,6 +381,7 @@ static struct poptOption long_options[] 
+@@ -378,6 +380,7 @@ static struct poptOption long_options[] 
    {"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 },
@@ -402,7 +402,7 @@ the file's name.
    /* 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 },
-@@ -618,6 +621,19 @@ int parse_arguments(int *argc, const cha
+@@ -620,6 +623,19 @@ int parse_arguments(int *argc, const cha
                        return 0;
  #endif
  
@@ -422,7 +422,7 @@ the file's name.
                default:
                        /* A large opt value means that set_refuse_options()
                         * turned this option off (opt-BASE is its index). */
-@@ -1076,6 +1092,11 @@ void server_options(char **args,int *arg
+@@ -1078,6 +1094,11 @@ void server_options(char **args,int *arg
                args[ac++] = compare_dest;
        }
  
@@ -519,7 +519,7 @@ the file's name.
  
                log_recv(file, &initial_stats);
  
---- orig/rsync.c       2004-07-31 16:41:04
+--- orig/rsync.c       2004-08-09 21:07:10
 +++ rsync.c    2004-07-16 20:16:53
 @@ -34,6 +34,7 @@ extern int force_delete;
  extern int recurse;
@@ -529,7 +529,7 @@ the file's name.
  extern char *backup_dir;
  extern int inplace;
  
-@@ -251,6 +252,12 @@ void finish_transfer(char *fname, char *
+@@ -254,6 +255,12 @@ void finish_transfer(char *fname, char *
        /* move tmp file over real file */
        if (verbose > 2)
                rprintf(FINFO, "renaming %s to %s\n", fnametmp, fname);