Some minor patch-header cleanup.

diff --git a/ODBC-dblog.diff b/ODBC-dblog.diff
index e82beebd9d616d232783a68f5855bc6a78453579..7cdc2ac3076e732766164561fdecb1db482d1dc0 100644 (file)
--- a/ODBC-dblog.diff
+++ b/ODBC-dblog.diff
@@ -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-16 02:19:29.819770817
+--- orig/configure.in  2005-03-16 02:19:29

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


@@ -686,7 +686,7 @@ 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-16 02:19:30.009754284
+--- orig/log.c 2005-03-16 02:19:30

 +++ log.c      2004-07-03 20:22:18
 @@ -83,7 +83,7 @@ struct {
  /*
 +++ log.c      2004-07-03 20:22:18
 @@ -83,7 +83,7 @@ struct {
  /*


@@ -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-16 02:19:30.077748367
+--- orig/main.c        2005-03-16 02:19:30

 +++ 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,7 +709,7 @@ This patch adds the following options:
                if (f == -1 || !am_sender)
                        return;
        }
                if (f == -1 || !am_sender)
                        return;
        }

---- orig/receiver.c    2005-03-16 02:19:30.248733487
+--- orig/receiver.c    2005-03-16 02:19:30

 +++ receiver.c 2005-03-05 00:31:00
 @@ -618,6 +618,9 @@ int recv_files(int f_in, struct file_lis
  
 +++ receiver.c 2005-03-05 00:31:00
 @@ -618,6 +618,9 @@ int recv_files(int f_in, struct file_lis
  


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

---- orig/sender.c      2005-03-16 02:19:30.828683018
+--- orig/sender.c      2005-03-16 02:19:30

 +++ sender.c   2005-03-05 00:31:19
 @@ -351,6 +351,9 @@ void send_files(struct file_list *flist,
  
 +++ sender.c   2005-03-05 00:31:19
 @@ -351,6 +351,9 @@ void send_files(struct file_list *flist,
  

diff --git a/acls.diff b/acls.diff
index 48b45d0bf1ead6c08a27afceb0e952a2871819ae..e00c4da55838680d292c340628808c7d4f2a4c28 100644 (file)
--- a/acls.diff
+++ b/acls.diff
@@ -1193,7 +1193,7 @@ ACLs to a non-ACL-supporting disk should complain.
        free(file);
  
        if (verbose > 1) {
        free(file);
  
        if (verbose > 1) {

---- orig/configure.in  2005-03-16 02:19:29.819770817
+--- orig/configure.in  2005-03-16 02:19:29

 +++ configure.in       2004-08-19 19:53:27
 @@ -467,6 +467,11 @@ if test x"$ac_cv_func_strcasecmp" = x"no
      AC_CHECK_LIB(resolv, strcasecmp)
 +++ configure.in       2004-08-19 19:53:27
 @@ -467,6 +467,11 @@ if test x"$ac_cv_func_strcasecmp" = x"no
      AC_CHECK_LIB(resolv, strcasecmp)


@@ -1285,7 +1285,7 @@ ACLs to a non-ACL-supporting disk should complain.
  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       2005-03-16 02:19:29.897764030
+--- orig/flist.c       2005-03-16 02:19:29

 +++ flist.c    2005-03-16 02:24:11
 @@ -970,6 +970,8 @@ static struct file_struct *send_file_nam
        file = make_file(fname, flist, f == -2 ? SERVER_FILTERS : ALL_FILTERS);
 +++ flist.c    2005-03-16 02:24:11
 @@ -970,6 +970,8 @@ static struct file_struct *send_file_nam
        file = make_file(fname, flist, f == -2 ? SERVER_FILTERS : ALL_FILTERS);


@@ -1325,7 +1325,7 @@ ACLs to a non-ACL-supporting disk should complain.
        if (f >= 0) {
                /* Now send the uid/gid list. This was introduced in
                 * protocol version 15 */
        if (f >= 0) {
                /* Now send the uid/gid list. This was introduced in
                 * protocol version 15 */

---- orig/generator.c   2005-03-16 02:19:29.980756807
+--- orig/generator.c   2005-03-17 09:05:21

 +++ generator.c        2005-03-11 11:18:22
 @@ -712,6 +712,10 @@ static void recv_generator(char *fname, 
                if (set_perms(fname, file, statret ? NULL : &st, 0)
 +++ generator.c        2005-03-11 11:18:22
 @@ -712,6 +712,10 @@ static void recv_generator(char *fname, 
                if (set_perms(fname, file, statret ? NULL : &st, 0)


@@ -4597,7 +4597,7 @@ ACLs to a non-ACL-supporting disk should complain.
    next;
  }
  
    next;
  }
  

---- orig/options.c     2005-03-16 02:19:30.152741841
+--- orig/options.c     2005-03-17 09:05:21

 +++ options.c  2005-02-14 02:46:05
 @@ -44,6 +44,7 @@ int keep_dirlinks = 0;
  int copy_links = 0;
 +++ options.c  2005-02-14 02:46:05
 @@ -44,6 +44,7 @@ int keep_dirlinks = 0;
  int copy_links = 0;


@@ -4688,7 +4688,7 @@ ACLs to a non-ACL-supporting disk should complain.
        if (preserve_uid)
                argstr[x++] = 'o';
        if (preserve_gid)
        if (preserve_uid)
                argstr[x++] = 'o';
        if (preserve_gid)

---- orig/rsync.c       2005-03-16 02:19:30.453715649
+--- orig/rsync.c       2005-03-16 02:19:30

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


@@ -4705,7 +4705,7 @@ ACLs to a non-ACL-supporting disk should complain.
        if (verbose > 1 && flags & PERMS_REPORT) {
                enum logcode code = daemon_log_format_has_i || dry_run
                                  ? FCLIENT : FINFO;
        if (verbose > 1 && flags & PERMS_REPORT) {
                enum logcode code = daemon_log_format_has_i || dry_run
                                  ? FCLIENT : FINFO;

---- orig/rsync.h       2005-03-16 02:19:30.524709471
+--- orig/rsync.h       2005-03-16 02:19:30

 +++ rsync.h    2004-07-03 20:11:58
 @@ -639,6 +639,40 @@ struct stats {
  #include "lib/permstring.h"
 +++ rsync.h    2004-07-03 20:11:58
 @@ -639,6 +639,40 @@ struct stats {
  #include "lib/permstring.h"


@@ -4748,7 +4748,7 @@ ACLs to a non-ACL-supporting disk should complain.
  #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      2005-03-16 02:19:30.727691806
+--- orig/rsync.yo      2005-03-16 02:19:30

 +++ rsync.yo   2004-07-03 20:11:58
 @@ -316,6 +316,7 @@ to the detailed description below for a 
   -H, --hard-links            preserve hard links
 +++ rsync.yo   2004-07-03 20:11:58
 @@ -316,6 +316,7 @@ to the detailed description below for a 
   -H, --hard-links            preserve hard links

diff --git a/append.diff b/append.diff
index 3e6ccb4582fe0380d2c6933c03cb9db1900335cc..510305df45bd19f2109706ee499a6f1bee343903 100644 (file)
--- a/append.diff
+++ b/append.diff
@@ -1,7 +1,7 @@
 This patch adds the --append option, which works like a "resume" mode in
 an ftp client, appending new data onto the end of the files it updates.
 
 This patch adds the --append option, which works like a "resume" mode in
 an ftp client, appending new data onto the end of the files it updates.
 

---- orig/generator.c   2005-03-16 02:19:29.980756807
+--- orig/generator.c   2005-03-17 09:05:21

 +++ generator.c        2005-03-03 02:59:17
 @@ -51,6 +51,7 @@ extern int remove_sent_files;
  extern int update_only;
 +++ generator.c        2005-03-03 02:59:17
 @@ -51,6 +51,7 @@ extern int remove_sent_files;
  extern int update_only;


@@ -130,7 +130,7 @@ an ftp client, appending new data onto the end of the files it updates.
                        matched(f, s, buf, j, -2);
                matched(f, s, buf, len, -1);
        }
                        matched(f, s, buf, j, -2);
                matched(f, s, buf, len, -1);
        }

---- orig/options.c     2005-03-16 02:19:30.152741841
+--- orig/options.c     2005-03-17 09:05:21

 +++ options.c  2005-03-11 11:21:34
 @@ -39,6 +39,7 @@ int make_backups = 0;
   **/
 +++ options.c  2005-03-11 11:21:34
 @@ -39,6 +39,7 @@ int make_backups = 0;
   **/


@@ -199,7 +199,7 @@ an ftp client, appending new data onto the end of the files it updates.
                args[ac++] = "--inplace";
  
        if (tmpdir) {
                args[ac++] = "--inplace";
  
        if (tmpdir) {

---- orig/receiver.c    2005-03-16 02:19:30.248733487
+--- orig/receiver.c    2005-03-16 02:19:30

 +++ receiver.c 2005-02-11 20:26:32
 @@ -44,6 +44,7 @@ extern int remove_sent_files;
  extern int module_id;
 +++ receiver.c 2005-02-11 20:26:32
 @@ -44,6 +44,7 @@ extern int remove_sent_files;
  extern int module_id;


@@ -246,7 +246,7 @@ an ftp client, appending new data onto the end of the files it updates.
                        continue;
                }
  
                        continue;
                }
  

---- orig/rsync.yo      2005-03-16 02:19:30.727691806
+--- orig/rsync.yo      2005-03-16 02:19:30

 +++ rsync.yo   2005-02-11 20:36:38
 @@ -308,6 +308,7 @@ to the detailed description below for a 
       --suffix=SUFFIX         backup suffix (default ~ w/o --backup-dir)
 +++ rsync.yo   2005-02-11 20:36:38
 @@ -308,6 +308,7 @@ to the detailed description below for a 
       --suffix=SUFFIX         backup suffix (default ~ w/o --backup-dir)


@@ -271,7 +271,7 @@ an ftp client, appending new data onto the end of the files it updates.
  dit(bf(-d, --dirs)) Tell the sending side to include any directories that
  are encountered.  Unlike bf(--recursive), a directory's contents are not copied
  unless the directory was specified on the command-line as either "." or a
  dit(bf(-d, --dirs)) Tell the sending side to include any directories that
  are encountered.  Unlike bf(--recursive), a directory's contents are not copied
  unless the directory was specified on the command-line as either "." or a

---- orig/sender.c      2005-03-16 02:19:30.828683018
+--- orig/sender.c      2005-03-16 02:19:30

 +++ sender.c   2005-03-16 02:25:18
 @@ -28,6 +28,7 @@ extern int log_format_has_i;
  extern int daemon_log_format_has_i;
 +++ sender.c   2005-03-16 02:25:18
 @@ -28,6 +28,7 @@ extern int log_format_has_i;
  extern int daemon_log_format_has_i;

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

---- orig/generator.c   2005-03-16 02:19:29.980756807
+--- orig/generator.c   2005-03-17 09:05:21

 +++ generator.c        2005-03-11 11:22:38
 @@ -84,6 +84,9 @@ extern dev_t filesystem_dev;
  extern char *backup_dir;
 +++ generator.c        2005-03-11 11:22:38
 @@ -84,6 +84,9 @@ extern dev_t filesystem_dev;
  extern char *backup_dir;


@@ -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-16 02:19:30.152741841
+--- orig/options.c     2005-03-17 09:05:21

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

diff --git a/chmod-option.diff b/chmod-option.diff
index 53665c1b7beb7aa9b97e2722e2074f5f89191de6..d05f546603ab9873edaa73d067e4746455b27314 100644 (file)
--- a/chmod-option.diff
+++ b/chmod-option.diff
@@ -202,7 +202,7 @@ command before "make":
 +      }
 +      return 0;
 +}
 +      }
 +      return 0;
 +}

---- orig/flist.c       2005-03-16 02:19:29.897764030
+--- orig/flist.c       2005-03-16 02:19:29

 +++ flist.c    2004-09-18 01:51:11
 @@ -62,6 +62,8 @@ extern struct file_list *the_file_list;
  
 +++ flist.c    2004-09-18 01:51:11
 @@ -62,6 +62,8 @@ extern struct file_list *the_file_list;
  


@@ -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-16 02:19:30.152741841
+--- orig/options.c     2005-03-17 09:05:21

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


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

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

diff --git a/date-only.diff b/date-only.diff
index fc810fbcf662cf153263520b3aa376b8f2833bf1..9a61681abc540a1675e64b233ce29af1f343aff3 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-03-16 02:19:29.980756807
+--- orig/generator.c   2005-03-17 09:05:21

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


@@ -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-16 02:19:30.152741841
+--- orig/options.c     2005-03-17 09:05:21

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


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

 +++ rsync.yo   2005-02-11 22:49:10
 @@ -349,6 +349,7 @@ to the detailed description below for a 
       --timeout=TIME          set I/O timeout in seconds
 +++ rsync.yo   2005-02-11 22:49:10
 @@ -349,6 +349,7 @@ to the detailed description below for a 
       --timeout=TIME          set I/O timeout in seconds

diff --git a/fname-convert.diff b/fname-convert.diff
index 9c6d589da72a9f9de05cec78323a81154b67b442..f71005ae2ef15b5443a890eee30151ed473270d2 100644 (file)
--- a/fname-convert.diff
+++ b/fname-convert.diff
@@ -77,7 +77,7 @@ 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-16 02:19:29.823770469
+--- orig/errcode.h     2005-03-16 02:19:29

 +++ errcode.h  2004-07-02 21:38:59
 @@ -35,6 +35,7 @@
  #define RERR_STREAMIO   12      /* error in rsync protocol data stream */
 +++ errcode.h  2004-07-02 21:38:59
 @@ -35,6 +35,7 @@
  #define RERR_STREAMIO   12      /* error in rsync protocol data stream */


@@ -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-16 02:19:29.897764030
+--- orig/flist.c       2005-03-16 02:19:29

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


@@ -382,7 +382,7 @@ 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-16 02:19:29.980756807
+--- orig/generator.c   2005-03-17 09:05:21

 +++ generator.c        2005-03-05 00:29:37
 @@ -581,7 +581,13 @@ static int phase = 0;
   * start sending checksums.
 +++ generator.c        2005-03-05 00:29:37
 @@ -581,7 +581,13 @@ static int phase = 0;
   * start sending checksums.


@@ -399,7 +399,7 @@ 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-16 02:19:30.009754284
+--- orig/log.c 2005-03-16 02:19:30

 +++ log.c      2004-07-03 20:18:02
 @@ -64,6 +64,7 @@ struct {
        { RERR_STREAMIO   , "error in rsync protocol data stream" },
 +++ log.c      2004-07-03 20:18:02
 @@ -64,6 +64,7 @@ struct {
        { RERR_STREAMIO   , "error in rsync protocol data stream" },


@@ -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-16 02:19:30.077748367
+--- orig/main.c        2005-03-16 02:19:30

 +++ 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-16 02:19:30.152741841
+--- orig/options.c     2005-03-17 09:05:21

 +++ 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
+--- orig/util.c        2005-03-17 09:05:21

 +++ 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 ec5f2694d271a07e7690f0717cf2c3653dd19715..3b3043656c0c4b9d04e34bb5e9745f1eaebe5322 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-16 02:19:30.152741841
+--- orig/options.c     2005-03-17 09:05:21

 +++ 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;
   **/


@@ -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-03-16 02:19:30.248733487
+--- orig/receiver.c    2005-03-16 02:19:30

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


@@ -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-03-11 17:36:35
+--- orig/util.c        2005-03-17 09:05:21

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

diff --git a/ignore-case.diff b/ignore-case.diff
index 1cf89b6d9123ab0a32b7bd6c2b11571692e15f57..cbd64a5c1dcae3413c0aff7465cf57df906dc9ca 100644 (file)
--- a/ignore-case.diff
+++ b/ignore-case.diff
@@ -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-16 02:19:30.152741841
+--- orig/options.c     2005-03-17 09:05:21

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


@@ -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-03-11 17:36:35
+--- orig/util.c        2005-03-17 09:05:21

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

diff --git a/link-by-hash.diff b/link-by-hash.diff
index 8eeb6f2a06b5a431b0198ecaff3bcc0853612669..4769437da2d0f27e2a8af0fea514f3202a1ef344 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-16 02:19:30.152741841
+--- orig/options.c     2005-03-17 09:05:21

 +++ 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-16 02:19:30.248733487
+--- orig/receiver.c    2005-03-16 02:19:30

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


@@ -519,7 +519,7 @@ 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-03-16 02:19:30.453715649
+--- orig/rsync.c       2005-03-16 02:19:30

 +++ rsync.c    2005-02-21 11:04:36
 @@ -38,6 +38,7 @@ extern int inplace;
  extern int keep_dirlinks;
 +++ rsync.c    2005-02-21 11:04:36
 @@ -38,6 +38,7 @@ extern int inplace;
  extern int keep_dirlinks;


@@ -543,7 +543,7 @@ 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-16 02:19:30.524709471
+--- orig/rsync.h       2005-03-16 02:19:30

 +++ rsync.h    2004-07-03 20:20:15
 @@ -632,6 +632,14 @@ struct stats {
        int current_file_index;
 +++ rsync.h    2004-07-03 20:20:15
 @@ -632,6 +632,14 @@ struct stats {
        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-16 02:19:30.727691806
+--- orig/rsync.yo      2005-03-16 02:19:30

 +++ 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 b9add600c99e4ff5fa296ada610bbc8acec28bec..d6325ad4581cd17e88c2c35e8d70a074bc1a3e86 100644 (file)
--- a/links-depth.diff
+++ b/links-depth.diff
@@ -6,7 +6,7 @@ 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-03-16 02:19:29.897764030
+--- orig/flist.c       2005-03-16 02:19:29

 +++ flist.c    2004-07-16 16:58:04
 @@ -45,6 +45,7 @@ extern int filesfrom_fd;
  extern int one_file_system;
 +++ flist.c    2004-07-16 16:58:04
 @@ -45,6 +45,7 @@ extern int filesfrom_fd;
  extern int one_file_system;


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

---- orig/options.c     2005-03-16 02:19:30.152741841
+--- orig/options.c     2005-03-17 09:05:21

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


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

 +++ rsync.yo   2005-01-28 19:33:40
 @@ -310,6 +310,7 @@ to the detailed description below for a 
       --inplace               update destination files in-place
 +++ rsync.yo   2005-01-28 19:33:40
 @@ -310,6 +310,7 @@ to the detailed description below for a 
       --inplace               update destination files in-place

diff --git a/openssl-support.diff b/openssl-support.diff
index c040e8d9355a7a28118bbdcfc7129cac998a8177..7073a7bb535f8b346097ced7745e0780e7bd61d3 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-16 02:19:29.819770817
+--- orig/configure.in  2005-03-16 02:19:29

 +++ 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-16 02:19:30.152741841
+--- orig/options.c     2005-03-17 09:05:21

 +++ 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-16 02:19:30.524709471
+--- orig/rsync.h       2005-03-16 02:19:30

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

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

---- orig/options.c     2005-03-16 02:19:30.152741841
+--- orig/options.c     2005-03-17 09:05:21

 +++ options.c  2004-09-09 01:59:08
 @@ -404,8 +404,8 @@ static struct poptOption long_options[] 
    {"no-whole-file",    0,  POPT_ARG_VAL,    &whole_file, 0, 0, 0 },
 +++ options.c  2004-09-09 01:59:08
 @@ -404,8 +404,8 @@ static struct poptOption long_options[] 
    {"no-whole-file",    0,  POPT_ARG_VAL,    &whole_file, 0, 0, 0 },


@@ -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-03-16 02:19:30.453715649
+--- orig/rsync.c       2005-03-16 02:19:30

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

diff --git a/source-cd.diff b/source-cd.diff
index 757a24b682ba71c43e12ba4101275d2ff9ba8cc0..b5f8acd1893a14e253982153039dd7e5e0eb4781 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-16 02:19:29.897764030
+--- orig/flist.c       2005-03-16 02:19:29

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


@@ -36,7 +36,7 @@ For two systems where one uses /usr/local/bin and the other /local/bin.
  
        while (1) {
                struct file_struct *file;
  
        while (1) {
                struct file_struct *file;

---- orig/options.c     2005-03-16 02:19:30.152741841
+--- orig/options.c     2005-03-17 09:05:21

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


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

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

diff --git a/time-limit.diff b/time-limit.diff
index c14a1b4f896de35659f389e768ce55c5a6f9c8ae..1dfa8426ae3535e4df679c0dd695e49acc8af1dd 100644 (file)
--- a/time-limit.diff
+++ b/time-limit.diff
@@ -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-16 02:19:30.152741841
+--- orig/options.c     2005-03-17 09:05:21

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


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

 +++ rsync.yo   2005-02-01 10:46:35
 @@ -378,6 +378,8 @@ to the detailed description below for a 
       --password-file=FILE    read password from FILE
 +++ rsync.yo   2005-02-01 10:46:35
 @@ -378,6 +378,8 @@ to the detailed description below for a 
       --password-file=FILE    read password from FILE


@@ -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-03-11 17:36:35
+--- orig/util.c        2005-03-17 09:05:21

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