Updated to apply to latest source.

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

diff --git a/link-by-hash.diff b/link-by-hash.diff
index ac1d834..49d2ad7 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-05-15 00:53:53
+--- orig/Makefile.in   2004-07-04 08:59:17
 +++ 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,7 +367,7 @@ the file's name.
 +}
 +
 +#endif
---- orig/options.c     2004-06-20 19:30:00
+--- orig/options.c     2004-07-15 16:51:50
 +++ options.c  2004-07-03 20:20:15
 @@ -124,6 +124,7 @@ char *log_format = NULL;
  char *password_file = NULL;
@@ -377,7 +377,7 @@ the file's name.
  char backup_dir_buf[MAXPATHLEN];
  int rsync_port = RSYNC_PORT;
  int link_dest = 0;
-@@ -270,6 +271,7 @@ void usage(enum logcode F)
+@@ -269,6 +270,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");
-@@ -310,7 +312,7 @@ void usage(enum logcode F)
+@@ -309,7 +311,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[] = {
-@@ -368,6 +370,7 @@ static struct poptOption long_options[] 
+@@ -367,6 +369,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 },
-@@ -596,6 +599,19 @@ int parse_arguments(int *argc, const cha
+@@ -593,6 +596,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). */
-@@ -977,6 +993,11 @@ void server_options(char **args,int *arg
+@@ -969,6 +985,11 @@ void server_options(char **args,int *arg
                args[ac++] = compare_dest;
        }
  
@@ -434,7 +434,7 @@ the file's name.
        if (files_from && (!am_sender || remote_filesfrom_file)) {
                if (remote_filesfrom_file) {
                        args[ac++] = "--files-from";
---- orig/receiver.c    2004-07-02 18:23:01
+--- orig/receiver.c    2004-07-14 17:12:06
 +++ receiver.c 2004-07-03 20:20:15
 @@ -48,6 +48,7 @@ extern int ignore_errors;
  extern int orig_umask;
@@ -494,7 +494,7 @@ the file's name.
  
        read_buf(f_in,file_sum2,MD4_SUM_LENGTH);
        if (verbose > 2)
-@@ -374,7 +385,7 @@ int recv_files(int f_in,struct file_list
+@@ -374,7 +385,7 @@ int recv_files(int f_in, struct file_lis
                if (fd1 != -1 && do_fstat(fd1,&st) != 0) {
                        rsyserr(FERROR, errno, "fstat %s failed",
                                full_fname(fnamecmp));
@@ -503,7 +503,7 @@ the file's name.
                        close(fd1);
                        continue;
                }
-@@ -387,7 +398,7 @@ int recv_files(int f_in,struct file_list
+@@ -387,7 +398,7 @@ int recv_files(int f_in, struct file_lis
                         */
                        rprintf(FERROR,"recv_files: %s is a directory\n",
                                full_fname(fnamecmp));
@@ -512,7 +512,7 @@ the file's name.
                        close(fd1);
                        continue;
                }
-@@ -443,7 +454,7 @@ int recv_files(int f_in,struct file_list
+@@ -443,7 +454,7 @@ int recv_files(int f_in, struct file_lis
                if (fd2 == -1) {
                        rsyserr(FERROR, errno, "mkstemp %s failed",
                                full_fname(fnametmp));
@@ -521,7 +521,7 @@ the file's name.
                        if (mapbuf)
                                unmap_file(mapbuf);
                        if (fd1 != -1)
-@@ -457,7 +468,11 @@ int recv_files(int f_in,struct file_list
+@@ -457,7 +468,11 @@ int recv_files(int f_in, struct file_lis
                        rprintf(FINFO, "%s\n", fname);
  
                /* recv file data */
@@ -557,7 +557,7 @@ the file's name.
        ret = robust_rename(fnametmp, fname, file->mode & INITACCESSPERMS);
        if (ret < 0) {
                rsyserr(FERROR, errno, "%s %s -> \"%s\"",
---- orig/rsync.h       2004-05-16 07:58:12
+--- orig/rsync.h       2004-07-07 08:27:00
 +++ rsync.h    2004-07-03 20:20:15
 @@ -522,6 +522,14 @@ struct stats {
        int current_file_index;