Fix failing hunks.

diff --git a/acls.diff b/acls.diff
index fc1950d..b8e0ae1 100644 (file)
--- a/acls.diff
+++ b/acls.diff
@@ -1149,7 +1149,7 @@ After applying this patch, run these commands for a successful build:
 +
 +
 +#endif /* SUPPORT_ACLS */
 +
 +
 +#endif /* SUPPORT_ACLS */

---- orig/backup.c      2004-06-11 07:47:42
+--- orig/backup.c      2004-07-26 06:19:04

 +++ backup.c   2004-07-03 20:11:58
 @@ -105,6 +105,7 @@ static int make_bak_dir(char *fullpath)
                        } else {
 +++ backup.c   2004-07-03 20:11:58
 @@ -105,6 +105,7 @@ static int make_bak_dir(char *fullpath)
                        } else {


@@ -1159,7 +1159,7 @@ After applying this patch, run these commands for a successful build:
                        }
                }
                *p = '/';
                        }
                }
                *p = '/';

-@@ -167,6 +168,8 @@ static int keep_backup(char *fname)
+@@ -168,6 +169,8 @@ static int keep_backup(char *fname)

                return 0;
        }
  
                return 0;
        }
  


@@ -1168,7 +1168,7 @@ After applying this patch, run these commands for a successful build:
  #ifdef HAVE_MKNOD
        /* Check to see if this is a device file, or link */
        if (IS_DEVICE(file->mode)) {
  #ifdef HAVE_MKNOD
        /* Check to see if this is a device file, or link */
        if (IS_DEVICE(file->mode)) {

-@@ -237,6 +240,7 @@ static int keep_backup(char *fname)
+@@ -242,6 +245,7 @@ static int keep_backup(char *fname)

                }
        }
        set_perms(backup_dir_buf, file, NULL, 0);
                }
        }
        set_perms(backup_dir_buf, file, NULL, 0);


@@ -1265,7 +1265,7 @@ After applying this patch, run these commands for a successful build:
  AC_CONFIG_FILES([Makefile lib/dummy zlib/dummy popt/dummy shconfig])
  AC_OUTPUT
  
  AC_CONFIG_FILES([Makefile lib/dummy zlib/dummy popt/dummy shconfig])
  AC_OUTPUT
  

---- orig/flist.c       2004-07-15 02:21:10
+--- orig/flist.c       2004-07-17 15:20:05

 +++ flist.c    2004-07-03 20:11:58
 @@ -942,6 +942,8 @@ void send_file_name(int f, struct file_l
  
 +++ flist.c    2004-07-03 20:11:58
 @@ -942,6 +942,8 @@ void send_file_name(int f, struct file_l
  


@@ -1305,12 +1305,12 @@ After applying this patch, run these commands for a successful build:
        if (f != -1) {
                /* Now send the uid/gid list. This was introduced in
                 * protocol version 15 */
        if (f != -1) {
                /* Now send the uid/gid list. This was introduced in
                 * protocol version 15 */

---- orig/generator.c   2004-07-16 19:35:29
+--- orig/generator.c   2004-07-28 10:05:29

 +++ generator.c        2004-07-03 20:11:58
 +++ generator.c        2004-07-03 20:11:58

-@@ -327,6 +327,10 @@ static void recv_generator(char *fname, 
+@@ -335,6 +335,10 @@ static void recv_generator(char *fname, 

                if (set_perms(fname, file, statret ? NULL : &st, 0)
                    && verbose && f_out != -1)
                if (set_perms(fname, file, statret ? NULL : &st, 0)
                    && verbose && f_out != -1)

-                       rprintf(FINFO,"%s/\n",fname);
+                       rprintf(FINFO, "%s/\n", safe_fname(fname));

 +#if SUPPORT_ACLS
 +              if (f_out == -1)
 +                      SET_ACL(fname, file);
 +#if SUPPORT_ACLS
 +              if (f_out == -1)
 +                      SET_ACL(fname, file);


@@ -1329,7 +1329,7 @@ After applying this patch, run these commands for a successful build:
    next;
  }
  
    next;
  }
  

---- orig/options.c     2004-07-16 20:07:22
+--- orig/options.c     2004-07-23 17:16:13

 +++ options.c  2004-07-15 16:53:42
 @@ -43,6 +43,7 @@ int keep_dirlinks = 0;
  int copy_links = 0;
 +++ options.c  2004-07-15 16:53:42
 @@ -43,6 +43,7 @@ int keep_dirlinks = 0;
  int copy_links = 0;


@@ -1370,7 +1370,7 @@ After applying this patch, run these commands for a successful build:
  
        /* Note that this field may not have type ino_t.  It depends
         * on the complicated interaction between largefile feature
  
        /* Note that this field may not have type ino_t.  It depends
         * on the complicated interaction between largefile feature

-@@ -247,6 +253,7 @@ void usage(enum logcode F)
+@@ -248,6 +254,7 @@ void usage(enum logcode F)

    rprintf(F,"     --safe-links            ignore \"unsafe\" symlinks\n");
    rprintf(F," -H, --hard-links            preserve hard links\n");
    rprintf(F," -p, --perms                 preserve permissions\n");
    rprintf(F,"     --safe-links            ignore \"unsafe\" symlinks\n");
    rprintf(F," -H, --hard-links            preserve hard links\n");
    rprintf(F," -p, --perms                 preserve permissions\n");


@@ -1378,7 +1378,7 @@ After applying this patch, run these commands for a successful build:
    rprintf(F," -o, --owner                 preserve owner (root only)\n");
    rprintf(F," -g, --group                 preserve group\n");
    rprintf(F," -D, --devices               preserve devices (root only)\n");
    rprintf(F," -o, --owner                 preserve owner (root only)\n");
    rprintf(F," -g, --group                 preserve group\n");
    rprintf(F," -D, --devices               preserve devices (root only)\n");

-@@ -355,6 +362,7 @@ static struct poptOption long_options[] 
+@@ -356,6 +363,7 @@ static struct poptOption long_options[] 

    {"no-whole-file",    0,  POPT_ARG_VAL,    &whole_file, 0, 0, 0 },
    {"copy-unsafe-links", 0, POPT_ARG_NONE,   &copy_unsafe_links, 0, 0, 0 },
    {"perms",           'p', POPT_ARG_NONE,   &preserve_perms, 0, 0, 0 },
    {"no-whole-file",    0,  POPT_ARG_VAL,    &whole_file, 0, 0, 0 },
    {"copy-unsafe-links", 0, POPT_ARG_NONE,   &copy_unsafe_links, 0, 0, 0 },
    {"perms",           'p', POPT_ARG_NONE,   &preserve_perms, 0, 0, 0 },


@@ -1386,7 +1386,7 @@ After applying this patch, run these commands for a successful build:
    {"owner",           'o', POPT_ARG_NONE,   &preserve_uid, 0, 0, 0 },
    {"group",           'g', POPT_ARG_NONE,   &preserve_gid, 0, 0, 0 },
    {"devices",         'D', POPT_ARG_NONE,   &preserve_devices, 0, 0, 0 },
    {"owner",           'o', POPT_ARG_NONE,   &preserve_uid, 0, 0, 0 },
    {"group",           'g', POPT_ARG_NONE,   &preserve_gid, 0, 0, 0 },
    {"devices",         'D', POPT_ARG_NONE,   &preserve_devices, 0, 0, 0 },

-@@ -601,6 +609,31 @@ int parse_arguments(int *argc, const cha
+@@ -602,6 +610,31 @@ int parse_arguments(int *argc, const cha

                        return 0;
  #endif
  
                        return 0;
  #endif
  


@@ -1418,7 +1418,7 @@ After applying this patch, run these commands for a successful build:
                default:
                        /* A large opt value means that set_refuse_options()
                         * turned this option off (opt-BASE is its index). */
                default:
                        /* A large opt value means that set_refuse_options()
                         * turned this option off (opt-BASE is its index). */

-@@ -867,6 +900,8 @@ void server_options(char **args,int *arg
+@@ -873,6 +906,8 @@ void server_options(char **args,int *arg

  
        if (preserve_hard_links)
                argstr[x++] = 'H';
  
        if (preserve_hard_links)
                argstr[x++] = 'H';


@@ -1427,7 +1427,7 @@ After applying this patch, run these commands for a successful build:
        if (preserve_uid)
                argstr[x++] = 'o';
        if (preserve_gid)
        if (preserve_uid)
                argstr[x++] = 'o';
        if (preserve_gid)

---- orig/rsync.c       2004-07-16 20:07:23
+--- orig/rsync.c       2004-07-26 16:06:53

 +++ rsync.c    2004-07-03 20:11:58
 @@ -205,6 +205,14 @@ int set_perms(char *fname,struct file_st
        }
 +++ rsync.c    2004-07-03 20:11:58
 @@ -205,6 +205,14 @@ int set_perms(char *fname,struct file_st
        }


@@ -1444,9 +1444,9 @@ After applying this patch, run these commands for a successful build:
        if (verbose > 1 && flags & PERMS_REPORT) {
                if (updated)
                        rprintf(FINFO,"%s\n",fname);
        if (verbose > 1 && flags & PERMS_REPORT) {
                if (updated)
                        rprintf(FINFO,"%s\n",fname);

---- orig/rsync.h       2004-07-16 20:07:23
+--- orig/rsync.h       2004-07-23 17:16:13

 +++ rsync.h    2004-07-03 20:11:58
 +++ rsync.h    2004-07-03 20:11:58

-@@ -540,6 +540,40 @@ static inline int flist_up(struct file_l
+@@ -538,6 +538,40 @@ static inline int flist_up(struct file_l

  #include "lib/permstring.h"
  #include "lib/addrinfo.h"
  
  #include "lib/permstring.h"
  #include "lib/addrinfo.h"
  


@@ -1487,7 +1487,7 @@ After applying this patch, run these commands for a successful build:
  #include "proto.h"
  
  /* We have replacement versions of these if they're missing. */
  #include "proto.h"
  
  /* We have replacement versions of these if they're missing. */

---- orig/rsync.yo      2004-07-16 20:07:23
+--- orig/rsync.yo      2004-07-24 16:52:10

 +++ rsync.yo   2004-07-03 20:11:58
 @@ -297,6 +297,7 @@ verb(
       --safe-links            ignore "unsafe" symlinks
 +++ rsync.yo   2004-07-03 20:11:58
 @@ -297,6 +297,7 @@ verb(
       --safe-links            ignore "unsafe" symlinks


@@ -1497,7 +1497,7 @@ After applying this patch, run these commands for a successful build:
   -o, --owner                 preserve owner (root only)
   -g, --group                 preserve group
   -D, --devices               preserve devices (root only)
   -o, --owner                 preserve owner (root only)
   -g, --group                 preserve group
   -D, --devices               preserve devices (root only)

-@@ -539,6 +540,11 @@ source file's permissions and the umask 
+@@ -542,6 +543,11 @@ source file's permissions and the umask 

  other files (including updated files) retain their existing permissions
  (which is the same behavior as other file-copy utilities, such as cp).
  
  other files (including updated files) retain their existing permissions
  (which is the same behavior as other file-copy utilities, such as cp).
  

diff --git a/atimes.diff b/atimes.diff
index 1bd975b..db78a51 100644 (file)
--- a/atimes.diff
+++ b/atimes.diff
@@ -4,9 +4,9 @@ command before "make":
     make proto
 
 
     make proto
 
 

---- orig/batch.c       2004-07-15 16:51:50
+--- orig/batch.c       2004-07-24 16:52:09

 +++ batch.c    2004-07-03 20:15:41
 +++ batch.c    2004-07-03 20:15:41

-@@ -63,6 +63,8 @@ void show_flist(int index, struct file_s
+@@ -186,6 +186,8 @@ void show_flist(int index, struct file_s

                rprintf(FINFO, "flist->flags=%#x\n", fptr[i]->flags);
                rprintf(FINFO, "flist->modtime=%#lx\n",
                        (long unsigned) fptr[i]->modtime);
                rprintf(FINFO, "flist->flags=%#x\n", fptr[i]->flags);
                rprintf(FINFO, "flist->modtime=%#lx\n",
                        (long unsigned) fptr[i]->modtime);


@@ -15,7 +15,7 @@ command before "make":
                rprintf(FINFO, "flist->length=%.0f\n",
                        (double) fptr[i]->length);
                rprintf(FINFO, "flist->mode=%#o\n", (int) fptr[i]->mode);
                rprintf(FINFO, "flist->length=%.0f\n",
                        (double) fptr[i]->length);
                rprintf(FINFO, "flist->mode=%#o\n", (int) fptr[i]->mode);

---- orig/flist.c       2004-07-15 02:21:10
+--- orig/flist.c       2004-07-17 15:20:05

 +++ flist.c    2004-07-03 20:15:41
 @@ -58,6 +58,7 @@ extern int relative_paths;
  extern int implied_dirs;
 +++ flist.c    2004-07-03 20:15:41
 @@ -58,6 +58,7 @@ extern int relative_paths;
  extern int implied_dirs;


@@ -128,9 +128,9 @@ command before "make":
        file->length = st.st_size;
        file->mode = st.st_mode;
        file->uid = st.st_uid;
        file->length = st.st_size;
        file->mode = st.st_mode;
        file->uid = st.st_uid;

---- orig/generator.c   2004-07-16 19:35:29
+--- orig/generator.c   2004-07-28 10:05:29

 +++ generator.c        2004-07-03 20:15:41
 +++ generator.c        2004-07-03 20:15:41

-@@ -99,7 +99,7 @@ static int skip_file(char *fname, struct
+@@ -98,7 +98,7 @@ static int skip_file(char *fname, struct

        if (ignore_times)
                return 0;
  
        if (ignore_times)
                return 0;
  


@@ -139,16 +139,16 @@ command before "make":
  }
  
  
  }
  
  

-@@ -471,7 +471,7 @@ static void recv_generator(char *fname, 
+@@ -473,7 +473,7 @@ static void recv_generator(char *fname, 

        }
  
        if (update_only && fnamecmp == fname
 -          && cmp_modtime(st.st_mtime, file->modtime) > 0) {
 +          && cmp_time(st.st_mtime, file->modtime) > 0) {
                if (verbose > 1)
        }
  
        if (update_only && fnamecmp == fname
 -          && cmp_modtime(st.st_mtime, file->modtime) > 0) {
 +          && cmp_time(st.st_mtime, file->modtime) > 0) {
                if (verbose > 1)

-                       rprintf(FINFO,"%s is newer\n",fname);
+                       rprintf(FINFO, "%s is newer\n", safe_fname(fname));

                return;
                return;

---- orig/options.c     2004-07-16 20:07:22
+--- orig/options.c     2004-07-23 17:16:13

 +++ options.c  2004-07-03 20:15:41
 @@ -48,6 +48,7 @@ int preserve_devices = 0;
  int preserve_uid = 0;
 +++ options.c  2004-07-03 20:15:41
 @@ -48,6 +48,7 @@ int preserve_devices = 0;
  int preserve_uid = 0;


@@ -158,7 +158,7 @@ command before "make":
  int update_only = 0;
  int cvs_exclude = 0;
  int dry_run = 0;
  int update_only = 0;
  int cvs_exclude = 0;
  int dry_run = 0;

-@@ -251,6 +252,7 @@ void usage(enum logcode F)
+@@ -252,6 +253,7 @@ void usage(enum logcode F)

    rprintf(F," -g, --group                 preserve group\n");
    rprintf(F," -D, --devices               preserve devices (root only)\n");
    rprintf(F," -t, --times                 preserve times\n");
    rprintf(F," -g, --group                 preserve group\n");
    rprintf(F," -D, --devices               preserve devices (root only)\n");
    rprintf(F," -t, --times                 preserve times\n");


@@ -166,7 +166,7 @@ command before "make":
    rprintf(F," -S, --sparse                handle sparse files efficiently\n");
    rprintf(F," -n, --dry-run               show what would have been transferred\n");
    rprintf(F," -W, --whole-file            copy whole files, no incremental checks\n");
    rprintf(F," -S, --sparse                handle sparse files efficiently\n");
    rprintf(F," -n, --dry-run               show what would have been transferred\n");
    rprintf(F," -W, --whole-file            copy whole files, no incremental checks\n");

-@@ -359,6 +361,7 @@ static struct poptOption long_options[] 
+@@ -360,6 +362,7 @@ static struct poptOption long_options[] 

    {"group",           'g', POPT_ARG_NONE,   &preserve_gid, 0, 0, 0 },
    {"devices",         'D', POPT_ARG_NONE,   &preserve_devices, 0, 0, 0 },
    {"times",           't', POPT_ARG_NONE,   &preserve_times, 0, 0, 0 },
    {"group",           'g', POPT_ARG_NONE,   &preserve_gid, 0, 0, 0 },
    {"devices",         'D', POPT_ARG_NONE,   &preserve_devices, 0, 0, 0 },
    {"times",           't', POPT_ARG_NONE,   &preserve_times, 0, 0, 0 },


@@ -174,7 +174,7 @@ command before "make":
    {"checksum",        'c', POPT_ARG_NONE,   &always_checksum, 0, 0, 0 },
    {"verbose",         'v', POPT_ARG_NONE,   0,               'v', 0, 0 },
    {"quiet",           'q', POPT_ARG_NONE,   0,               'q', 0, 0 },
    {"checksum",        'c', POPT_ARG_NONE,   &always_checksum, 0, 0, 0 },
    {"verbose",         'v', POPT_ARG_NONE,   0,               'v', 0, 0 },
    {"quiet",           'q', POPT_ARG_NONE,   0,               'q', 0, 0 },

-@@ -875,6 +878,8 @@ void server_options(char **args,int *arg
+@@ -881,6 +884,8 @@ void server_options(char **args,int *arg

                argstr[x++] = 'D';
        if (preserve_times)
                argstr[x++] = 't';
                argstr[x++] = 'D';
        if (preserve_times)
                argstr[x++] = 't';


@@ -183,7 +183,7 @@ command before "make":
        if (preserve_perms)
                argstr[x++] = 'p';
        if (recurse)
        if (preserve_perms)
                argstr[x++] = 'p';
        if (recurse)

---- orig/rsync.c       2004-07-16 20:07:23
+--- orig/rsync.c       2004-07-26 16:06:53

 +++ rsync.c    2004-07-03 20:15:41
 @@ -25,6 +25,7 @@
  extern int verbose;
 +++ rsync.c    2004-07-03 20:15:41
 @@ -25,6 +25,7 @@
  extern int verbose;


@@ -229,7 +229,7 @@ command before "make":
        }
  
        change_uid = am_root && preserve_uid && st->st_uid != file->uid;
        }
  
        change_uid = am_root && preserve_uid && st->st_uid != file->uid;

---- orig/rsync.h       2004-07-16 20:07:23
+--- orig/rsync.h       2004-07-23 17:16:13

 +++ rsync.h    2004-07-03 20:15:41
 @@ -54,6 +54,7 @@
  #define XMIT_HAS_IDEV_DATA (1<<9)
 +++ rsync.h    2004-07-03 20:15:41
 @@ -54,6 +54,7 @@
  #define XMIT_HAS_IDEV_DATA (1<<9)


@@ -255,7 +255,7 @@ command before "make":
        uid_t uid;
        gid_t gid;
        mode_t mode;
        uid_t uid;
        gid_t gid;
        mode_t mode;

---- orig/rsync.yo      2004-07-16 20:07:23
+--- orig/rsync.yo      2004-07-24 16:52:10

 +++ rsync.yo   2004-07-03 20:15:41
 @@ -301,6 +301,7 @@ verb(
   -g, --group                 preserve group
 +++ rsync.yo   2004-07-03 20:15:41
 @@ -301,6 +301,7 @@ verb(
   -g, --group                 preserve group


@@ -265,7 +265,7 @@ command before "make":
   -S, --sparse                handle sparse files efficiently
   -n, --dry-run               show what would have been transferred
   -W, --whole-file            copy whole files, no incremental checks
   -S, --sparse                handle sparse files efficiently
   -n, --dry-run               show what would have been transferred
   -W, --whole-file            copy whole files, no incremental checks

-@@ -564,6 +565,11 @@ cause the next transfer to behave as if 
+@@ -567,6 +568,11 @@ cause the next transfer to behave as if 

  their checksums compared and show up in log messages even if they haven't
  changed.
  
  their checksums compared and show up in log messages even if they haven't
  changed.
  


@@ -299,7 +299,7 @@ command before "make":
 +
 +# The script would have aborted on error, so getting here means we've won.
 +exit 0
 +
 +# The script would have aborted on error, so getting here means we've won.
 +exit 0

---- orig/testsuite/rsync.fns   2004-06-28 21:08:14
+--- orig/testsuite/rsync.fns   2004-07-23 17:16:13

 +++ testsuite/rsync.fns        2004-07-03 20:15:41
 @@ -50,7 +50,7 @@ printmsg() {
  
 +++ testsuite/rsync.fns        2004-07-03 20:15:41
 @@ -50,7 +50,7 @@ printmsg() {
  


@@ -482,7 +482,7 @@ command before "make":
  
        return 0;
  }
  
        return 0;
  }

---- orig/util.c        2004-06-09 21:54:47
+--- orig/util.c        2004-07-26 16:33:24

 +++ util.c     2004-07-03 20:15:41
 @@ -127,31 +127,39 @@ void overflow(char *str)
  
 +++ util.c     2004-07-03 20:15:41
 @@ -127,31 +127,39 @@ void overflow(char *str)
  


@@ -530,7 +530,7 @@ command before "make":
                t[0].tv_usec = 0;
                t[1].tv_sec = modtime;
                t[1].tv_usec = 0;
                t[0].tv_usec = 0;
                t[1].tv_sec = modtime;
                t[1].tv_usec = 0;

-@@ -1078,8 +1086,8 @@ int msleep(int t)
+@@ -1103,8 +1111,8 @@ int msleep(int t)

  
  
  /**
  
  
  /**


@@ -541,7 +541,7 @@ command before "make":
   * --modify-window).
   *
   * @retval 0 if the times should be treated as the same
   * --modify-window).
   *
   * @retval 0 if the times should be treated as the same

-@@ -1088,7 +1096,7 @@ int msleep(int t)
+@@ -1113,7 +1121,7 @@ int msleep(int t)

   *
   * @retval -1 if the 2nd is later
   **/
   *
   * @retval -1 if the 2nd is later
   **/

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
 +}
 +
 +#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;
 +++ 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;
  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");
    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");
    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,
  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[] = {
        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 },
    {"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 },
    /* 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
  
                        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). */
                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;
        }
  
                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";
        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
 +++ 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;
  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;
  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,
  
  
  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;
        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;
  
        } else
                mapbuf = NULL;
  


@@ -469,7 +469,7 @@ the file's name.
        sum_init(checksum_seed);
  
        while ((i = recv_token(f_in, &data)) != 0) {
        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);
                        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",
  
                        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);
  
                        see_token(map, len);
                        sum_update(map,len);


@@ -487,7 +487,7 @@ the file's name.
                }
  
                if (!inplace || offset != offset2) {
                }
  
                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);
        }
  
        sum_end(file_sum1);


@@ -496,7 +496,7 @@ the file's name.
  
        if (mapbuf)
                unmap_file(mapbuf);
  
        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)
  {
  
  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
  
                /* recv file data */
 +#ifdef HAVE_LINK


@@ -519,7 +519,7 @@ the file's name.
  
                log_recv(file, &initial_stats);
  
  
                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;
 +++ 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;
  
  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);
        /* 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\"",
        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;
 +++ rsync.h    2004-07-03 20:20:15
 @@ -522,6 +522,14 @@ struct stats {
        int current_file_index;

diff --git a/max-size.diff b/max-size.diff
index 56802e4..2241f2c 100644 (file)
--- a/max-size.diff
+++ b/max-size.diff
@@ -1,4 +1,4 @@
---- orig/generator.c   2004-07-17 16:30:20
+--- orig/generator.c   2004-07-28 10:05:29

 +++ generator.c        2004-07-03 20:20:46
 @@ -39,6 +39,7 @@ extern int opt_ignore_existing;
  extern int csum_length;
 +++ generator.c        2004-07-03 20:20:46
 @@ -39,6 +39,7 @@ extern int opt_ignore_existing;
  extern int csum_length;


@@ -8,9 +8,9 @@
  extern int io_timeout;
  extern int protocol_version;
  extern int always_checksum;
  extern int io_timeout;
  extern int protocol_version;
  extern int always_checksum;

-@@ -328,6 +329,10 @@ static void recv_generator(char *fname, 
+@@ -336,6 +337,10 @@ static void recv_generator(char *fname, 

                    && verbose && f_out != -1)
                    && verbose && f_out != -1)

-                       rprintf(FINFO,"%s/\n",fname);
+                       rprintf(FINFO, "%s/\n", safe_fname(fname));

                return;
 +      } else if (max_size && file->length > max_size) {
 +              if (verbose > 1)
                return;
 +      } else if (max_size && file->length > max_size) {
 +              if (verbose > 1)


@@ -19,7 +19,7 @@
        }
  
        if (preserve_links && S_ISLNK(file->mode)) {
        }
  
        if (preserve_links && S_ISLNK(file->mode)) {

---- orig/options.c     2004-07-16 20:07:22
+--- orig/options.c     2004-07-23 17:16:13

 +++ options.c  2004-07-15 02:34:44
 @@ -90,6 +90,7 @@ int delete_after = 0;
  int only_existing = 0;
 +++ options.c  2004-07-15 02:34:44
 @@ -90,6 +90,7 @@ int delete_after = 0;
  int only_existing = 0;


@@ -37,7 +37,7 @@
  
  /** Local address to bind.  As a character string because it's
   * interpreted by the IPv6 layer: should be a numeric IP4 or IP6
  
  /** Local address to bind.  As a character string because it's
   * interpreted by the IPv6 layer: should be a numeric IP4 or IP6

-@@ -266,6 +268,7 @@ void usage(enum logcode F)
+@@ -267,6 +269,7 @@ void usage(enum logcode F)

    rprintf(F,"     --delete-after          receiver deletes after transferring, not before\n");
    rprintf(F,"     --ignore-errors         delete even if there are I/O errors\n");
    rprintf(F,"     --max-delete=NUM        don't delete more than NUM files\n");
    rprintf(F,"     --delete-after          receiver deletes after transferring, not before\n");
    rprintf(F,"     --ignore-errors         delete even if there are I/O errors\n");
    rprintf(F,"     --max-delete=NUM        don't delete more than NUM files\n");


@@ -45,7 +45,7 @@
    rprintf(F,"     --partial               keep partially transferred files\n");
    rprintf(F,"     --force                 force deletion of directories even if not empty\n");
    rprintf(F,"     --numeric-ids           don't map uid/gid values by user/group name\n");
    rprintf(F,"     --partial               keep partially transferred files\n");
    rprintf(F,"     --force                 force deletion of directories even if not empty\n");
    rprintf(F,"     --numeric-ids           don't map uid/gid values by user/group name\n");

-@@ -316,7 +319,7 @@ void usage(enum logcode F)
+@@ -317,7 +320,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,
  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,


@@ -54,7 +54,7 @@
        OPT_REFUSED_BASE = 9000};
  
  static struct poptOption long_options[] = {
        OPT_REFUSED_BASE = 9000};
  
  static struct poptOption long_options[] = {

-@@ -371,6 +374,7 @@ static struct poptOption long_options[] 
+@@ -372,6 +375,7 @@ static struct poptOption long_options[] 

    {"rsh",             'e', POPT_ARG_STRING, &shell_cmd, 0, 0, 0 },
    {"block-size",      'B', POPT_ARG_INT,    &block_size, 0, 0, 0 },
    {"max-delete",       0,  POPT_ARG_INT,    &max_delete, 0, 0, 0 },
    {"rsh",             'e', POPT_ARG_STRING, &shell_cmd, 0, 0, 0 },
    {"block-size",      'B', POPT_ARG_INT,    &block_size, 0, 0, 0 },
    {"max-delete",       0,  POPT_ARG_INT,    &max_delete, 0, 0, 0 },


@@ -62,7 +62,7 @@
    {"timeout",          0,  POPT_ARG_INT,    &io_timeout, OPT_TIMEOUT, 0, 0 },
    {"temp-dir",        'T', POPT_ARG_STRING, &tmpdir, 0, 0, 0 },
    {"compare-dest",     0,  POPT_ARG_STRING, &compare_dest, 0, 0, 0 },
    {"timeout",          0,  POPT_ARG_INT,    &io_timeout, OPT_TIMEOUT, 0, 0 },
    {"temp-dir",        'T', POPT_ARG_STRING, &tmpdir, 0, 0, 0 },
    {"compare-dest",     0,  POPT_ARG_STRING, &compare_dest, 0, 0, 0 },

-@@ -585,6 +589,32 @@ int parse_arguments(int *argc, const cha
+@@ -586,6 +590,32 @@ int parse_arguments(int *argc, const cha

                        read_batch = 1;
                        break;
  
                        read_batch = 1;
                        break;
  


@@ -95,7 +95,7 @@
                case OPT_TIMEOUT:
                        if (io_timeout && io_timeout < select_timeout)
                                select_timeout = io_timeout;
                case OPT_TIMEOUT:
                        if (io_timeout && io_timeout < select_timeout)
                                select_timeout = io_timeout;

-@@ -918,6 +948,11 @@ void server_options(char **args,int *arg
+@@ -924,6 +954,11 @@ void server_options(char **args,int *arg

                args[ac++] = arg;
        }
  
                args[ac++] = arg;
        }
  


@@ -107,7 +107,7 @@
        if (io_timeout) {
                if (asprintf(&arg, "--timeout=%d", io_timeout) < 0)
                        goto oom;
        if (io_timeout) {
                if (asprintf(&arg, "--timeout=%d", io_timeout) < 0)
                        goto oom;

---- orig/rsync.yo      2004-07-19 08:27:29
+--- orig/rsync.yo      2004-07-24 16:52:10

 +++ rsync.yo   2004-07-03 20:20:46
 @@ -316,6 +316,7 @@ verb(
       --delete-after          receiver deletes after transfer, not before
 +++ rsync.yo   2004-07-03 20:20:46
 @@ -316,6 +316,7 @@ verb(
       --delete-after          receiver deletes after transfer, not before

diff --git a/remove-sent-files.diff b/remove-sent-files.diff
index b500575..5bd4061 100644 (file)
--- a/remove-sent-files.diff
+++ b/remove-sent-files.diff
@@ -129,7 +129,7 @@ command before "make":
        *argc = ac;
        return;
  
        *argc = ac;
        return;
  

---- orig/receiver.c    2004-07-23 17:16:13
+--- orig/receiver.c    2004-07-26 16:20:00

 +++ receiver.c 2004-07-26 06:21:43
 @@ -45,6 +45,7 @@ extern char *backup_dir;
  extern char *backup_suffix;
 +++ receiver.c 2004-07-26 06:21:43
 @@ -45,6 +45,7 @@ extern char *backup_dir;
  extern char *backup_suffix;


@@ -139,7 +139,7 @@ command before "make":
  extern int module_id;
  extern int ignore_errors;
  extern int orig_umask;
  extern int module_id;
  extern int ignore_errors;
  extern int orig_umask;

-@@ -338,7 +339,7 @@ int recv_files(int f_in, struct file_lis
+@@ -342,7 +343,7 @@ int recv_files(int f_in, struct file_lis

        char *fname, fbuf[MAXPATHLEN];
        char template[MAXPATHLEN];
        char fnametmp[MAXPATHLEN];
        char *fname, fbuf[MAXPATHLEN];
        char template[MAXPATHLEN];
        char fnametmp[MAXPATHLEN];


@@ -148,7 +148,7 @@ command before "make":
        char fnamecmpbuf[MAXPATHLEN];
        struct file_struct *file;
        struct stats initial_stats;
        char fnamecmpbuf[MAXPATHLEN];
        struct file_struct *file;
        struct stats initial_stats;

-@@ -551,7 +552,12 @@ int recv_files(int f_in, struct file_lis
+@@ -555,7 +556,12 @@ int recv_files(int f_in, struct file_lis

  
                cleanup_disable();
  
  
                cleanup_disable();
  


@@ -162,8 +162,8 @@ command before "make":
                        int msgtype = csum_length == SUM_LENGTH || read_batch ?
                                FERROR : FINFO;
                        if (msgtype == FERROR || verbose) {
                        int msgtype = csum_length == SUM_LENGTH || read_batch ?
                                FERROR : FINFO;
                        if (msgtype == FERROR || verbose) {

-@@ -570,9 +576,8 @@ int recv_files(int f_in, struct file_lis
-                                       errstr, fname, keptstr, redostr);
+@@ -575,9 +581,8 @@ int recv_files(int f_in, struct file_lis
+                                       keptstr, redostr);

                        }
                        if (csum_length != SUM_LENGTH) {
 -                              char buf[4];
                        }
                        if (csum_length != SUM_LENGTH) {
 -                              char buf[4];


@@ -214,8 +214,8 @@ command before "make":
  dit(bf(--ignore-errors)) Tells --delete to go ahead and delete files
  even when there are I/O errors.
  
  dit(bf(--ignore-errors)) Tells --delete to go ahead and delete files
  even when there are I/O errors.
  

---- orig/sender.c      2004-07-20 21:36:08
-+++ sender.c   2004-07-16 20:10:19
+--- orig/sender.c      2004-07-26 16:27:00
++++ sender.c   2004-07-26 16:49:19

 @@ -26,6 +26,7 @@ extern int io_error;
  extern int dry_run;
  extern int am_server;
 @@ -26,6 +26,7 @@ extern int io_error;
  extern int dry_run;
  extern int am_server;


@@ -263,10 +263,10 @@ command before "make":
        while (1) {
                unsigned int offset;
  
        while (1) {
                unsigned int offset;
  

-@@ -246,6 +271,9 @@ void send_files(struct file_list *flist,
- 
-               if (verbose > 2)
-                       rprintf(FINFO, "sender finished %s\n", fname);
+@@ -248,6 +273,9 @@ void send_files(struct file_list *flist,
+                       rprintf(FINFO, "sender finished %s\n",
+                               safe_fname(fname));
+               }

 +
 +              /* Flag that we actually sent this entry. */
 +              file->flags |= FLAG_SENT;
 +
 +              /* Flag that we actually sent this entry. */
 +              file->flags |= FLAG_SENT;