Fix failing hunks.

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

diff --git a/link-by-hash.diff b/link-by-hash.diff
index cf70d05..674969d 100644 (file)
--- a/link-by-hash.diff
+++ b/link-by-hash.diff
@@ -367,7 +367,7 @@ the file's name.
 +}
 +
 +#endif
---- orig/options.c     2004-07-20 21:36:07
+--- orig/options.c     2004-07-23 17:16:13
 +++ options.c  2004-07-03 20:20:15
 @@ -125,6 +125,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;
-@@ -276,6 +277,7 @@ void usage(enum logcode F)
+@@ -277,6 +278,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");
-@@ -316,7 +318,7 @@ void usage(enum logcode F)
+@@ -317,7 +319,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[] = {
-@@ -375,6 +377,7 @@ static struct poptOption long_options[] 
+@@ -376,6 +378,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 },
-@@ -601,6 +604,19 @@ int parse_arguments(int *argc, const cha
+@@ -602,6 +605,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). */
-@@ -1007,6 +1023,11 @@ void server_options(char **args,int *arg
+@@ -1013,6 +1029,11 @@ void server_options(char **args,int *arg
                args[ac++] = compare_dest;
        }
  
@@ -434,9 +434,9 @@ 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-20 21:36:07
+--- orig/receiver.c    2004-07-26 16:20:00
 +++ receiver.c 2004-07-20 21:44:05
-@@ -37,6 +37,7 @@ extern int cvs_exclude;
+@@ -39,6 +39,7 @@ extern int cvs_exclude;
  extern int io_error;
  extern char *tmpdir;
  extern char *compare_dest;
@@ -444,7 +444,7 @@ the file's name.
  extern int make_backups;
  extern int do_progress;
  extern char *backup_dir;
-@@ -200,12 +201,13 @@ static int get_tmpname(char *fnametmp, c
+@@ -206,12 +207,13 @@ static int get_tmpname(char *fnametmp, c
  
  
  static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
@@ -459,7 +459,7 @@ the file's name.
        unsigned int len;
        OFF_T offset = 0;
        OFF_T offset2;
-@@ -224,6 +226,9 @@ static int receive_data(int f_in, char *
+@@ -230,6 +232,9 @@ static int receive_data(int f_in, char *
        } else
                mapbuf = NULL;
  
@@ -469,7 +469,7 @@ the file's name.
        sum_init(checksum_seed);
  
        while ((i = recv_token(f_in, &data)) != 0) {
-@@ -240,6 +245,8 @@ static int receive_data(int f_in, char *
+@@ -246,6 +251,8 @@ static int receive_data(int f_in, char *
                        cleanup_got_literal = 1;
  
                        sum_update(data,i);
@@ -478,7 +478,7 @@ the file's name.
  
                        if (fd != -1 && write_file(fd,data,i) != i) {
                                rsyserr(FERROR, errno, "write failed on %s",
-@@ -267,6 +274,8 @@ static int receive_data(int f_in, char *
+@@ -273,6 +280,8 @@ static int receive_data(int f_in, char *
  
                        see_token(map, len);
                        sum_update(map,len);
@@ -487,7 +487,7 @@ the file's name.
                }
  
                if (!inplace || offset != offset2) {
-@@ -305,6 +314,8 @@ static int receive_data(int f_in, char *
+@@ -311,6 +320,8 @@ static int receive_data(int f_in, char *
        }
  
        sum_end(file_sum1);
@@ -496,7 +496,7 @@ the file's name.
  
        if (mapbuf)
                unmap_file(mapbuf);
-@@ -320,7 +331,7 @@ static int receive_data(int f_in, char *
+@@ -326,7 +337,7 @@ static int receive_data(int f_in, char *
  
  static void discard_receive_data(int f_in, OFF_T length)
  {
@@ -505,8 +505,8 @@ the file's name.
  }
  
  
-@@ -508,8 +519,12 @@ int recv_files(int f_in, struct file_lis
-                       rprintf(FINFO, "%s\n", fname);
+@@ -535,8 +546,12 @@ int recv_files(int f_in, struct file_lis
+                       rprintf(FINFO, "%s\n", safe_fname(fname));
  
                /* recv file data */
 +#ifdef HAVE_LINK
@@ -519,7 +519,7 @@ the file's name.
  
                log_recv(file, &initial_stats);
  
---- orig/rsync.c       2004-07-16 20:07:23
+--- orig/rsync.c       2004-07-26 16:06:53
 +++ rsync.c    2004-07-16 20:16:53
 @@ -33,6 +33,7 @@ extern int preserve_gid;
  extern int force_delete;
@@ -529,7 +529,7 @@ the file's name.
  extern char *backup_dir;
  extern int inplace;
  
-@@ -250,6 +251,12 @@ void finish_transfer(char *fname, char *
+@@ -249,6 +250,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);
@@ -542,7 +542,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-07-20 21:36:08
+--- orig/rsync.h       2004-07-23 17:16:13
 +++ rsync.h    2004-07-03 20:20:15
 @@ -522,6 +522,14 @@ struct stats {
        int current_file_index;