Updated to apply cleanly.

diff --git a/ODBC-dblog.diff b/ODBC-dblog.diff
index 86f091d..e82beeb 100644 (file)
--- a/ODBC-dblog.diff
+++ b/ODBC-dblog.diff
@@ -88,7 +88,7 @@ This patch adds the following options:
     automatically generates unique IDs).  Defaults to True.
 
 
     automatically generates unique IDs).  Defaults to True.
 
 

---- orig/Makefile.in   2004-11-03 11:56:03
+--- orig/Makefile.in   2004-11-02 16:47:15

 +++ Makefile.in        2004-07-03 20:22:18
 @@ -32,7 +32,7 @@ ZLIBOBJ=zlib/deflate.o zlib/infblock.o z
        zlib/inflate.o zlib/inftrees.o zlib/infutil.o zlib/trees.o \
 +++ Makefile.in        2004-07-03 20:22:18
 @@ -32,7 +32,7 @@ ZLIBOBJ=zlib/deflate.o zlib/infblock.o z
        zlib/inflate.o zlib/inftrees.o zlib/infutil.o zlib/trees.o \


@@ -99,10 +99,10 @@ This patch adds the following options:
  OBJS2=options.o flist.o io.o compat.o hlink.o token.o uidlist.o socket.o \
        fileio.o batch.o clientname.o
  OBJS3=progress.o pipe.o
  OBJS2=options.o flist.o io.o compat.o hlink.o token.o uidlist.o socket.o \
        fileio.o batch.o clientname.o
  OBJS3=progress.o pipe.o

---- orig/cleanup.c     2005-02-07 20:41:56
+--- orig/cleanup.c     2005-03-05 18:58:38

 +++ cleanup.c  2004-07-03 20:22:18
 +++ cleanup.c  2004-07-03 20:22:18

-@@ -142,8 +142,12 @@ void _exit_cleanup(int code, const char 
-                       code = RERR_VANISHED;
+@@ -144,8 +144,12 @@ void _exit_cleanup(int code, const char 
+                       code = RERR_PARTIAL;

        }
  
 -      if (code)
        }
  
 -      if (code)


@@ -115,7 +115,7 @@ This patch adds the following options:
  
        if (verbose > 2) {
                rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): about to call exit(%d)\n",
  
        if (verbose > 2) {
                rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): about to call exit(%d)\n",

---- orig/clientserver.c        2005-03-01 03:39:47
+--- orig/clientserver.c        2005-03-01 03:39:32

 +++ clientserver.c     2004-07-03 20:22:18
 @@ -351,6 +351,9 @@ static int rsync_module(int f_in, int f_
                   XFLG_ANCHORED2ABS | XFLG_OLD_PREFIXES);
 +++ clientserver.c     2004-07-03 20:22:18
 @@ -351,6 +351,9 @@ static int rsync_module(int f_in, int f_
                   XFLG_ANCHORED2ABS | XFLG_OLD_PREFIXES);


@@ -137,7 +137,7 @@ This patch adds the following options:
                } else {
                        rprintf(FLOG, "rsync %s %s from %s (%s)\n",
                                am_sender ? "on" : "to",
                } else {
                        rprintf(FLOG, "rsync %s %s from %s (%s)\n",
                                am_sender ? "on" : "to",

---- orig/configure.in  2005-03-01 15:57:00
+--- orig/configure.in  2005-03-16 02:19:29.819770817

 +++ configure.in       2004-07-03 20:22:18
 @@ -94,6 +94,8 @@ AC_ARG_WITH(rsync-path,
        [  --with-rsync-path=PATH  set default --rsync-path to PATH (default: rsync)],
 +++ configure.in       2004-07-03 20:22:18
 @@ -94,6 +94,8 @@ AC_ARG_WITH(rsync-path,
        [  --with-rsync-path=PATH  set default --rsync-path to PATH (default: rsync)],


@@ -612,7 +612,7 @@ This patch adds the following options:
 +              rprintf(FERROR,"Error at db_log_exit: Not connected to database!\n");
 +      }
 +}
 +              rprintf(FERROR,"Error at db_log_exit: Not connected to database!\n");
 +      }
 +}

---- orig/loadparm.c    2005-02-20 00:02:23
+--- orig/loadparm.c    2005-02-19 17:38:51

 +++ loadparm.c 2004-07-03 20:22:18
 @@ -125,6 +125,17 @@ typedef struct
        BOOL list;
 +++ loadparm.c 2004-07-03 20:22:18
 @@ -125,6 +125,17 @@ typedef struct
        BOOL list;


@@ -686,9 +686,9 @@ This patch adds the following options:
  FN_LOCAL_BOOL(lp_ignore_errors, ignore_errors)
  FN_LOCAL_BOOL(lp_ignore_nonreadable, ignore_nonreadable)
  FN_LOCAL_STRING(lp_uid, uid)
  FN_LOCAL_BOOL(lp_ignore_errors, ignore_errors)
  FN_LOCAL_BOOL(lp_ignore_nonreadable, ignore_nonreadable)
  FN_LOCAL_STRING(lp_uid, uid)

---- orig/log.c 2005-03-05 00:25:25
+--- orig/log.c 2005-03-16 02:19:30.009754284

 +++ log.c      2004-07-03 20:22:18
 +++ log.c      2004-07-03 20:22:18

-@@ -81,7 +81,7 @@ struct {
+@@ -83,7 +83,7 @@ struct {

  /*
   * Map from rsync error code to name, or return NULL.
   */
  /*
   * Map from rsync error code to name, or return NULL.
   */


@@ -697,7 +697,7 @@ This patch adds the following options:
  {
        int i;
        for (i = 0; rerr_names[i].name; i++) {
  {
        int i;
        for (i = 0; rerr_names[i].name; i++) {

---- orig/main.c        2005-03-05 00:25:25
+--- orig/main.c        2005-03-16 02:19:30.077748367

 +++ main.c     2004-07-03 20:22:18
 @@ -139,6 +139,9 @@ static void report(int f)
  
 +++ main.c     2004-07-03 20:22:18
 @@ -139,6 +139,9 @@ static void report(int f)
  


@@ -709,9 +709,9 @@ This patch adds the following options:
                if (f == -1 || !am_sender)
                        return;
        }
                if (f == -1 || !am_sender)
                        return;
        }

---- orig/receiver.c    2005-03-05 00:25:25
+--- orig/receiver.c    2005-03-16 02:19:30.248733487

 +++ receiver.c 2005-03-05 00:31:00
 +++ receiver.c 2005-03-05 00:31:00

-@@ -568,6 +568,9 @@ int recv_files(int f_in, struct file_lis
+@@ -618,6 +618,9 @@ int recv_files(int f_in, struct file_lis

  
                if (!log_before_transfer)
                        log_item(file, &initial_stats, iflags, NULL);
  
                if (!log_before_transfer)
                        log_item(file, &initial_stats, iflags, NULL);


@@ -721,10 +721,10 @@ This patch adds the following options:
  
                if (fd1 != -1)
                        close(fd1);
  
                if (fd1 != -1)
                        close(fd1);

---- orig/sender.c      2005-03-05 00:25:25
+--- orig/sender.c      2005-03-16 02:19:30.828683018

 +++ sender.c   2005-03-05 00:31:19
 +++ sender.c   2005-03-05 00:31:19

-@@ -323,6 +323,9 @@ void send_files(struct file_list *flist,
-               match_sums(f_out, s, mbuf, st.st_size);
+@@ -351,6 +351,9 @@ void send_files(struct file_list *flist,
+ 

                if (!log_before_transfer)
                        log_item(file, &initial_stats, iflags, NULL);
 +#if HAVE_LIBODBC
                if (!log_before_transfer)
                        log_item(file, &initial_stats, iflags, NULL);
 +#if HAVE_LIBODBC

diff --git a/atimes.diff b/atimes.diff
index 3b821c1..2fdfda2 100644 (file)
--- a/atimes.diff
+++ b/atimes.diff
@@ -4,9 +4,9 @@ command before "make":
     make proto
 
 
     make proto
 
 

---- orig/batch.c       2005-03-01 01:22:58
+--- orig/batch.c       2005-03-16 02:19:29.133830510

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

-@@ -202,6 +202,8 @@ void show_flist(int index, struct file_s
+@@ -197,6 +197,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,9 +15,9 @@ 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       2005-02-26 19:27:54
+--- orig/flist.c       2005-03-16 02:19:29.897764030

 +++ flist.c    2005-02-07 21:06:04
 +++ flist.c    2005-02-07 21:06:04

-@@ -56,6 +56,7 @@ extern int relative_paths;
+@@ -54,6 +54,7 @@ extern int relative_paths;

  extern int implied_dirs;
  extern int copy_links;
  extern int copy_unsafe_links;
  extern int implied_dirs;
  extern int copy_links;
  extern int copy_unsafe_links;


@@ -127,9 +127,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   2005-03-03 02:58:55
+--- orig/generator.c   2005-03-16 02:19:29.980756807

 +++ generator.c        2004-11-03 23:02:12
 +++ generator.c        2004-11-03 23:02:12

-@@ -357,7 +357,7 @@ static int unchanged_file(char *fn, stru
+@@ -373,7 +373,7 @@ static int unchanged_file(char *fn, stru

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


@@ -138,7 +138,7 @@ command before "make":
  }
  
  
  }
  
  

-@@ -808,7 +808,7 @@ static void recv_generator(char *fname, 
+@@ -838,7 +838,7 @@ static void recv_generator(char *fname, 

        }
  
        if (update_only && statret == 0
        }
  
        if (update_only && statret == 0


@@ -147,7 +147,7 @@ command before "make":
                if (verbose > 1)
                        rprintf(FINFO, "%s is newer\n", safe_fname(fname));
                return;
                if (verbose > 1)
                        rprintf(FINFO, "%s is newer\n", safe_fname(fname));
                return;

---- orig/options.c     2005-03-02 09:52:06
+--- orig/options.c     2005-03-16 02:19:30.152741841

 +++ options.c  2005-02-21 10:53:28
 @@ -50,6 +50,7 @@ int preserve_uid = 0;
  int preserve_gid = 0;
 +++ options.c  2005-02-21 10:53:28
 @@ -50,6 +50,7 @@ int preserve_uid = 0;
  int preserve_gid = 0;


@@ -157,7 +157,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;

-@@ -284,6 +285,7 @@ void usage(enum logcode F)
+@@ -285,6 +286,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");


@@ -165,7 +165,7 @@ command before "make":
    rprintf(F," -O, --omit-dir-times        omit directories when preserving times\n");
    rprintf(F," -S, --sparse                handle sparse files efficiently\n");
    rprintf(F," -n, --dry-run               show what would have been transferred\n");
    rprintf(F," -O, --omit-dir-times        omit directories when preserving times\n");
    rprintf(F," -S, --sparse                handle sparse files efficiently\n");
    rprintf(F," -n, --dry-run               show what would have been transferred\n");

-@@ -407,6 +409,7 @@ static struct poptOption long_options[] 
+@@ -409,6 +411,7 @@ static struct poptOption long_options[] 

    {"devices",         'D', POPT_ARG_NONE,   &preserve_devices, 0, 0, 0 },
    {"times",           't', POPT_ARG_NONE,   &preserve_times, 0, 0, 0 },
    {"omit-dir-times",  'O', POPT_ARG_VAL,    &omit_dir_times, 2, 0, 0 },
    {"devices",         'D', POPT_ARG_NONE,   &preserve_devices, 0, 0, 0 },
    {"times",           't', POPT_ARG_NONE,   &preserve_times, 0, 0, 0 },
    {"omit-dir-times",  'O', POPT_ARG_VAL,    &omit_dir_times, 2, 0, 0 },


@@ -173,7 +173,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 },

-@@ -1269,6 +1272,8 @@ void server_options(char **args,int *arg
+@@ -1277,6 +1280,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';


@@ -182,7 +182,7 @@ command before "make":
        if (omit_dir_times == 2 && am_sender)
                argstr[x++] = 'O';
        if (preserve_perms)
        if (omit_dir_times == 2 && am_sender)
                argstr[x++] = 'O';
        if (preserve_perms)

---- orig/rsync.c       2005-02-25 18:44:31
+--- orig/rsync.c       2005-03-16 02:19:30.453715649

 +++ rsync.c    2005-02-21 10:57:03
 @@ -27,6 +27,7 @@ extern int dry_run;
  extern int daemon_log_format_has_i;
 +++ rsync.c    2005-02-21 10:57:03
 @@ -27,6 +27,7 @@ extern int dry_run;
  extern int daemon_log_format_has_i;


@@ -192,7 +192,7 @@ command before "make":
  extern int am_root;
  extern int am_server;
  extern int am_sender;
  extern int am_root;
  extern int am_server;
  extern int am_sender;

-@@ -57,6 +58,7 @@ int set_perms(char *fname,struct file_st
+@@ -56,6 +57,7 @@ int set_perms(char *fname,struct file_st

        int updated = 0;
        STRUCT_STAT st2;
        int change_uid, change_gid;
        int updated = 0;
        STRUCT_STAT st2;
        int change_uid, change_gid;


@@ -200,7 +200,7 @@ command before "make":
  
        if (!st) {
                if (dry_run)
  
        if (!st) {
                if (dry_run)

-@@ -69,17 +71,27 @@ int set_perms(char *fname,struct file_st
+@@ -68,17 +70,27 @@ int set_perms(char *fname,struct file_st

                st = &st2;
        }
  
                st = &st2;
        }
  


@@ -234,7 +234,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       2005-03-03 00:14:56
+--- orig/rsync.h       2005-03-16 02:19:30.524709471

 +++ 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)


@@ -244,7 +244,7 @@ command before "make":
  
  /* These flags are used in the live flist data. */
  
  
  /* These flags are used in the live flist data. */
  

-@@ -116,6 +117,7 @@
+@@ -118,6 +119,7 @@

  
  #define PERMS_REPORT          (1<<0)
  #define PERMS_SKIP_MTIME      (1<<1)
  
  #define PERMS_REPORT          (1<<0)
  #define PERMS_SKIP_MTIME      (1<<1)


@@ -252,7 +252,7 @@ command before "make":
  
  #define FULL_FLUSH    1
  #define NORMAL_FLUSH  0
  
  #define FULL_FLUSH    1
  #define NORMAL_FLUSH  0

-@@ -501,6 +503,7 @@ struct file_struct {
+@@ -510,6 +512,7 @@ struct file_struct {

                struct hlink *links;
        } link_u;
        time_t modtime;
                struct hlink *links;
        } link_u;
        time_t modtime;


@@ -260,7 +260,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      2005-03-03 02:23:27
+--- orig/rsync.yo      2005-03-16 02:19:30.727691806

 +++ rsync.yo   2005-01-24 01:57:18
 @@ -321,6 +321,7 @@ to the detailed description below for a 
   -D, --devices               preserve devices (root only)
 +++ rsync.yo   2005-01-24 01:57:18
 @@ -321,6 +321,7 @@ to the detailed description below for a 
   -D, --devices               preserve devices (root only)


@@ -270,7 +270,7 @@ command before "make":
   -S, --sparse                handle sparse files efficiently
   -n, --dry-run               show what would have been transferred
   -W, --whole-file            copy files whole (without rsync algorithm)
   -S, --sparse                handle sparse files efficiently
   -n, --dry-run               show what would have been transferred
   -W, --whole-file            copy files whole (without rsync algorithm)

-@@ -653,6 +654,11 @@ it is preserving modification times (see
+@@ -654,6 +655,11 @@ it is preserving modification times (see

  the directories on the receiving side, it is a good idea to use bf(-O).
  This option is inferred if you use bf(--backup) without bf(--backup-dir).
  
  the directories on the receiving side, it is a good idea to use bf(-O).
  This option is inferred if you use bf(--backup) without bf(--backup-dir).
  


@@ -304,7 +304,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   2005-02-21 07:29:00
+--- orig/testsuite/rsync.fns   2005-02-21 07:26:59

 +++ testsuite/rsync.fns        2005-02-21 07:30:11
 @@ -50,7 +50,7 @@ printmsg() {
  
 +++ testsuite/rsync.fns        2005-02-21 07:30:11
 @@ -50,7 +50,7 @@ printmsg() {
  


@@ -332,7 +332,7 @@ command before "make":
      ( cd "$3" && rsync_ls_lR . ) > "$tmpdir/ls-to"
      diff $diffopt "$tmpdir/ls-from" "$tmpdir/ls-to" || failed=YES
  
      ( cd "$3" && rsync_ls_lR . ) > "$tmpdir/ls-to"
      diff $diffopt "$tmpdir/ls-from" "$tmpdir/ls-to" || failed=YES
  

---- orig/tls.c 2005-01-19 20:11:10
+--- orig/tls.c 2005-01-19 19:30:29

 +++ tls.c      2004-07-03 20:15:41
 @@ -39,6 +39,7 @@
  
 +++ tls.c      2004-07-03 20:15:41
 @@ -39,6 +39,7 @@
  


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

---- orig/util.c        2005-02-23 02:57:27
+--- orig/util.c        2005-03-11 17:36:35

 +++ util.c     2005-02-07 21:09:12
 @@ -128,12 +128,17 @@ void overflow(char *str)
  
 +++ util.c     2005-02-07 21:09:12
 @@ -128,12 +128,17 @@ void overflow(char *str)
  


@@ -513,7 +513,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;

-@@ -1145,8 +1150,8 @@ int msleep(int t)
+@@ -1146,8 +1151,8 @@ int msleep(int t)

  
  
  /**
  
  
  /**


@@ -524,7 +524,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

-@@ -1155,7 +1160,7 @@ int msleep(int t)
+@@ -1156,7 +1161,7 @@ int msleep(int t)

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

diff --git a/backup-dir-dels.diff b/backup-dir-dels.diff
index 3fde3d2..5a963a1 100644 (file)
--- a/backup-dir-dels.diff
+++ b/backup-dir-dels.diff
@@ -106,9 +106,9 @@ Marc St-Onge
 +      deleting = 0;
 +      return ret;
 +}
 +      deleting = 0;
 +      return ret;
 +}

---- orig/generator.c   2005-03-09 23:46:28
+--- orig/generator.c   2005-03-16 02:19:29.980756807

 +++ generator.c        2005-03-11 11:22:38
 +++ generator.c        2005-03-11 11:22:38

-@@ -83,6 +83,9 @@ extern dev_t filesystem_dev;
+@@ -84,6 +84,9 @@ extern dev_t filesystem_dev;

  extern char *backup_dir;
  extern char *backup_suffix;
  extern int backup_suffix_len;
  extern char *backup_dir;
  extern char *backup_suffix;
  extern int backup_suffix_len;


@@ -118,7 +118,7 @@ Marc St-Onge
  extern struct file_list *the_file_list;
  extern struct filter_list_struct server_filter_list;
  
  extern struct file_list *the_file_list;
  extern struct filter_list_struct server_filter_list;
  

-@@ -91,10 +94,14 @@ int allowed_lull = 0;
+@@ -92,10 +95,14 @@ int allowed_lull = 0;

  static int deletion_count = 0; /* used to implement --max-delete */
  
  
  static int deletion_count = 0; /* used to implement --max-delete */
  
  


@@ -134,7 +134,7 @@ Marc St-Onge
  }
  
  
  }
  
  

-@@ -111,8 +118,8 @@ static int delete_item(char *fname, int 
+@@ -112,8 +119,8 @@ static int delete_item(char *fname, int 

        if (!S_ISDIR(mode)) {
                if (max_delete && ++deletion_count > max_delete)
                        return 0;
        if (!S_ISDIR(mode)) {
                if (max_delete && ++deletion_count > max_delete)
                        return 0;


@@ -145,7 +145,7 @@ Marc St-Onge
                else
                        ok = robust_unlink(fname) == 0;
                if (ok) {
                else
                        ok = robust_unlink(fname) == 0;
                if (ok) {

-@@ -135,9 +142,9 @@ static int delete_item(char *fname, int 
+@@ -136,9 +143,9 @@ static int delete_item(char *fname, int 

            || (dry_run && zap_dir)) {
                ok = 0;
                errno = ENOTEMPTY;
            || (dry_run && zap_dir)) {
                ok = 0;
                errno = ENOTEMPTY;


@@ -157,7 +157,7 @@ Marc St-Onge
        else
                ok = do_rmdir(fname) == 0;
        if (ok) {
        else
                ok = do_rmdir(fname) == 0;
        if (ok) {

---- orig/options.c     2005-03-09 18:53:53
+--- orig/options.c     2005-03-16 02:19:30.152741841

 +++ options.c  2005-03-01 01:25:39
 @@ -127,10 +127,14 @@ int no_detach
  int write_batch = 0;
 +++ options.c  2005-03-01 01:25:39
 @@ -127,10 +127,14 @@ int no_detach
  int write_batch = 0;


@@ -183,8 +183,8 @@ Marc St-Onge
 +char backup_dir_dels_buf[MAXPATHLEN];
  int rsync_port = 0;
  int compare_dest = 0;
 +char backup_dir_dels_buf[MAXPATHLEN];
  int rsync_port = 0;
  int compare_dest = 0;

- int link_dest = 0;
-@@ -270,6 +276,8 @@ void usage(enum logcode F)
+ int copy_dest = 0;
+@@ -271,6 +277,8 @@ void usage(enum logcode F)

    rprintf(F," -b, --backup                make backups (see --suffix & --backup-dir)\n");
    rprintf(F,"     --backup-dir=DIR        make backups into hierarchy based in DIR\n");
    rprintf(F,"     --suffix=SUFFIX         set backup suffix (default %s w/o --backup-dir)\n",BACKUP_SUFFIX);
    rprintf(F," -b, --backup                make backups (see --suffix & --backup-dir)\n");
    rprintf(F,"     --backup-dir=DIR        make backups into hierarchy based in DIR\n");
    rprintf(F,"     --suffix=SUFFIX         set backup suffix (default %s w/o --backup-dir)\n",BACKUP_SUFFIX);


@@ -193,7 +193,7 @@ Marc St-Onge
    rprintf(F," -u, --update                skip files that are newer on the receiver\n");
    rprintf(F,"     --inplace               update destination files in-place (SEE MAN PAGE)\n");
    rprintf(F," -d, --dirs                  transfer directories without recursing\n");
    rprintf(F," -u, --update                skip files that are newer on the receiver\n");
    rprintf(F,"     --inplace               update destination files in-place (SEE MAN PAGE)\n");
    rprintf(F," -d, --dirs                  transfer directories without recursing\n");

-@@ -364,6 +372,7 @@ static struct poptOption long_options[] 
+@@ -366,6 +374,7 @@ static struct poptOption long_options[] 

    /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
    {"version",          0,  POPT_ARG_NONE,   0, OPT_VERSION, 0, 0},
    {"suffix",           0,  POPT_ARG_STRING, &backup_suffix, 0, 0, 0 },
    /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
    {"version",          0,  POPT_ARG_NONE,   0, OPT_VERSION, 0, 0},
    {"suffix",           0,  POPT_ARG_STRING, &backup_suffix, 0, 0, 0 },


@@ -201,7 +201,7 @@ Marc St-Onge
    {"rsync-path",       0,  POPT_ARG_STRING, &rsync_path, 0, 0, 0 },
    {"password-file",    0,  POPT_ARG_STRING, &password_file, 0, 0, 0 },
    {"ignore-times",    'I', POPT_ARG_NONE,   &ignore_times, 0, 0, 0 },
    {"rsync-path",       0,  POPT_ARG_STRING, &rsync_path, 0, 0, 0 },
    {"password-file",    0,  POPT_ARG_STRING, &password_file, 0, 0, 0 },
    {"ignore-times",    'I', POPT_ARG_NONE,   &ignore_times, 0, 0, 0 },

-@@ -443,6 +452,7 @@ static struct poptOption long_options[] 
+@@ -446,6 +455,7 @@ static struct poptOption long_options[] 

    {"itemize-changes", 'i', POPT_ARG_NONE,   &itemize_changes, 0, 0, 0 },
    {"bwlimit",          0,  POPT_ARG_INT,    &bwlimit, 0, 0, 0 },
    {"backup-dir",       0,  POPT_ARG_STRING, &backup_dir, 0, 0, 0 },
    {"itemize-changes", 'i', POPT_ARG_NONE,   &itemize_changes, 0, 0, 0 },
    {"bwlimit",          0,  POPT_ARG_INT,    &bwlimit, 0, 0, 0 },
    {"backup-dir",       0,  POPT_ARG_STRING, &backup_dir, 0, 0, 0 },


@@ -209,7 +209,7 @@ Marc St-Onge
    {"hard-links",      'H', POPT_ARG_NONE,   &preserve_hard_links, 0, 0, 0 },
    {"read-batch",       0,  POPT_ARG_STRING, &batch_name, OPT_READ_BATCH, 0, 0 },
    {"write-batch",      0,  POPT_ARG_STRING, &batch_name, OPT_WRITE_BATCH, 0, 0 },
    {"hard-links",      'H', POPT_ARG_NONE,   &preserve_hard_links, 0, 0, 0 },
    {"read-batch",       0,  POPT_ARG_STRING, &batch_name, OPT_READ_BATCH, 0, 0 },
    {"write-batch",      0,  POPT_ARG_STRING, &batch_name, OPT_WRITE_BATCH, 0, 0 },

-@@ -1004,6 +1014,8 @@ int parse_arguments(int *argc, const cha
+@@ -1012,6 +1022,8 @@ int parse_arguments(int *argc, const cha

                        partial_dir = sanitize_path(NULL, partial_dir, NULL, 0);
                if (backup_dir)
                        backup_dir = sanitize_path(NULL, backup_dir, NULL, 0);
                        partial_dir = sanitize_path(NULL, partial_dir, NULL, 0);
                if (backup_dir)
                        backup_dir = sanitize_path(NULL, backup_dir, NULL, 0);


@@ -218,7 +218,7 @@ Marc St-Onge
        }
        if (server_filter_list.head && !am_sender) {
                struct filter_list_struct *elp = &server_filter_list;
        }
        if (server_filter_list.head && !am_sender) {
                struct filter_list_struct *elp = &server_filter_list;

-@@ -1038,6 +1050,14 @@ int parse_arguments(int *argc, const cha
+@@ -1046,6 +1058,14 @@ int parse_arguments(int *argc, const cha

                                return 0;
                        }
                }
                                return 0;
                        }
                }


@@ -233,7 +233,7 @@ Marc St-Onge
        }
  
        if (!backup_suffix)
        }
  
        if (!backup_suffix)

-@@ -1049,6 +1069,16 @@ int parse_arguments(int *argc, const cha
+@@ -1057,6 +1077,16 @@ int parse_arguments(int *argc, const cha

                        backup_suffix);
                return 0;
        }
                        backup_suffix);
                return 0;
        }


@@ -250,7 +250,7 @@ Marc St-Onge
        if (backup_dir) {
                backup_dir_len = strlcpy(backup_dir_buf, backup_dir, sizeof backup_dir_buf);
                backup_dir_remainder = sizeof backup_dir_buf - backup_dir_len;
        if (backup_dir) {
                backup_dir_len = strlcpy(backup_dir_buf, backup_dir, sizeof backup_dir_buf);
                backup_dir_remainder = sizeof backup_dir_buf - backup_dir_len;

-@@ -1070,6 +1100,31 @@ int parse_arguments(int *argc, const cha
+@@ -1078,6 +1108,31 @@ int parse_arguments(int *argc, const cha

                        "--suffix cannot be a null string without --backup-dir\n");
                return 0;
        }
                        "--suffix cannot be a null string without --backup-dir\n");
                return 0;
        }


@@ -282,7 +282,7 @@ Marc St-Onge
        if (make_backups && !backup_dir)
                omit_dir_times = 1;
  
        if (make_backups && !backup_dir)
                omit_dir_times = 1;
  

-@@ -1348,6 +1403,10 @@ void server_options(char **args,int *arg
+@@ -1356,6 +1411,10 @@ void server_options(char **args,int *arg

                args[ac++] = "--backup-dir";
                args[ac++] = backup_dir;
        }
                args[ac++] = "--backup-dir";
                args[ac++] = backup_dir;
        }


@@ -293,7 +293,7 @@ Marc St-Onge
  
        /* Only send --suffix if it specifies a non-default value. */
        if (strcmp(backup_suffix, backup_dir ? "" : BACKUP_SUFFIX) != 0) {
  
        /* Only send --suffix if it specifies a non-default value. */
        if (strcmp(backup_suffix, backup_dir ? "" : BACKUP_SUFFIX) != 0) {

-@@ -1356,7 +1415,13 @@ void server_options(char **args,int *arg
+@@ -1364,7 +1423,13 @@ void server_options(char **args,int *arg

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

diff --git a/chmod-option.diff b/chmod-option.diff
index 8ec27c3..53665c1 100644 (file)
--- a/chmod-option.diff
+++ b/chmod-option.diff
@@ -4,7 +4,7 @@ command before "make":
     make proto
 
 
     make proto
 
 

---- orig/Makefile.in   2004-11-03 11:56:03
+--- orig/Makefile.in   2004-11-02 16:47:15

 +++ Makefile.in        2004-07-03 20:13:41
 @@ -34,7 +34,7 @@ ZLIBOBJ=zlib/deflate.o zlib/infblock.o z
  OBJS1=rsync.o generator.o receiver.o cleanup.o sender.o exclude.o util.o \
 +++ Makefile.in        2004-07-03 20:13:41
 @@ -34,7 +34,7 @@ ZLIBOBJ=zlib/deflate.o zlib/infblock.o z
  OBJS1=rsync.o generator.o receiver.o cleanup.o sender.o exclude.o util.o \


@@ -202,9 +202,9 @@ command before "make":
 +      }
 +      return 0;
 +}
 +      }
 +      return 0;
 +}

---- orig/flist.c       2005-02-26 19:27:54
+--- orig/flist.c       2005-03-16 02:19:29.897764030

 +++ flist.c    2004-09-18 01:51:11
 +++ flist.c    2004-09-18 01:51:11

-@@ -62,6 +62,8 @@ extern int orig_umask;
+@@ -62,6 +62,8 @@ extern struct file_list *the_file_list;

  
  extern char curr_dir[MAXPATHLEN];
  
  
  extern char curr_dir[MAXPATHLEN];
  


@@ -225,7 +225,7 @@ command before "make":
        file->uid = st.st_uid;
        file->gid = st.st_gid;
  
        file->uid = st.st_uid;
        file->gid = st.st_gid;
  

---- orig/options.c     2005-03-01 05:49:24
+--- orig/options.c     2005-03-16 02:19:30.152741841

 +++ options.c  2005-03-01 01:26:56
 @@ -140,6 +140,7 @@ char *log_format = NULL;
  char *password_file = NULL;
 +++ options.c  2005-03-01 01:26:56
 @@ -140,6 +140,7 @@ char *log_format = NULL;
  char *password_file = NULL;


@@ -235,7 +235,7 @@ command before "make":
  char backup_dir_buf[MAXPATHLEN];
  int rsync_port = 0;
  int compare_dest = 0;
  char backup_dir_buf[MAXPATHLEN];
  int rsync_port = 0;
  int compare_dest = 0;

-@@ -158,6 +159,8 @@ int list_only = 0;
+@@ -160,6 +161,8 @@ int list_only = 0;

  #define MAX_BATCH_NAME_LEN 256        /* Must be less than MAXPATHLEN-13 */
  char *batch_name = NULL;
  
  #define MAX_BATCH_NAME_LEN 256        /* Must be less than MAXPATHLEN-13 */
  char *batch_name = NULL;
  


@@ -244,7 +244,7 @@ command before "make":
  static int daemon_opt;   /* sets am_daemon after option error-reporting */
  static int F_option_cnt = 0;
  static int modify_window_set;
  static int daemon_opt;   /* sets am_daemon after option error-reporting */
  static int F_option_cnt = 0;
  static int modify_window_set;

-@@ -285,6 +288,7 @@ void usage(enum logcode F)
+@@ -286,6 +289,7 @@ void usage(enum logcode F)

    rprintf(F," -D, --devices               preserve devices (root only)\n");
    rprintf(F," -t, --times                 preserve times\n");
    rprintf(F," -O, --omit-dir-times        omit directories when preserving times\n");
    rprintf(F," -D, --devices               preserve devices (root only)\n");
    rprintf(F," -t, --times                 preserve times\n");
    rprintf(F," -O, --omit-dir-times        omit directories when preserving times\n");


@@ -252,7 +252,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 files whole (without rsync algorithm)\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 files whole (without rsync algorithm)\n");

-@@ -404,6 +408,7 @@ static struct poptOption long_options[] 
+@@ -406,6 +410,7 @@ static struct poptOption long_options[] 

    {"perms",           'p', POPT_ARG_NONE,   &preserve_perms, 0, 0, 0 },
    {"owner",           'o', POPT_ARG_NONE,   &preserve_uid, 0, 0, 0 },
    {"group",           'g', POPT_ARG_NONE,   &preserve_gid, 0, 0, 0 },
    {"perms",           'p', POPT_ARG_NONE,   &preserve_perms, 0, 0, 0 },
    {"owner",           'o', POPT_ARG_NONE,   &preserve_uid, 0, 0, 0 },
    {"group",           'g', POPT_ARG_NONE,   &preserve_gid, 0, 0, 0 },


@@ -260,7 +260,7 @@ command before "make":
    {"devices",         'D', POPT_ARG_NONE,   &preserve_devices, 0, 0, 0 },
    {"times",           't', POPT_ARG_NONE,   &preserve_times, 0, 0, 0 },
    {"omit-dir-times",  'O', POPT_ARG_VAL,    &omit_dir_times, 2, 0, 0 },
    {"devices",         'D', POPT_ARG_NONE,   &preserve_devices, 0, 0, 0 },
    {"times",           't', POPT_ARG_NONE,   &preserve_times, 0, 0, 0 },
    {"omit-dir-times",  'O', POPT_ARG_VAL,    &omit_dir_times, 2, 0, 0 },

-@@ -1073,6 +1078,13 @@ int parse_arguments(int *argc, const cha
+@@ -1081,6 +1086,13 @@ int parse_arguments(int *argc, const cha

        if (make_backups && !backup_dir)
                omit_dir_times = 1;
  
        if (make_backups && !backup_dir)
                omit_dir_times = 1;
  


@@ -274,7 +274,7 @@ command before "make":
        if (log_format) {
                if (strstr(log_format, "%i") != NULL)
                        log_format_has_i = 1;
        if (log_format) {
                if (strstr(log_format, "%i") != NULL)
                        log_format_has_i = 1;

-@@ -1435,6 +1447,11 @@ void server_options(char **args,int *arg
+@@ -1443,6 +1455,11 @@ void server_options(char **args,int *arg

                }
        }
  
                }
        }
  


@@ -286,9 +286,9 @@ command before "make":
        if (files_from && (!am_sender || filesfrom_host)) {
                if (filesfrom_host) {
                        args[ac++] = "--files-from";
        if (files_from && (!am_sender || filesfrom_host)) {
                if (filesfrom_host) {
                        args[ac++] = "--files-from";

---- orig/rsync.yo      2005-03-01 01:22:59
+--- orig/rsync.yo      2005-03-16 02:19:30.727691806

 +++ rsync.yo   2005-01-24 01:48:43
 +++ rsync.yo   2005-01-24 01:48:43

-@@ -322,6 +322,7 @@ to the detailed description below for a 
+@@ -321,6 +321,7 @@ to the detailed description below for a 

   -D, --devices               preserve devices (root only)
   -t, --times                 preserve times
   -O, --omit-dir-times        omit directories when preserving times
   -D, --devices               preserve devices (root only)
   -t, --times                 preserve times
   -O, --omit-dir-times        omit directories when preserving times

diff --git a/date-only.diff b/date-only.diff
index a938cad..fc810fb 100644 (file)
--- a/date-only.diff
+++ b/date-only.diff
@@ -15,7 +15,7 @@ Jeremy Bornstein
 
 [Patched update to have context and apply to latest CVS source.]
 
 
 [Patched update to have context and apply to latest CVS source.]
 

---- orig/generator.c   2005-02-27 18:24:42
+--- orig/generator.c   2005-03-16 02:19:29.980756807

 +++ generator.c        2004-11-11 22:15:27
 @@ -54,6 +54,7 @@ extern int inplace;
  extern int make_backups;
 +++ generator.c        2004-11-11 22:15:27
 @@ -54,6 +54,7 @@ extern int inplace;
  extern int make_backups;


@@ -25,7 +25,7 @@ Jeremy Bornstein
  extern int size_only;
  extern OFF_T max_size;
  extern int io_timeout;
  extern int size_only;
  extern OFF_T max_size;
  extern int io_timeout;

-@@ -346,6 +347,8 @@ static void itemize(struct file_struct *
+@@ -355,6 +356,8 @@ void itemize(struct file_struct *file, i

  /* Perform our quick-check heuristic for determining if a file is unchanged. */
  static int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st)
  {
  /* Perform our quick-check heuristic for determining if a file is unchanged. */
  static int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st)
  {


@@ -34,7 +34,7 @@ Jeremy Bornstein
        if (st->st_size != file->length)
                return 0;
  
        if (st->st_size != file->length)
                return 0;
  

---- orig/options.c     2005-03-01 05:49:24
+--- orig/options.c     2005-03-16 02:19:30.152741841

 +++ options.c  2005-01-28 19:14:15
 @@ -89,6 +89,7 @@ int keep_partial = 0;
  int safe_symlinks = 0;
 +++ options.c  2005-01-28 19:14:15
 @@ -89,6 +89,7 @@ int keep_partial = 0;
  int safe_symlinks = 0;


@@ -44,7 +44,7 @@ Jeremy Bornstein
  int daemon_bwlimit = 0;
  int bwlimit = 0;
  int fuzzy_basis = 0;
  int daemon_bwlimit = 0;
  int bwlimit = 0;
  int fuzzy_basis = 0;

-@@ -313,6 +314,7 @@ void usage(enum logcode F)
+@@ -314,6 +315,7 @@ void usage(enum logcode F)

    rprintf(F,"     --timeout=TIME          set I/O timeout in seconds\n");
    rprintf(F," -I, --ignore-times          don't skip files that match in size and mod-time\n");
    rprintf(F,"     --size-only             skip files that match in size\n");
    rprintf(F,"     --timeout=TIME          set I/O timeout in seconds\n");
    rprintf(F," -I, --ignore-times          don't skip files that match in size and mod-time\n");
    rprintf(F,"     --size-only             skip files that match in size\n");


@@ -52,7 +52,7 @@ Jeremy Bornstein
    rprintf(F,"     --modify-window=NUM     compare mod-times with reduced accuracy\n");
    rprintf(F," -T, --temp-dir=DIR          create temporary files in directory DIR\n");
    rprintf(F," -y, --fuzzy                 find similar file for basis if no dest file\n");
    rprintf(F,"     --modify-window=NUM     compare mod-times with reduced accuracy\n");
    rprintf(F," -T, --temp-dir=DIR          create temporary files in directory DIR\n");
    rprintf(F," -y, --fuzzy                 find similar file for basis if no dest file\n");

-@@ -368,6 +370,7 @@ static struct poptOption long_options[] 
+@@ -370,6 +372,7 @@ static struct poptOption long_options[] 

    {"password-file",    0,  POPT_ARG_STRING, &password_file, 0, 0, 0 },
    {"ignore-times",    'I', POPT_ARG_NONE,   &ignore_times, 0, 0, 0 },
    {"size-only",        0,  POPT_ARG_NONE,   &size_only, 0, 0, 0 },
    {"password-file",    0,  POPT_ARG_STRING, &password_file, 0, 0, 0 },
    {"ignore-times",    'I', POPT_ARG_NONE,   &ignore_times, 0, 0, 0 },
    {"size-only",        0,  POPT_ARG_NONE,   &size_only, 0, 0, 0 },


@@ -60,7 +60,7 @@ Jeremy Bornstein
    {"modify-window",    0,  POPT_ARG_INT,    &modify_window, OPT_MODIFY_WINDOW, 0, 0 },
    {"one-file-system", 'x', POPT_ARG_NONE,   &one_file_system, 0, 0, 0 },
    {"existing",         0,  POPT_ARG_NONE,   &only_existing, 0, 0, 0 },
    {"modify-window",    0,  POPT_ARG_INT,    &modify_window, OPT_MODIFY_WINDOW, 0, 0 },
    {"one-file-system", 'x', POPT_ARG_NONE,   &one_file_system, 0, 0, 0 },
    {"existing",         0,  POPT_ARG_NONE,   &only_existing, 0, 0, 0 },

-@@ -1375,6 +1378,9 @@ void server_options(char **args,int *arg
+@@ -1383,6 +1386,9 @@ void server_options(char **args,int *arg

        if (size_only)
                args[ac++] = "--size-only";
  
        if (size_only)
                args[ac++] = "--size-only";
  


@@ -70,9 +70,9 @@ Jeremy Bornstein
        if (modify_window_set) {
                if (asprintf(&arg, "--modify-window=%d", modify_window) < 0)
                        goto oom;
        if (modify_window_set) {
                if (asprintf(&arg, "--modify-window=%d", modify_window) < 0)
                        goto oom;

---- orig/rsync.yo      2005-03-01 01:22:59
+--- orig/rsync.yo      2005-03-16 02:19:30.727691806

 +++ rsync.yo   2005-02-11 22:49:10
 +++ rsync.yo   2005-02-11 22:49:10

-@@ -350,6 +350,7 @@ to the detailed description below for a 
+@@ -349,6 +349,7 @@ to the detailed description below for a 

       --timeout=TIME          set I/O timeout in seconds
   -I, --ignore-times          don't skip files that match size and time
       --size-only             skip files that match in size
       --timeout=TIME          set I/O timeout in seconds
   -I, --ignore-times          don't skip files that match size and time
       --size-only             skip files that match in size

diff --git a/fname-convert.diff b/fname-convert.diff
index 7980cbf..9c6d589 100644 (file)
--- a/fname-convert.diff
+++ b/fname-convert.diff
@@ -77,9 +77,9 @@ Note that you'll need to run 'make proto' after applying this patch.
        if (cleanup_fname)
                do_unlink(cleanup_fname);
        if (code)
        if (cleanup_fname)
                do_unlink(cleanup_fname);
        if (code)

---- orig/errcode.h     2005-03-05 18:58:32
+--- orig/errcode.h     2005-03-16 02:19:29.823770469

 +++ errcode.h  2004-07-02 21:38:59
 +++ errcode.h  2004-07-02 21:38:59

-@@ -34,6 +34,7 @@
+@@ -35,6 +35,7 @@

  #define RERR_STREAMIO   12      /* error in rsync protocol data stream */
  #define RERR_MESSAGEIO  13      /* errors with program diagnostics */
  #define RERR_IPC        14      /* error in IPC code */
  #define RERR_STREAMIO   12      /* error in rsync protocol data stream */
  #define RERR_MESSAGEIO  13      /* errors with program diagnostics */
  #define RERR_IPC        14      /* error in IPC code */


@@ -87,7 +87,7 @@ Note that you'll need to run 'make proto' after applying this patch.
  
  #define RERR_SIGNAL     20      /* status returned when sent SIGUSR1, SIGINT */
  #define RERR_WAITCHILD  21      /* some error returned by waitpid() */
  
  #define RERR_SIGNAL     20      /* status returned when sent SIGUSR1, SIGINT */
  #define RERR_WAITCHILD  21      /* some error returned by waitpid() */

---- orig/flist.c       2005-03-03 18:44:42
+--- orig/flist.c       2005-03-16 02:19:29.897764030

 +++ flist.c    2005-03-05 00:29:08
 @@ -57,6 +57,7 @@ extern int copy_unsafe_links;
  extern int protocol_version;
 +++ flist.c    2005-03-05 00:29:08
 @@ -57,6 +57,7 @@ extern int copy_unsafe_links;
  extern int protocol_version;


@@ -119,7 +119,7 @@ Note that you'll need to run 'make proto' after applying this patch.
        clean_fname(thisname, 0);
  
        if (sanitize_paths)
        clean_fname(thisname, 0);
  
        if (sanitize_paths)

-@@ -1071,6 +1078,9 @@ struct file_list *send_file_list(int f, 
+@@ -1081,6 +1088,9 @@ struct file_list *send_file_list(int f, 

        start_write = stats.total_written;
        gettimeofday(&start_tv, NULL);
  
        start_write = stats.total_written;
        gettimeofday(&start_tv, NULL);
  


@@ -129,7 +129,7 @@ Note that you'll need to run 'make proto' after applying this patch.
        flist = flist_new(WITH_HLINK, "send_file_list");
  
        io_start_buffering_out();
        flist = flist_new(WITH_HLINK, "send_file_list");
  
        io_start_buffering_out();

-@@ -1253,6 +1263,9 @@ struct file_list *send_file_list(int f, 
+@@ -1265,6 +1275,9 @@ struct file_list *send_file_list(int f, 

        stats.flist_size = stats.total_written - start_write;
        stats.num_files = flist->count;
  
        stats.flist_size = stats.total_written - start_write;
        stats.num_files = flist->count;
  


@@ -139,7 +139,7 @@ Note that you'll need to run 'make proto' after applying this patch.
        if (verbose > 3)
                output_flist(flist);
  
        if (verbose > 3)
                output_flist(flist);
  

-@@ -1274,6 +1287,9 @@ struct file_list *recv_file_list(int f)
+@@ -1286,6 +1299,9 @@ struct file_list *recv_file_list(int f)

  
        start_read = stats.total_read;
  
  
        start_read = stats.total_read;
  


@@ -149,7 +149,7 @@ Note that you'll need to run 'make proto' after applying this patch.
        flist = flist_new(WITH_HLINK, "recv_file_list");
  
        flist->count = 0;
        flist = flist_new(WITH_HLINK, "recv_file_list");
  
        flist->count = 0;

-@@ -1326,6 +1342,9 @@ struct file_list *recv_file_list(int f)
+@@ -1338,6 +1354,9 @@ struct file_list *recv_file_list(int f)

                        io_error |= read_int(f);
        }
  
                        io_error |= read_int(f);
        }
  


@@ -382,9 +382,9 @@ Note that you'll need to run 'make proto' after applying this patch.
 +      if (verbose > 2)
 +              rprintf(FINFO, "Converted filename: %s -> %s\n", src, dest);
 +}
 +      if (verbose > 2)
 +              rprintf(FINFO, "Converted filename: %s -> %s\n", src, dest);
 +}

---- orig/generator.c   2005-03-11 17:36:35.384170106
+--- orig/generator.c   2005-03-16 02:19:29.980756807

 +++ generator.c        2005-03-05 00:29:37
 +++ generator.c        2005-03-05 00:29:37

-@@ -579,7 +579,13 @@ static int phase = 0;
+@@ -581,7 +581,13 @@ static int phase = 0;

   * start sending checksums.
   *
   * Note that f_out is set to -1 when doing final directory-permission and
   * start sending checksums.
   *
   * Note that f_out is set to -1 when doing final directory-permission and


@@ -399,9 +399,9 @@ Note that you'll need to run 'make proto' after applying this patch.
  static void recv_generator(char *fname, struct file_struct *file, int ndx,
                           int itemizing, int maybe_PERMS_REPORT,
                           enum logcode code, int f_out)
  static void recv_generator(char *fname, struct file_struct *file, int ndx,
                           int itemizing, int maybe_PERMS_REPORT,
                           enum logcode code, int f_out)

---- orig/log.c 2005-03-09 18:53:58
+--- orig/log.c 2005-03-16 02:19:30.009754284

 +++ log.c      2004-07-03 20:18:02
 +++ log.c      2004-07-03 20:18:02

-@@ -63,6 +63,7 @@ struct {
+@@ -64,6 +64,7 @@ struct {

        { RERR_STREAMIO   , "error in rsync protocol data stream" },
        { RERR_MESSAGEIO  , "errors with program diagnostics" },
        { RERR_IPC        , "error in IPC code" },
        { RERR_STREAMIO   , "error in rsync protocol data stream" },
        { RERR_MESSAGEIO  , "errors with program diagnostics" },
        { RERR_IPC        , "error in IPC code" },


@@ -409,7 +409,7 @@ Note that you'll need to run 'make proto' after applying this patch.
        { RERR_SIGNAL     , "received SIGUSR1 or SIGINT" },
        { RERR_WAITCHILD  , "some error returned by waitpid()" },
        { RERR_MALLOC     , "error allocating core memory buffers" },
        { RERR_SIGNAL     , "received SIGUSR1 or SIGINT" },
        { RERR_WAITCHILD  , "some error returned by waitpid()" },
        { RERR_MALLOC     , "error allocating core memory buffers" },

---- orig/main.c        2005-03-09 18:54:09
+--- orig/main.c        2005-03-16 02:19:30.077748367

 +++ main.c     2004-07-22 00:31:47
 @@ -363,7 +363,7 @@ static pid_t do_cmd(char *cmd, char *mac
                        whole_file = 1;
 +++ main.c     2004-07-22 00:31:47
 @@ -363,7 +363,7 @@ static pid_t do_cmd(char *cmd, char *mac
                        whole_file = 1;


@@ -420,7 +420,7 @@ Note that you'll need to run 'make proto' after applying this patch.
  
        if (dir)
                free(dir);
  
        if (dir)
                free(dir);

---- orig/options.c     2005-03-11 17:36:35.507159655
+--- orig/options.c     2005-03-16 02:19:30.152741841

 +++ options.c  2005-02-14 02:50:32
 @@ -137,6 +137,7 @@ char *basis_dir[MAX_BASIS_DIRS+1];
  char *config_file = NULL;
 +++ options.c  2005-02-14 02:50:32
 @@ -137,6 +137,7 @@ char *basis_dir[MAX_BASIS_DIRS+1];
  char *config_file = NULL;


@@ -514,7 +514,7 @@ Note that you'll need to run 'make proto' after applying this patch.
 +
 +      return result;
 +}
 +
 +      return result;
 +}

---- orig/util.c        2005-03-11 17:36:35.798134929
+--- orig/util.c        2005-03-11 17:36:35

 +++ util.c     2004-07-03 20:18:02
 @@ -1328,3 +1328,55 @@ uint32 fuzzy_distance(const char *s1, in
  
 +++ util.c     2004-07-03 20:18:02
 @@ -1328,3 +1328,55 @@ uint32 fuzzy_distance(const char *s1, in
  

diff --git a/fsync.diff b/fsync.diff
index e3817d0..ec5f269 100644 (file)
--- a/fsync.diff
+++ b/fsync.diff
@@ -1,7 +1,7 @@
 This patch from Sami Farin lets you specify --fsync if you want fsync()
 to be called on every file we write.
 
 This patch from Sami Farin lets you specify --fsync if you want fsync()
 to be called on every file we write.
 

---- orig/options.c     2005-03-01 05:49:24
+--- orig/options.c     2005-03-16 02:19:30.152741841

 +++ options.c  2005-01-28 19:30:47
 @@ -39,6 +39,7 @@ int make_backups = 0;
   **/
 +++ options.c  2005-01-28 19:30:47
 @@ -39,6 +39,7 @@ int make_backups = 0;
   **/


@@ -11,7 +11,7 @@ to be called on every file we write.
  int archive_mode = 0;
  int keep_dirlinks = 0;
  int copy_links = 0;
  int archive_mode = 0;
  int keep_dirlinks = 0;
  int copy_links = 0;

-@@ -309,6 +310,7 @@ void usage(enum logcode F)
+@@ -310,6 +311,7 @@ void usage(enum logcode F)

    rprintf(F,"     --partial               keep partially transferred files\n");
    rprintf(F,"     --partial-dir=DIR       put a partially transferred file into DIR\n");
    rprintf(F,"     --delay-updates         put all updated files into place at transfer's end\n");
    rprintf(F,"     --partial               keep partially transferred files\n");
    rprintf(F,"     --partial-dir=DIR       put a partially transferred file into DIR\n");
    rprintf(F,"     --delay-updates         put all updated files into place at transfer's end\n");


@@ -19,7 +19,7 @@ to be called on every file we write.
    rprintf(F,"     --numeric-ids           don't map uid/gid values by user/group name\n");
    rprintf(F,"     --timeout=TIME          set I/O timeout in seconds\n");
    rprintf(F," -I, --ignore-times          don't skip files that match in size and mod-time\n");
    rprintf(F,"     --numeric-ids           don't map uid/gid values by user/group name\n");
    rprintf(F,"     --timeout=TIME          set I/O timeout in seconds\n");
    rprintf(F," -I, --ignore-times          don't skip files that match in size and mod-time\n");

-@@ -389,6 +391,7 @@ static struct poptOption long_options[] 
+@@ -391,6 +393,7 @@ static struct poptOption long_options[] 

    {"safe-links",       0,  POPT_ARG_NONE,   &safe_symlinks, 0, 0, 0 },
    {"help",            'h', POPT_ARG_NONE,   0, 'h', 0, 0 },
    {"backup",          'b', POPT_ARG_NONE,   &make_backups, 0, 0, 0 },
    {"safe-links",       0,  POPT_ARG_NONE,   &safe_symlinks, 0, 0, 0 },
    {"help",            'h', POPT_ARG_NONE,   0, 'h', 0, 0 },
    {"backup",          'b', POPT_ARG_NONE,   &make_backups, 0, 0, 0 },


@@ -27,7 +27,7 @@ to be called on every file we write.
    {"dry-run",         'n', POPT_ARG_NONE,   &dry_run, 0, 0, 0 },
    {"sparse",          'S', POPT_ARG_NONE,   &sparse_files, 0, 0, 0 },
    {"cvs-exclude",     'C', POPT_ARG_NONE,   &cvs_exclude, 0, 0, 0 },
    {"dry-run",         'n', POPT_ARG_NONE,   &dry_run, 0, 0, 0 },
    {"sparse",          'S', POPT_ARG_NONE,   &sparse_files, 0, 0, 0 },
    {"cvs-exclude",     'C', POPT_ARG_NONE,   &cvs_exclude, 0, 0, 0 },

-@@ -1423,6 +1426,9 @@ void server_options(char **args,int *arg
+@@ -1431,6 +1434,9 @@ void server_options(char **args,int *arg

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


@@ -37,7 +37,7 @@ to be called on every file we write.
        if (basis_dir[0] && am_sender) {
                /* the server only needs this option if it is not the sender,
                 *   and it may be an older version that doesn't know this
        if (basis_dir[0] && am_sender) {
                /* the server only needs this option if it is not the sender,
                 *   and it may be an older version that doesn't know this

---- orig/receiver.c    2005-02-26 19:27:54
+--- orig/receiver.c    2005-03-16 02:19:30.248733487

 +++ receiver.c 2005-02-20 00:17:37
 @@ -37,6 +37,7 @@ extern int keep_dirlinks;
  extern int preserve_hard_links;
 +++ receiver.c 2005-02-20 00:17:37
 @@ -37,6 +37,7 @@ extern int keep_dirlinks;
  extern int preserve_hard_links;


@@ -60,7 +60,7 @@ to be called on every file we write.
        sum_end(file_sum1);
  
        if (mapbuf)
        sum_end(file_sum1);
  
        if (mapbuf)

---- orig/t_stub.c      2005-01-25 12:14:14
+--- orig/t_stub.c      2005-01-25 10:39:14

 +++ t_stub.c   2004-10-09 04:03:09
 @@ -28,6 +28,7 @@
  
 +++ t_stub.c   2004-10-09 04:03:09
 @@ -28,6 +28,7 @@
  


@@ -70,7 +70,7 @@ to be called on every file we write.
  char *partial_dir;
  struct filter_list_struct server_filter_list;
  
  char *partial_dir;
  struct filter_list_struct server_filter_list;
  

---- orig/util.c        2005-02-23 02:57:27
+--- orig/util.c        2005-03-11 17:36:35

 +++ util.c     2004-07-03 20:18:13
 @@ -33,6 +33,7 @@ extern int module_id;
  extern int modify_window;
 +++ util.c     2004-07-03 20:18:13
 @@ -33,6 +33,7 @@ extern int module_id;
  extern int modify_window;


@@ -80,7 +80,7 @@ to be called on every file we write.
  
  int sanitize_paths = 0;
  
  
  int sanitize_paths = 0;
  

-@@ -298,6 +299,12 @@ int copy_file(char *source, char *dest, 
+@@ -299,6 +300,12 @@ int copy_file(char *source, char *dest, 

                return -1;
        }
  
                return -1;
        }
  

diff --git a/ignore-case.diff b/ignore-case.diff
index 2fc136d..1cf89b6 100644 (file)
--- a/ignore-case.diff
+++ b/ignore-case.diff
@@ -1,7 +1,7 @@
 This adds the --ignore-case option, which makes rsync compare filenames
 in a case-insensitive manner.
 
 This adds the --ignore-case option, which makes rsync compare filenames
 in a case-insensitive manner.
 

---- orig/lib/wildmatch.c       2005-01-28 23:01:12
+--- orig/lib/wildmatch.c       2005-01-28 21:01:21

 +++ lib/wildmatch.c    2004-08-13 16:43:27
 @@ -53,6 +53,8 @@
  #define ISUPPER(c) (ISASCII(c) && isupper(c))
 +++ lib/wildmatch.c    2004-08-13 16:43:27
 @@ -53,6 +53,8 @@
  #define ISUPPER(c) (ISASCII(c) && isupper(c))


@@ -35,7 +35,7 @@ in a case-insensitive manner.
          case '?':
            /* Match anything but '/'. */
            if (*text == '/')
          case '?':
            /* Match anything but '/'. */
            if (*text == '/')

---- orig/options.c     2005-03-01 05:49:24
+--- orig/options.c     2005-03-16 02:19:30.152741841

 +++ options.c  2004-10-14 17:22:51
 @@ -100,6 +100,7 @@ int max_delete = 0;
  OFF_T max_size = 0;
 +++ options.c  2004-10-14 17:22:51
 @@ -100,6 +100,7 @@ int max_delete = 0;
  OFF_T max_size = 0;


@@ -45,7 +45,7 @@ in a case-insensitive manner.
  int blocking_io = -1;
  int checksum_seed = 0;
  int inplace = 0;
  int blocking_io = -1;
  int checksum_seed = 0;
  int inplace = 0;

-@@ -329,6 +330,7 @@ void usage(enum logcode F)
+@@ -331,6 +332,7 @@ void usage(enum logcode F)

    rprintf(F,"     --include-from=FILE     read include patterns from FILE\n");
    rprintf(F,"     --files-from=FILE       read list of source-file names from FILE\n");
    rprintf(F," -0, --from0                 all *-from file lists are delimited by nulls\n");
    rprintf(F,"     --include-from=FILE     read include patterns from FILE\n");
    rprintf(F,"     --files-from=FILE       read list of source-file names from FILE\n");
    rprintf(F," -0, --from0                 all *-from file lists are delimited by nulls\n");


@@ -53,7 +53,7 @@ in a case-insensitive manner.
    rprintf(F,"     --version               print version number\n");
    rprintf(F,"     --port=PORT             specify double-colon alternate port number\n");
    rprintf(F,"     --blocking-io           use blocking I/O for the remote shell\n");
    rprintf(F,"     --version               print version number\n");
    rprintf(F,"     --port=PORT             specify double-colon alternate port number\n");
    rprintf(F,"     --blocking-io           use blocking I/O for the remote shell\n");

-@@ -386,6 +388,7 @@ static struct poptOption long_options[] 
+@@ -388,6 +390,7 @@ static struct poptOption long_options[] 

    {"include",          0,  POPT_ARG_STRING, 0, OPT_INCLUDE, 0, 0 },
    {"exclude-from",     0,  POPT_ARG_STRING, 0, OPT_EXCLUDE_FROM, 0, 0 },
    {"include-from",     0,  POPT_ARG_STRING, 0, OPT_INCLUDE_FROM, 0, 0 },
    {"include",          0,  POPT_ARG_STRING, 0, OPT_INCLUDE, 0, 0 },
    {"exclude-from",     0,  POPT_ARG_STRING, 0, OPT_EXCLUDE_FROM, 0, 0 },
    {"include-from",     0,  POPT_ARG_STRING, 0, OPT_INCLUDE_FROM, 0, 0 },


@@ -61,7 +61,7 @@ in a case-insensitive manner.
    {"safe-links",       0,  POPT_ARG_NONE,   &safe_symlinks, 0, 0, 0 },
    {"help",            'h', POPT_ARG_NONE,   0, 'h', 0, 0 },
    {"backup",          'b', POPT_ARG_NONE,   &make_backups, 0, 0, 0 },
    {"safe-links",       0,  POPT_ARG_NONE,   &safe_symlinks, 0, 0, 0 },
    {"help",            'h', POPT_ARG_NONE,   0, 'h', 0, 0 },
    {"backup",          'b', POPT_ARG_NONE,   &make_backups, 0, 0, 0 },

-@@ -1387,6 +1390,9 @@ void server_options(char **args,int *arg
+@@ -1395,6 +1398,9 @@ void server_options(char **args,int *arg

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


@@ -71,7 +71,7 @@ in a case-insensitive manner.
        if (partial_dir && am_sender) {
                if (partial_dir != partialdir_for_delayupdate) {
                        args[ac++] = "--partial-dir";
        if (partial_dir && am_sender) {
                if (partial_dir != partialdir_for_delayupdate) {
                        args[ac++] = "--partial-dir";

---- orig/t_stub.c      2005-01-25 12:14:14
+--- orig/t_stub.c      2005-01-25 10:39:14

 +++ t_stub.c   2004-08-13 17:19:56
 @@ -28,6 +28,7 @@
  
 +++ t_stub.c   2004-08-13 17:19:56
 @@ -28,6 +28,7 @@
  


@@ -81,7 +81,7 @@ in a case-insensitive manner.
  char *partial_dir;
  struct filter_list_struct server_filter_list;
  
  char *partial_dir;
  struct filter_list_struct server_filter_list;
  

---- orig/util.c        2005-02-23 02:57:27
+--- orig/util.c        2005-03-11 17:36:35

 +++ util.c     2004-08-13 16:40:34
 @@ -31,6 +31,7 @@ extern int verbose;
  extern int dry_run;
 +++ util.c     2004-08-13 16:40:34
 @@ -31,6 +31,7 @@ extern int verbose;
  extern int dry_run;


@@ -91,7 +91,7 @@ in a case-insensitive manner.
  extern char *partial_dir;
  extern struct filter_list_struct server_filter_list;
  
  extern char *partial_dir;
  extern struct filter_list_struct server_filter_list;
  

-@@ -1018,11 +1019,23 @@ int u_strcmp(const char *cs1, const char
+@@ -1019,11 +1020,23 @@ int u_strcmp(const char *cs1, const char

  {
        const uchar *s1 = (const uchar *)cs1;
        const uchar *s2 = (const uchar *)cs2;
  {
        const uchar *s1 = (const uchar *)cs1;
        const uchar *s2 = (const uchar *)cs2;

diff --git a/last-match.diff b/last-match.diff
index 04fb29b..5169cd7 100644 (file)
--- a/last-match.diff
+++ b/last-match.diff
@@ -4,7 +4,7 @@ this line:
 
 [last-match]
 
 
 [last-match]
 

---- orig/exclude.c     2005-02-27 07:34:13
+--- orig/exclude.c     2005-02-27 07:34:27

 +++ exclude.c  2005-02-26 03:22:20
 @@ -73,6 +73,7 @@ static BOOL parent_dirscan = False;
  static struct filter_struct **mergelist_parents;
 +++ exclude.c  2005-02-26 03:22:20
 @@ -73,6 +73,7 @@ static BOOL parent_dirscan = False;
  static struct filter_struct **mergelist_parents;

diff --git a/link-by-hash.diff b/link-by-hash.diff
index a76a52e..8eeb6f2 100644 (file)
--- a/link-by-hash.diff
+++ b/link-by-hash.diff
@@ -365,7 +365,7 @@ the file's name.
 +}
 +
 +#endif
 +}
 +
 +#endif

---- orig/options.c     2005-03-11 17:36:35.507159655
+--- orig/options.c     2005-03-16 02:19:30.152741841

 +++ options.c  2005-03-01 01:27:55
 @@ -140,6 +140,7 @@ char *log_format = NULL;
  char *password_file = NULL;
 +++ options.c  2005-03-01 01:27:55
 @@ -140,6 +140,7 @@ char *log_format = NULL;
  char *password_file = NULL;


@@ -434,7 +434,7 @@ the file's name.
        if (files_from && (!am_sender || filesfrom_host)) {
                if (filesfrom_host) {
                        args[ac++] = "--files-from";
        if (files_from && (!am_sender || filesfrom_host)) {
                if (filesfrom_host) {
                        args[ac++] = "--files-from";

---- orig/receiver.c    2005-03-10 00:06:01
+--- orig/receiver.c    2005-03-16 02:19:30.248733487

 +++ receiver.c 2005-01-15 21:29:13
 @@ -51,6 +51,7 @@ extern int delay_updates;
  extern struct stats stats;
 +++ receiver.c 2005-01-15 21:29:13
 @@ -51,6 +51,7 @@ extern int delay_updates;
  extern struct stats stats;


@@ -504,8 +504,8 @@ the file's name.
 +      receive_data(f_in, NULL, -1, 0, NULL, -1, length, NULL);
  }
  
 +      receive_data(f_in, NULL, -1, 0, NULL, -1, length, NULL);
  }
  

- 
-@@ -572,8 +583,12 @@ int recv_files(int f_in, struct file_lis
+ static void handle_delayed_updates(struct file_list *flist, char *local_name)
+@@ -613,8 +624,12 @@ int recv_files(int f_in, struct file_lis

                        rprintf(FINFO, "%s\n", safe_fname(fname));
  
                /* recv file data */
                        rprintf(FINFO, "%s\n", safe_fname(fname));
  
                /* recv file data */


@@ -519,9 +519,9 @@ the file's name.
  
                if (!log_before_transfer)
                        log_item(file, &initial_stats, iflags, NULL);
  
                if (!log_before_transfer)
                        log_item(file, &initial_stats, iflags, NULL);

---- orig/rsync.c       2005-02-25 17:08:57
+--- orig/rsync.c       2005-03-16 02:19:30.453715649

 +++ rsync.c    2005-02-21 11:04:36
 +++ rsync.c    2005-02-21 11:04:36

-@@ -39,6 +39,7 @@ extern int recurse;
+@@ -38,6 +38,7 @@ extern int inplace;

  extern int keep_dirlinks;
  extern int make_backups;
  extern struct stats stats;
  extern int keep_dirlinks;
  extern int make_backups;
  extern struct stats stats;


@@ -529,7 +529,7 @@ the file's name.
  
  
  /*
  
  
  /*

-@@ -189,7 +190,12 @@ void finish_transfer(char *fname, char *
+@@ -188,7 +189,12 @@ void finish_transfer(char *fname, char *

                rprintf(FINFO, "renaming %s to %s\n",
                        safe_fname(fnametmp), safe_fname(fname));
        }
                rprintf(FINFO, "renaming %s to %s\n",
                        safe_fname(fnametmp), safe_fname(fname));
        }


@@ -543,9 +543,9 @@ the file's name.
        if (ret < 0) {
                rsyserr(FERROR, errno, "%s %s -> \"%s\"",
                    ret == -2 ? "copy" : "rename",
        if (ret < 0) {
                rsyserr(FERROR, errno, "%s %s -> \"%s\"",
                    ret == -2 ? "copy" : "rename",

---- orig/rsync.h       2005-03-09 18:53:49
+--- orig/rsync.h       2005-03-16 02:19:30.524709471

 +++ rsync.h    2004-07-03 20:20:15
 +++ rsync.h    2004-07-03 20:20:15

-@@ -631,6 +631,14 @@ struct stats {
+@@ -632,6 +632,14 @@ struct stats {

        int current_file_index;
  };
  
        int current_file_index;
  };
  


@@ -560,7 +560,7 @@ the file's name.
  
  #include "byteorder.h"
  #include "lib/mdfour.h"
  
  #include "byteorder.h"
  #include "lib/mdfour.h"

---- orig/rsync.yo      2005-03-11 17:36:35.726141047
+--- orig/rsync.yo      2005-03-16 02:19:30.727691806

 +++ rsync.yo   2005-02-13 06:58:47
 @@ -355,6 +355,7 @@ to the detailed description below for a 
       --compare-dest=DIR      also compare received files relative to DIR
 +++ rsync.yo   2005-02-13 06:58:47
 @@ -355,6 +355,7 @@ to the detailed description below for a 
       --compare-dest=DIR      also compare received files relative to DIR

diff --git a/links-depth.diff b/links-depth.diff
index 94c5e90..b9add60 100644 (file)
--- a/links-depth.diff
+++ b/links-depth.diff
@@ -6,9 +6,9 @@ with the latest codebase, but even in its original form it didn't
 handle relative symlinks properly, and that has not yet been fixed
 in this modified version.
 
 handle relative symlinks properly, and that has not yet been fixed
 in this modified version.
 

---- orig/flist.c       2005-02-26 19:27:54
+--- orig/flist.c       2005-03-16 02:19:29.897764030

 +++ flist.c    2004-07-16 16:58:04
 +++ flist.c    2004-07-16 16:58:04

-@@ -47,6 +47,7 @@ extern int filesfrom_fd;
+@@ -45,6 +45,7 @@ extern int filesfrom_fd;

  extern int one_file_system;
  extern int keep_dirlinks;
  extern int preserve_links;
  extern int one_file_system;
  extern int keep_dirlinks;
  extern int preserve_links;


@@ -62,7 +62,7 @@ in this modified version.
  #else
        linkname_len = 0;
  #endif
  #else
        linkname_len = 0;
  #endif

---- orig/options.c     2005-03-01 05:49:24
+--- orig/options.c     2005-03-16 02:19:30.152741841

 +++ options.c  2005-01-28 19:33:24
 @@ -43,6 +43,7 @@ int archive_mode = 0;
  int keep_dirlinks = 0;
 +++ options.c  2005-01-28 19:33:24
 @@ -43,6 +43,7 @@ int archive_mode = 0;
  int keep_dirlinks = 0;


@@ -72,7 +72,7 @@ in this modified version.
  int preserve_hard_links = 0;
  int preserve_perms = 0;
  int preserve_devices = 0;
  int preserve_hard_links = 0;
  int preserve_perms = 0;
  int preserve_devices = 0;

-@@ -274,6 +275,7 @@ void usage(enum logcode F)
+@@ -275,6 +276,7 @@ void usage(enum logcode F)

    rprintf(F,"     --inplace               update destination files in-place (SEE MAN PAGE)\n");
    rprintf(F," -d, --dirs                  transfer directories without recursing\n");
    rprintf(F," -l, --links                 copy symlinks as symlinks\n");
    rprintf(F,"     --inplace               update destination files in-place (SEE MAN PAGE)\n");
    rprintf(F," -d, --dirs                  transfer directories without recursing\n");
    rprintf(F," -l, --links                 copy symlinks as symlinks\n");


@@ -80,7 +80,7 @@ in this modified version.
    rprintf(F," -L, --copy-links            transform symlink into referent file/dir\n");
    rprintf(F,"     --copy-unsafe-links     only \"unsafe\" symlinks are transformed\n");
    rprintf(F,"     --safe-links            ignore symlinks that point outside the source tree\n");
    rprintf(F," -L, --copy-links            transform symlink into referent file/dir\n");
    rprintf(F,"     --copy-unsafe-links     only \"unsafe\" symlinks are transformed\n");
    rprintf(F,"     --safe-links            ignore symlinks that point outside the source tree\n");

-@@ -396,6 +398,7 @@ static struct poptOption long_options[] 
+@@ -398,6 +400,7 @@ static struct poptOption long_options[] 

    {"inplace",          0,  POPT_ARG_NONE,   &inplace, 0, 0, 0 },
    {"dirs",            'd', POPT_ARG_VAL,    &xfer_dirs, 2, 0, 0 },
    {"links",           'l', POPT_ARG_NONE,   &preserve_links, 0, 0, 0 },
    {"inplace",          0,  POPT_ARG_NONE,   &inplace, 0, 0, 0 },
    {"dirs",            'd', POPT_ARG_VAL,    &xfer_dirs, 2, 0, 0 },
    {"links",           'l', POPT_ARG_NONE,   &preserve_links, 0, 0, 0 },


@@ -88,9 +88,9 @@ in this modified version.
    {"copy-links",      'L', POPT_ARG_NONE,   &copy_links, 0, 0, 0 },
    {"keep-dirlinks",   'K', POPT_ARG_NONE,   &keep_dirlinks, 0, 0, 0 },
    {"whole-file",      'W', POPT_ARG_VAL,    &whole_file, 1, 0, 0 },
    {"copy-links",      'L', POPT_ARG_NONE,   &copy_links, 0, 0, 0 },
    {"keep-dirlinks",   'K', POPT_ARG_NONE,   &keep_dirlinks, 0, 0, 0 },
    {"whole-file",      'W', POPT_ARG_VAL,    &whole_file, 1, 0, 0 },

---- orig/rsync.yo      2005-03-01 01:22:59
+--- orig/rsync.yo      2005-03-16 02:19:30.727691806

 +++ rsync.yo   2005-01-28 19:33:40
 +++ rsync.yo   2005-01-28 19:33:40

-@@ -311,6 +311,7 @@ to the detailed description below for a 
+@@ -310,6 +310,7 @@ to the detailed description below for a 

       --inplace               update destination files in-place
   -d, --dirs                  transfer directories without recursing
   -l, --links                 copy symlinks as symlinks
       --inplace               update destination files in-place
   -d, --dirs                  transfer directories without recursing
   -l, --links                 copy symlinks as symlinks

diff --git a/netgroup-auth.diff b/netgroup-auth.diff
index d41d428..502594a 100644 (file)
--- a/netgroup-auth.diff
+++ b/netgroup-auth.diff
@@ -3,7 +3,7 @@ and hosts deny.
 
 This patch still needs autoconf support for portability.
 
 
 This patch still needs autoconf support for portability.
 

---- orig/access.c      2005-02-14 02:45:09
+--- orig/access.c      2005-02-14 00:53:43

 +++ access.c   2005-01-15 20:09:59
 @@ -22,12 +22,15 @@
    */
 +++ access.c   2005-01-15 20:09:59
 @@ -22,12 +22,15 @@
    */

diff --git a/openssl-support.diff b/openssl-support.diff
index 0a76308..c040e8d 100644 (file)
--- a/openssl-support.diff
+++ b/openssl-support.diff
@@ -199,7 +199,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
        if (*line == '#') {
                /* it's some sort of command that I don't understand */
                io_printf(f_out, "@ERROR: Unknown command '%s'\n", line);
        if (*line == '#') {
                /* it's some sort of command that I don't understand */
                io_printf(f_out, "@ERROR: Unknown command '%s'\n", line);

---- orig/configure.in  2005-03-01 06:22:19
+--- orig/configure.in  2005-03-16 02:19:29.819770817

 +++ configure.in       2004-07-03 20:22:28
 @@ -271,6 +271,21 @@ yes
        AC_SEARCH_LIBS(getaddrinfo, inet6)
 +++ configure.in       2004-07-03 20:22:28
 @@ -271,6 +271,21 @@ yes
        AC_SEARCH_LIBS(getaddrinfo, inet6)


@@ -223,7 +223,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
  AC_MSG_CHECKING([whether to call shutdown on all sockets])
  case $host_os in
        *cygwin* ) AC_MSG_RESULT(yes)
  AC_MSG_CHECKING([whether to call shutdown on all sockets])
  case $host_os in
        *cygwin* ) AC_MSG_RESULT(yes)

---- orig/options.c     2005-03-11 17:36:35.507159655
+--- orig/options.c     2005-03-16 02:19:30.152741841

 +++ options.c  2005-03-01 01:34:42
 @@ -157,6 +157,14 @@ int log_format_has_o_or_i = 0;
  int always_checksum = 0;
 +++ options.c  2005-03-01 01:34:42
 @@ -157,6 +157,14 @@ int log_format_has_o_or_i = 0;
  int always_checksum = 0;


@@ -371,7 +371,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
                if ((p = strchr(s, '/')) != NULL) {
                        hostlen = p - s;
                        path = p + 1;
                if ((p = strchr(s, '/')) != NULL) {
                        hostlen = p - s;
                        path = p + 1;

---- orig/rsync.h       2005-03-09 18:53:49
+--- orig/rsync.h       2005-03-16 02:19:30.524709471

 +++ rsync.h    2004-10-08 21:01:33
 @@ -32,6 +32,7 @@
  
 +++ rsync.h    2004-10-08 21:01:33
 @@ -32,6 +32,7 @@
  


@@ -381,7 +381,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
  
  #define BACKUP_SUFFIX "~"
  
  
  #define BACKUP_SUFFIX "~"
  

-@@ -410,6 +411,11 @@ enum msgcode {
+@@ -411,6 +412,11 @@ enum msgcode {

  # define SIZEOF_INT64 SIZEOF_OFF_T
  #endif
  
  # define SIZEOF_INT64 SIZEOF_OFF_T
  #endif
  

diff --git a/owner-group-mod.diff b/owner-group-mod.diff
index ae78130..bb32c68 100644 (file)
--- a/owner-group-mod.diff
+++ b/owner-group-mod.diff
@@ -34,9 +34,9 @@ groups, even if they weren't returned by getgroups().  E.g.:
 +                      preserve_gid = 2;
 +      }
  }
 +                      preserve_gid = 2;
 +      }
  }

---- orig/options.c     2005-03-09 18:53:53
+--- orig/options.c     2005-03-16 02:19:30.152741841

 +++ options.c  2004-09-09 01:59:08
 +++ options.c  2004-09-09 01:59:08

-@@ -402,8 +402,8 @@ static struct poptOption long_options[] 
+@@ -404,8 +404,8 @@ 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 },


@@ -47,7 +47,7 @@ groups, even if they weren't returned by getgroups().  E.g.:
    {"devices",         'D', POPT_ARG_NONE,   &preserve_devices, 0, 0, 0 },
    {"times",           't', POPT_ARG_NONE,   &preserve_times, 0, 0, 0 },
    {"omit-dir-times",  'O', POPT_ARG_VAL,    &omit_dir_times, 2, 0, 0 },
    {"devices",         'D', POPT_ARG_NONE,   &preserve_devices, 0, 0, 0 },
    {"times",           't', POPT_ARG_NONE,   &preserve_times, 0, 0, 0 },
    {"omit-dir-times",  'O', POPT_ARG_VAL,    &omit_dir_times, 2, 0, 0 },

-@@ -744,6 +744,14 @@ int parse_arguments(int *argc, const cha
+@@ -747,6 +747,14 @@ int parse_arguments(int *argc, const cha

                        usage(FINFO);
                        exit_cleanup(0);
  
                        usage(FINFO);
                        exit_cleanup(0);
  


@@ -62,7 +62,7 @@ groups, even if they weren't returned by getgroups().  E.g.:
                case 'v':
                        verbose++;
                        break;
                case 'v':
                        verbose++;
                        break;

-@@ -946,8 +954,8 @@ int parse_arguments(int *argc, const cha
+@@ -954,8 +962,8 @@ int parse_arguments(int *argc, const cha

  #endif
                preserve_perms = 1;
                preserve_times = 1;
  #endif
                preserve_perms = 1;
                preserve_times = 1;


@@ -73,7 +73,7 @@ groups, even if they weren't returned by getgroups().  E.g.:
                preserve_devices = 1;
        }
  
                preserve_devices = 1;
        }
  

-@@ -1261,10 +1269,16 @@ void server_options(char **args,int *arg
+@@ -1269,10 +1277,16 @@ void server_options(char **args,int *arg

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


@@ -92,7 +92,7 @@ groups, even if they weren't returned by getgroups().  E.g.:
        if (preserve_devices)
                argstr[x++] = 'D';
        if (preserve_times)
        if (preserve_devices)
                argstr[x++] = 'D';
        if (preserve_times)

---- orig/rsync.c       2005-02-25 17:08:57
+--- orig/rsync.c       2005-03-16 02:19:30.453715649

 +++ rsync.c    2005-02-01 10:46:04
 @@ -27,7 +27,6 @@ extern int dry_run;
  extern int daemon_log_format_has_i;
 +++ rsync.c    2005-02-01 10:46:04
 @@ -27,7 +27,6 @@ extern int dry_run;
  extern int daemon_log_format_has_i;


@@ -102,7 +102,7 @@ groups, even if they weren't returned by getgroups().  E.g.:
  extern int am_server;
  extern int am_sender;
  extern int am_generator;
  extern int am_server;
  extern int am_sender;
  extern int am_generator;

-@@ -82,7 +81,7 @@ int set_perms(char *fname,struct file_st
+@@ -81,7 +80,7 @@ int set_perms(char *fname,struct file_st

                updated = 1;
        }
  
                updated = 1;
        }
  

diff --git a/soften-links.diff b/soften-links.diff
index d7614b4..607df5a 100644 (file)
--- a/soften-links.diff
+++ b/soften-links.diff
@@ -9,7 +9,7 @@ polished version of this patch for inclusion in rsync?
 
 [Updated to latest CVS source by Wayne Davison.]
 
 
 [Updated to latest CVS source by Wayne Davison.]
 

---- orig/syscall.c     2005-02-14 02:45:11
+--- orig/syscall.c     2005-02-14 00:58:10

 +++ syscall.c  2004-04-22 23:48:45
 @@ -62,9 +62,14 @@ int do_symlink(char *fname1, char *fname
  #ifdef HAVE_LINK
 +++ syscall.c  2004-04-22 23:48:45
 @@ -62,9 +62,14 @@ int do_symlink(char *fname1, char *fname
  #ifdef HAVE_LINK

diff --git a/source-cd.diff b/source-cd.diff
index c2b0691..757a24b 100644 (file)
--- a/source-cd.diff
+++ b/source-cd.diff
@@ -6,7 +6,7 @@ rsync -avR --source-cd=/usr local/bin host:/
 
 For two systems where one uses /usr/local/bin and the other /local/bin.
 
 
 For two systems where one uses /usr/local/bin and the other /local/bin.
 

---- orig/flist.c       2005-03-04 08:27:33
+--- orig/flist.c       2005-03-16 02:19:29.897764030

 +++ flist.c    2005-03-05 00:31:42
 @@ -57,6 +57,7 @@ extern int copy_unsafe_links;
  extern int protocol_version;
 +++ flist.c    2005-03-05 00:31:42
 @@ -57,6 +57,7 @@ extern int copy_unsafe_links;
  extern int protocol_version;


@@ -16,7 +16,7 @@ For two systems where one uses /usr/local/bin and the other /local/bin.
  extern struct stats stats;
  extern struct file_list *the_file_list;
  
  extern struct stats stats;
  extern struct file_list *the_file_list;
  

-@@ -1075,13 +1076,14 @@ struct file_list *send_file_list(int f, 
+@@ -1085,13 +1086,14 @@ struct file_list *send_file_list(int f, 

  
        io_start_buffering_out();
        if (filesfrom_fd >= 0) {
  
        io_start_buffering_out();
        if (filesfrom_fd >= 0) {


@@ -35,8 +35,8 @@ For two systems where one uses /usr/local/bin and the other /local/bin.
 +      }
  
        while (1) {
 +      }
  
        while (1) {

-               char fname2[MAXPATHLEN];
---- orig/options.c     2005-03-02 09:52:06
+               struct file_struct *file;
+--- orig/options.c     2005-03-16 02:19:30.152741841

 +++ options.c  2005-03-01 01:37:22
 @@ -81,6 +81,7 @@ char *filesfrom_host = NULL;
  int eol_nulls = 0;
 +++ options.c  2005-03-01 01:37:22
 @@ -81,6 +81,7 @@ char *filesfrom_host = NULL;
  int eol_nulls = 0;


@@ -46,7 +46,7 @@ For two systems where one uses /usr/local/bin and the other /local/bin.
  int am_daemon = 0;
  int daemon_over_rsh = 0;
  int do_stats = 0;
  int am_daemon = 0;
  int daemon_over_rsh = 0;
  int do_stats = 0;

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

    rprintf(F," -R, --relative              use relative path names\n");
    rprintf(F,"     --no-relative           turn off --relative\n");
    rprintf(F,"     --no-implied-dirs       don't send implied dirs with -R\n");
    rprintf(F," -R, --relative              use relative path names\n");
    rprintf(F,"     --no-relative           turn off --relative\n");
    rprintf(F,"     --no-implied-dirs       don't send implied dirs with -R\n");


@@ -54,7 +54,7 @@ For two systems where one uses /usr/local/bin and the other /local/bin.
    rprintf(F," -b, --backup                make backups (see --suffix & --backup-dir)\n");
    rprintf(F,"     --backup-dir=DIR        make backups into hierarchy based in DIR\n");
    rprintf(F,"     --suffix=SUFFIX         set backup suffix (default %s w/o --backup-dir)\n",BACKUP_SUFFIX);
    rprintf(F," -b, --backup                make backups (see --suffix & --backup-dir)\n");
    rprintf(F,"     --backup-dir=DIR        make backups into hierarchy based in DIR\n");
    rprintf(F,"     --suffix=SUFFIX         set backup suffix (default %s w/o --backup-dir)\n",BACKUP_SUFFIX);

-@@ -417,6 +419,7 @@ static struct poptOption long_options[] 
+@@ -419,6 +421,7 @@ static struct poptOption long_options[] 

    {"list-only",        0,  POPT_ARG_VAL,    &list_only, 2, 0, 0 },
    {"relative",        'R', POPT_ARG_VAL,    &relative_paths, 1, 0, 0 },
    {"no-relative",      0,  POPT_ARG_VAL,    &relative_paths, 0, 0, 0 },
    {"list-only",        0,  POPT_ARG_VAL,    &list_only, 2, 0, 0 },
    {"relative",        'R', POPT_ARG_VAL,    &relative_paths, 1, 0, 0 },
    {"no-relative",      0,  POPT_ARG_VAL,    &relative_paths, 0, 0, 0 },


@@ -62,7 +62,7 @@ For two systems where one uses /usr/local/bin and the other /local/bin.
    {"rsh",             'e', POPT_ARG_STRING, &shell_cmd, 0, 0, 0 },
    {"block-size",      'B', POPT_ARG_LONG,   &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_LONG,   &block_size, 0, 0, 0 },
    {"max-delete",       0,  POPT_ARG_INT,    &max_delete, 0, 0, 0 },

-@@ -910,6 +913,11 @@ int parse_arguments(int *argc, const cha
+@@ -918,6 +921,11 @@ int parse_arguments(int *argc, const cha

                        batch_name = NULL;
                }
        }
                        batch_name = NULL;
                }
        }


@@ -74,7 +74,7 @@ For two systems where one uses /usr/local/bin and the other /local/bin.
        if (read_batch && files_from) {
                snprintf(err_buf, sizeof err_buf,
                        "--read-batch cannot be used with --files-from\n");
        if (read_batch && files_from) {
                snprintf(err_buf, sizeof err_buf,
                        "--read-batch cannot be used with --files-from\n");

-@@ -1004,6 +1012,14 @@ int parse_arguments(int *argc, const cha
+@@ -1012,6 +1020,14 @@ int parse_arguments(int *argc, const cha

                        partial_dir = sanitize_path(NULL, partial_dir, NULL, 0);
                if (backup_dir)
                        backup_dir = sanitize_path(NULL, backup_dir, NULL, 0);
                        partial_dir = sanitize_path(NULL, partial_dir, NULL, 0);
                if (backup_dir)
                        backup_dir = sanitize_path(NULL, backup_dir, NULL, 0);


@@ -89,7 +89,7 @@ For two systems where one uses /usr/local/bin and the other /local/bin.
        }
        if (server_filter_list.head && !am_sender) {
                struct filter_list_struct *elp = &server_filter_list;
        }
        if (server_filter_list.head && !am_sender) {
                struct filter_list_struct *elp = &server_filter_list;

-@@ -1397,6 +1413,11 @@ void server_options(char **args,int *arg
+@@ -1405,6 +1421,11 @@ void server_options(char **args,int *arg

        } else if (keep_partial)
                args[ac++] = "--partial";
  
        } else if (keep_partial)
                args[ac++] = "--partial";
  


@@ -101,7 +101,7 @@ For two systems where one uses /usr/local/bin and the other /local/bin.
        if (ignore_errors)
                args[ac++] = "--ignore-errors";
  
        if (ignore_errors)
                args[ac++] = "--ignore-errors";
  

---- orig/rsync.yo      2005-03-04 16:13:54
+--- orig/rsync.yo      2005-03-16 02:19:30.727691806

 +++ rsync.yo   2005-02-22 18:20:24
 @@ -303,6 +303,7 @@ to the detailed description below for a 
   -R, --relative              use relative path names
 +++ rsync.yo   2005-02-22 18:20:24
 @@ -303,6 +303,7 @@ to the detailed description below for a 
   -R, --relative              use relative path names


@@ -111,7 +111,7 @@ For two systems where one uses /usr/local/bin and the other /local/bin.
   -b, --backup                make backups (see --suffix & --backup-dir)
       --backup-dir=DIR        make backups into hierarchy based in DIR
       --suffix=SUFFIX         backup suffix (default ~ w/o --backup-dir)
   -b, --backup                make backups (see --suffix & --backup-dir)
       --backup-dir=DIR        make backups into hierarchy based in DIR
       --suffix=SUFFIX         backup suffix (default ~ w/o --backup-dir)

-@@ -509,6 +510,11 @@ the bf(--no-implied-dirs) option would o
+@@ -510,6 +511,11 @@ the bf(--no-implied-dirs) option would o

  which means that if "/path" was a real directory on one machine and a
  symlink of the other machine, rsync would not try to change this.
  
  which means that if "/path" was a real directory on one machine and a
  symlink of the other machine, rsync would not try to change this.
  

diff --git a/time-limit.diff b/time-limit.diff
index 1a7dff3..c14a1b4 100644 (file)
--- a/time-limit.diff
+++ b/time-limit.diff
@@ -3,7 +3,7 @@ to be simpler and more efficient by Wayne Davison.
 
 Do we need configure support for mktime()?
 
 
 Do we need configure support for mktime()?
 

---- orig/io.c  2005-03-05 00:25:25
+--- orig/io.c  2005-03-09 18:54:02

 +++ io.c       2005-03-05 00:32:06
 @@ -56,6 +56,7 @@ extern int remove_sent_files;
  extern int preserve_hard_links;
 +++ io.c       2005-03-05 00:32:06
 @@ -56,6 +56,7 @@ extern int remove_sent_files;
  extern int preserve_hard_links;


@@ -41,7 +41,7 @@ Do we need configure support for mktime()?
        if (t - last_io >= io_timeout) {
                if (!am_server && !am_daemon) {
                        rprintf(FERROR, "io timeout after %d seconds -- exiting\n",
        if (t - last_io >= io_timeout) {
                if (!am_server && !am_daemon) {
                        rprintf(FERROR, "io timeout after %d seconds -- exiting\n",

---- orig/options.c     2005-03-02 09:52:06
+--- orig/options.c     2005-03-16 02:19:30.152741841

 +++ options.c  2005-01-28 19:35:23
 @@ -105,6 +105,7 @@ int checksum_seed = 0;
  int inplace = 0;
 +++ options.c  2005-01-28 19:35:23
 @@ -105,6 +105,7 @@ int checksum_seed = 0;
  int inplace = 0;


@@ -51,7 +51,7 @@ Do we need configure support for mktime()?
  
  
  /** Network address family. **/
  
  
  /** Network address family. **/

-@@ -341,6 +342,8 @@ void usage(enum logcode F)
+@@ -343,6 +344,8 @@ void usage(enum logcode F)

    rprintf(F,"     --password-file=FILE    read password from FILE\n");
    rprintf(F,"     --list-only             list the files instead of copying them\n");
    rprintf(F,"     --bwlimit=KBPS          limit I/O bandwidth; KBytes per second\n");
    rprintf(F,"     --password-file=FILE    read password from FILE\n");
    rprintf(F,"     --list-only             list the files instead of copying them\n");
    rprintf(F,"     --bwlimit=KBPS          limit I/O bandwidth; KBytes per second\n");


@@ -60,15 +60,15 @@ Do we need configure support for mktime()?
    rprintf(F,"     --write-batch=FILE      write a batched update to FILE\n");
    rprintf(F,"     --read-batch=FILE       read a batched update from FILE\n");
  #ifdef INET6
    rprintf(F,"     --write-batch=FILE      write a batched update to FILE\n");
    rprintf(F,"     --read-batch=FILE       read a batched update from FILE\n");
  #ifdef INET6

-@@ -358,6 +361,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP
-       OPT_FILTER, OPT_COMPARE_DEST, OPT_LINK_DEST,
+@@ -360,6 +363,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP
+       OPT_FILTER, OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST,

        OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW,
        OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_TIMEOUT, OPT_MAX_SIZE,
 +      OPT_STOP_AT, OPT_TIME_LIMIT,
        OPT_REFUSED_BASE = 9000};
  
  static struct poptOption long_options[] = {
        OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW,
        OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_TIMEOUT, OPT_MAX_SIZE,
 +      OPT_STOP_AT, OPT_TIME_LIMIT,
        OPT_REFUSED_BASE = 9000};
  
  static struct poptOption long_options[] = {

-@@ -442,6 +446,8 @@ static struct poptOption long_options[] 
+@@ -445,6 +449,8 @@ static struct poptOption long_options[] 

    {"log-format",       0,  POPT_ARG_STRING, &log_format, 0, 0, 0 },
    {"itemize-changes", 'i', POPT_ARG_NONE,   &itemize_changes, 0, 0, 0 },
    {"bwlimit",          0,  POPT_ARG_INT,    &bwlimit, 0, 0, 0 },
    {"log-format",       0,  POPT_ARG_STRING, &log_format, 0, 0, 0 },
    {"itemize-changes", 'i', POPT_ARG_NONE,   &itemize_changes, 0, 0, 0 },
    {"bwlimit",          0,  POPT_ARG_INT,    &bwlimit, 0, 0, 0 },


@@ -77,7 +77,7 @@ Do we need configure support for mktime()?
    {"backup-dir",       0,  POPT_ARG_STRING, &backup_dir, 0, 0, 0 },
    {"hard-links",      'H', POPT_ARG_NONE,   &preserve_hard_links, 0, 0, 0 },
    {"read-batch",       0,  POPT_ARG_STRING, &batch_name, OPT_READ_BATCH, 0, 0 },
    {"backup-dir",       0,  POPT_ARG_STRING, &backup_dir, 0, 0, 0 },
    {"hard-links",      'H', POPT_ARG_NONE,   &preserve_hard_links, 0, 0, 0 },
    {"read-batch",       0,  POPT_ARG_STRING, &batch_name, OPT_READ_BATCH, 0, 0 },

-@@ -854,6 +860,36 @@ int parse_arguments(int *argc, const cha
+@@ -862,6 +868,36 @@ int parse_arguments(int *argc, const cha

                        basis_dir[basis_dir_cnt++] = (char *)arg;
                        break;
  
                        basis_dir[basis_dir_cnt++] = (char *)arg;
                        break;
  


@@ -114,7 +114,7 @@ Do we need configure support for mktime()?
                default:
                        /* A large opt value means that set_refuse_options()
                         * turned this option off. */
                default:
                        /* A large opt value means that set_refuse_options()
                         * turned this option off. */

-@@ -1344,6 +1380,15 @@ void server_options(char **args,int *arg
+@@ -1352,6 +1388,15 @@ void server_options(char **args,int *arg

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


@@ -130,9 +130,9 @@ Do we need configure support for mktime()?
        if (backup_dir) {
                args[ac++] = "--backup-dir";
                args[ac++] = backup_dir;
        if (backup_dir) {
                args[ac++] = "--backup-dir";
                args[ac++] = backup_dir;

---- orig/rsync.yo      2005-03-04 16:13:54
+--- orig/rsync.yo      2005-03-16 02:19:30.727691806

 +++ rsync.yo   2005-02-01 10:46:35
 +++ rsync.yo   2005-02-01 10:46:35

-@@ -377,6 +377,8 @@ to the detailed description below for a 
+@@ -378,6 +378,8 @@ to the detailed description below for a 

       --password-file=FILE    read password from FILE
       --list-only             list the files instead of copying them
       --bwlimit=KBPS          limit I/O bandwidth; KBytes per second
       --password-file=FILE    read password from FILE
       --list-only             list the files instead of copying them
       --bwlimit=KBPS          limit I/O bandwidth; KBytes per second


@@ -141,7 +141,7 @@ Do we need configure support for mktime()?
       --write-batch=FILE      write a batched update to FILE
       --read-batch=FILE       read a batched update from FILE
       --checksum-seed=NUM     set block/file checksum seed (advanced)
       --write-batch=FILE      write a batched update to FILE
       --read-batch=FILE       read a batched update from FILE
       --checksum-seed=NUM     set block/file checksum seed (advanced)

-@@ -1247,6 +1249,19 @@ transfer was too fast, it will wait befo
+@@ -1266,6 +1268,19 @@ transfer was too fast, it will wait befo

  result is an average transfer rate equaling the specified limit. A value
  of zero specifies no limit.
  
  result is an average transfer rate equaling the specified limit. A value
  of zero specifies no limit.
  


@@ -161,7 +161,7 @@ Do we need configure support for mktime()?
  dit(bf(--write-batch=FILE)) Record a file that can later be applied to
  another identical destination with bf(--read-batch). See the "BATCH MODE"
  section for details.
  dit(bf(--write-batch=FILE)) Record a file that can later be applied to
  another identical destination with bf(--read-batch). See the "BATCH MODE"
  section for details.

---- orig/util.c        2005-02-23 02:57:27
+--- orig/util.c        2005-03-11 17:36:35

 +++ util.c     2004-07-03 20:23:22
 @@ -126,6 +126,132 @@ void overflow(char *str)
        exit_cleanup(RERR_MALLOC);
 +++ util.c     2004-07-03 20:23:22
 @@ -126,6 +126,132 @@ void overflow(char *str)
        exit_cleanup(RERR_MALLOC);

diff --git a/tru64.diff b/tru64.diff
index 0fb83c0..dc04dfb 100644 (file)
--- a/tru64.diff
+++ b/tru64.diff
@@ -1,6 +1,6 @@
 This is an adapted version of the original by Zoong Pham.
 
 This is an adapted version of the original by Zoong Pham.
 

---- orig/lib/getaddrinfo.c     2005-02-14 02:45:11
+--- orig/lib/getaddrinfo.c     2005-02-14 00:53:44

 +++ lib/getaddrinfo.c  2004-06-18 17:38:35
 @@ -41,6 +41,20 @@
  
 +++ lib/getaddrinfo.c  2004-06-18 17:38:35
 @@ -41,6 +41,20 @@
  


@@ -23,7 +23,7 @@ This is an adapted version of the original by Zoong Pham.
  #if defined(__KAME__) && defined(INET6)
  # define FAITH
  #endif
  #if defined(__KAME__) && defined(INET6)
  # define FAITH
  #endif

---- orig/syscall.c     2005-02-14 02:45:11
+--- orig/syscall.c     2005-02-14 00:58:10

 +++ syscall.c  2005-02-14 02:54:45
 @@ -27,6 +27,7 @@
  #include "rsync.h"
 +++ syscall.c  2005-02-14 02:54:45
 @@ -27,6 +27,7 @@
  #include "rsync.h"