Updated o apply cleanly.

diff --git a/ODBC-dblog.diff b/ODBC-dblog.diff
index b6f44f2..f45cd86 100644 (file)
--- a/ODBC-dblog.diff
+++ b/ODBC-dblog.diff
@@ -115,9 +115,9 @@ 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-02-14 02:45:10
+--- orig/clientserver.c        2005-02-20 00:02:22

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

-@@ -344,6 +344,9 @@ static int rsync_module(int f_in, int f_
+@@ -354,6 +354,9 @@ static int rsync_module(int f_in, int f_

                   XFLG_ANCHORED2ABS | XFLG_OLD_PREFIXES);
  
        log_init();
                   XFLG_ANCHORED2ABS | XFLG_OLD_PREFIXES);
  
        log_init();


@@ -127,7 +127,7 @@ This patch adds the following options:
  
        if (use_chroot) {
                /*
  
        if (use_chroot) {
                /*

-@@ -466,6 +469,9 @@ static int rsync_module(int f_in, int f_
+@@ -476,6 +479,9 @@ static int rsync_module(int f_in, int f_

                        rprintf(FLOG, "rsync %s %s from %s@%s (%s)\n",
                                am_sender ? "on" : "to",
                                request, auth_user, host, addr);
                        rprintf(FLOG, "rsync %s %s from %s@%s (%s)\n",
                                am_sender ? "on" : "to",
                                request, auth_user, host, addr);


@@ -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-01-25 00:53:58
+--- orig/loadparm.c    2005-02-20 00:02:23

 +++ 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-02-16 15:35:53
+--- orig/log.c 2005-02-20 00:02:23

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

-@@ -77,7 +77,7 @@ struct {
+@@ -80,7 +80,7 @@ struct {

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


@@ -697,9 +697,9 @@ 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-02-15 19:27:04
+--- orig/main.c        2005-02-20 01:12:42

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

-@@ -136,6 +136,9 @@ static void report(int f)
+@@ -137,6 +137,9 @@ static void report(int f)

  
        if (am_daemon) {
                log_exit(0, __FILE__, __LINE__);
  
        if (am_daemon) {
                log_exit(0, __FILE__, __LINE__);


@@ -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-02-16 15:35:53
+--- orig/receiver.c    2005-02-20 20:55:51

 +++ receiver.c 2005-02-16 15:40:15
 +++ receiver.c 2005-02-16 15:40:15

-@@ -560,6 +560,9 @@ int recv_files(int f_in, struct file_lis
+@@ -626,6 +626,9 @@ int recv_files(int f_in, struct file_lis

  
                if (!log_before_transfer)
                        log_recv(file, &initial_stats, iflags);
  
                if (!log_before_transfer)
                        log_recv(file, &initial_stats, iflags);


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

---- orig/sender.c      2005-02-16 15:35:54
+--- orig/sender.c      2005-02-20 01:12:43

 +++ sender.c   2005-02-16 15:40:44
 +++ sender.c   2005-02-16 15:40:44

-@@ -263,6 +263,9 @@ void send_files(struct file_list *flist,
+@@ -295,6 +295,9 @@ void send_files(struct file_list *flist,

                match_sums(f_out, s, mbuf, st.st_size);
                if (!log_before_transfer)
                        log_send(file, &initial_stats, iflags);
                match_sums(f_out, s, mbuf, st.st_size);
                if (!log_before_transfer)
                        log_send(file, &initial_stats, iflags);

diff --git a/acls.diff b/acls.diff
index f2f64da..14f6220 100644 (file)
--- a/acls.diff
+++ b/acls.diff
@@ -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-02-20 00:02:23
+--- orig/flist.c       2005-02-20 00:16:35

 +++ flist.c    2005-02-14 02:45:34
 @@ -974,6 +974,8 @@ void send_file_name(int f, struct file_l
        file = make_file(fname, flist, f == -2 ? SERVER_FILTERS : ALL_FILTERS);
 +++ flist.c    2005-02-14 02:45:34
 @@ -974,6 +974,8 @@ void send_file_name(int f, struct file_l
        file = make_file(fname, flist, f == -2 ? SERVER_FILTERS : ALL_FILTERS);


@@ -1325,9 +1325,9 @@ 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-02-20 00:02:23
+--- orig/generator.c   2005-02-20 22:13:19

 +++ generator.c        2005-02-20 00:02:51
 +++ generator.c        2005-02-20 00:02:51

-@@ -492,6 +492,10 @@ static void recv_generator(char *fname, 
+@@ -489,6 +489,10 @@ static void recv_generator(char *fname, 

                if (set_perms(fname, file, statret ? NULL : &st, 0)
                    && verbose && code && f_out != -1)
                        rprintf(code, "%s/\n", safe_fname(fname));
                if (set_perms(fname, file, statret ? NULL : &st, 0)
                    && verbose && code && f_out != -1)
                        rprintf(code, "%s/\n", safe_fname(fname));


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

---- orig/options.c     2005-02-20 00:02:23
+--- orig/options.c     2005-02-20 01:12:42

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


@@ -4607,7 +4607,7 @@ ACLs to a non-ACL-supporting disk should complain.
  int preserve_perms = 0;
  int preserve_devices = 0;
  int preserve_uid = 0;
  int preserve_perms = 0;
  int preserve_devices = 0;
  int preserve_uid = 0;

-@@ -171,6 +172,7 @@ static void print_rsync_version(enum log
+@@ -173,6 +174,7 @@ static void print_rsync_version(enum log

        char const *got_socketpair = "no ";
        char const *have_inplace = "no ";
        char const *hardlinks = "no ";
        char const *got_socketpair = "no ";
        char const *have_inplace = "no ";
        char const *hardlinks = "no ";


@@ -4615,7 +4615,7 @@ ACLs to a non-ACL-supporting disk should complain.
        char const *links = "no ";
        char const *ipv6 = "no ";
        STRUCT_STAT *dumstat;
        char const *links = "no ";
        char const *ipv6 = "no ";
        STRUCT_STAT *dumstat;

-@@ -187,6 +189,10 @@ static void print_rsync_version(enum log
+@@ -189,6 +191,10 @@ static void print_rsync_version(enum log

        hardlinks = "";
  #endif
  
        hardlinks = "";
  #endif
  


@@ -4626,7 +4626,7 @@ ACLs to a non-ACL-supporting disk should complain.
  #ifdef SUPPORT_LINKS
        links = "";
  #endif
  #ifdef SUPPORT_LINKS
        links = "";
  #endif

-@@ -201,9 +207,9 @@ static void print_rsync_version(enum log
+@@ -203,9 +209,9 @@ static void print_rsync_version(enum log

                "Copyright (C) 1996-2005 by Andrew Tridgell and others\n");
        rprintf(f, "<http://rsync.samba.org/>\n");
        rprintf(f, "Capabilities: %d-bit files, %ssocketpairs, "
                "Copyright (C) 1996-2005 by Andrew Tridgell and others\n");
        rprintf(f, "<http://rsync.samba.org/>\n");
        rprintf(f, "Capabilities: %d-bit files, %ssocketpairs, "


@@ -4638,7 +4638,7 @@ ACLs to a non-ACL-supporting disk should complain.
  
        /* Note that this field may not have type ino_t.  It depends
         * on the complicated interaction between largefile feature
  
        /* Note that this field may not have type ino_t.  It depends
         * on the complicated interaction between largefile feature

-@@ -273,6 +279,7 @@ void usage(enum logcode F)
+@@ -275,6 +281,7 @@ void usage(enum logcode F)

    rprintf(F," -H, --hard-links            preserve hard links\n");
    rprintf(F," -K, --keep-dirlinks         treat symlinked dir on receiver as dir\n");
    rprintf(F," -p, --perms                 preserve permissions\n");
    rprintf(F," -H, --hard-links            preserve hard links\n");
    rprintf(F," -K, --keep-dirlinks         treat symlinked dir on receiver as dir\n");
    rprintf(F," -p, --perms                 preserve permissions\n");


@@ -4646,7 +4646,7 @@ ACLs to a non-ACL-supporting disk should complain.
    rprintf(F," -o, --owner                 preserve owner (root only)\n");
    rprintf(F," -g, --group                 preserve group\n");
    rprintf(F," -D, --devices               preserve devices (root only)\n");
    rprintf(F," -o, --owner                 preserve owner (root only)\n");
    rprintf(F," -g, --group                 preserve group\n");
    rprintf(F," -D, --devices               preserve devices (root only)\n");

-@@ -394,6 +401,7 @@ static struct poptOption long_options[] 
+@@ -398,6 +405,7 @@ static struct poptOption long_options[] 

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


@@ -4654,7 +4654,7 @@ ACLs to a non-ACL-supporting disk should complain.
    {"owner",           'o', POPT_ARG_NONE,   &preserve_uid, 0, 0, 0 },
    {"group",           'g', POPT_ARG_NONE,   &preserve_gid, 0, 0, 0 },
    {"devices",         'D', POPT_ARG_NONE,   &preserve_devices, 0, 0, 0 },
    {"owner",           'o', POPT_ARG_NONE,   &preserve_uid, 0, 0, 0 },
    {"group",           'g', POPT_ARG_NONE,   &preserve_gid, 0, 0, 0 },
    {"devices",         'D', POPT_ARG_NONE,   &preserve_devices, 0, 0, 0 },

-@@ -849,6 +857,24 @@ int parse_arguments(int *argc, const cha
+@@ -853,6 +861,24 @@ int parse_arguments(int *argc, const cha

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


@@ -4679,7 +4679,7 @@ ACLs to a non-ACL-supporting disk should complain.
                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. */

-@@ -1242,6 +1268,8 @@ void server_options(char **args,int *arg
+@@ -1257,6 +1283,8 @@ void server_options(char **args,int *arg

  
        if (preserve_hard_links)
                argstr[x++] = 'H';
  
        if (preserve_hard_links)
                argstr[x++] = '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-02-19 09:27:49
+--- orig/rsync.yo      2005-02-20 01:12:43

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


@@ -4758,7 +4758,7 @@ ACLs to a non-ACL-supporting disk should complain.
   -o, --owner                 preserve owner (root only)
   -g, --group                 preserve group
   -D, --devices               preserve devices (root only)
   -o, --owner                 preserve owner (root only)
   -g, --group                 preserve group
   -D, --devices               preserve devices (root only)

-@@ -624,6 +625,11 @@ source file's permissions and the umask 
+@@ -625,6 +626,11 @@ source file's permissions and the umask 

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

diff --git a/append.diff b/append.diff
index c0c9a9b..35930e8 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-02-20 01:12:42
+--- orig/generator.c   2005-02-20 22:13:19

 +++ generator.c        2005-02-15 19:31:13
 @@ -46,6 +46,7 @@ extern int remove_sent_files;
  extern int update_only;
 +++ generator.c        2005-02-15 19:31:13
 @@ -46,6 +46,7 @@ extern int remove_sent_files;
  extern int update_only;


@@ -200,7 +200,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-02-20 02:54:54
+--- orig/receiver.c    2005-02-20 20:55:51

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


@@ -210,7 +210,7 @@ an ftp client, appending new data onto the end of the files it updates.
  extern int keep_partial;
  extern int checksum_seed;
  extern int inplace;
  extern int keep_partial;
  extern int checksum_seed;
  extern int inplace;

-@@ -170,6 +171,28 @@ static int receive_data(int f_in, char *
+@@ -233,6 +234,28 @@ static int receive_data(int f_in, char *

  
        sum_init(checksum_seed);
  
  
        sum_init(checksum_seed);
  


@@ -239,7 +239,7 @@ an ftp client, appending new data onto the end of the files it updates.
        while ((i = recv_token(f_in, &data)) != 0) {
                if (do_progress)
                        show_progress(offset, total_size);
        while ((i = recv_token(f_in, &data)) != 0) {
                if (do_progress)
                        show_progress(offset, total_size);

-@@ -364,6 +387,7 @@ int recv_files(int f_in, struct file_lis
+@@ -422,6 +445,7 @@ int recv_files(int f_in, struct file_lis

                        send_msg(MSG_DONE, "", 0);
                        if (keep_partial && !partial_dir)
                                make_backups = 0; /* prevents double backup */
                        send_msg(MSG_DONE, "", 0);
                        if (keep_partial && !partial_dir)
                                make_backups = 0; /* prevents double backup */

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

---- orig/batch.c       2005-02-07 20:41:56
+--- orig/batch.c       2005-02-16 17:08:13

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

-@@ -206,6 +206,8 @@ void show_flist(int index, struct file_s
+@@ -205,6 +205,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,17 +15,17 @@ 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-14 02:45:10
+--- orig/flist.c       2005-02-20 00:16:35

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

-@@ -62,6 +62,7 @@ extern int make_backups;
- extern int backup_suffix_len;
+@@ -54,6 +54,7 @@ extern int relative_paths;
+ extern int implied_dirs;

  extern int copy_links;
  extern int copy_unsafe_links;
 +extern int copy_atimes;
  extern int protocol_version;
  extern int sanitize_paths;
  extern int copy_links;
  extern int copy_unsafe_links;
 +extern int copy_atimes;
  extern int protocol_version;
  extern int sanitize_paths;

- extern int max_delete;
-@@ -147,16 +148,18 @@ static void list_file_entry(struct file_
+ extern int deletion_count;
+@@ -143,16 +144,18 @@ static void list_file_entry(struct file_

  
  #ifdef SUPPORT_LINKS
        if (preserve_links && S_ISLNK(f->mode)) {
  
  #ifdef SUPPORT_LINKS
        if (preserve_links && S_ISLNK(f->mode)) {


@@ -46,7 +46,7 @@ command before "make":
                        safe_fname(f_name(f)));
        }
  }
                        safe_fname(f_name(f)));
        }
  }

-@@ -320,6 +323,7 @@ void send_file_entry(struct file_struct 
+@@ -316,6 +319,7 @@ void send_file_entry(struct file_struct 

  {
        unsigned short flags;
        static time_t modtime;
  {
        unsigned short flags;
        static time_t modtime;


@@ -54,7 +54,7 @@ command before "make":
        static mode_t mode;
        static int64 dev;
        static dev_t rdev;
        static mode_t mode;
        static int64 dev;
        static dev_t rdev;

-@@ -335,7 +339,7 @@ void send_file_entry(struct file_struct 
+@@ -331,7 +335,7 @@ void send_file_entry(struct file_struct 

  
        if (!file) {
                write_byte(f, 0);
  
        if (!file) {
                write_byte(f, 0);


@@ -63,7 +63,7 @@ command before "make":
                dev = 0, rdev = makedev(0, 0);
                rdev_major = 0;
                uid = 0, gid = 0;
                dev = 0, rdev = makedev(0, 0);
                rdev_major = 0;
                uid = 0, gid = 0;

-@@ -384,6 +388,12 @@ void send_file_entry(struct file_struct 
+@@ -380,6 +384,12 @@ void send_file_entry(struct file_struct 

                flags |= XMIT_SAME_TIME;
        else
                modtime = file->modtime;
                flags |= XMIT_SAME_TIME;
        else
                modtime = file->modtime;


@@ -76,7 +76,7 @@ command before "make":
  
  #ifdef SUPPORT_HARD_LINKS
        if (file->link_u.idev) {
  
  #ifdef SUPPORT_HARD_LINKS
        if (file->link_u.idev) {

-@@ -439,6 +449,8 @@ void send_file_entry(struct file_struct 
+@@ -435,6 +445,8 @@ void send_file_entry(struct file_struct 

                write_int(f, modtime);
        if (!(flags & XMIT_SAME_MODE))
                write_int(f, to_wire_mode(mode));
                write_int(f, modtime);
        if (!(flags & XMIT_SAME_MODE))
                write_int(f, to_wire_mode(mode));


@@ -85,7 +85,7 @@ command before "make":
        if (preserve_uid && !(flags & XMIT_SAME_UID)) {
                if (!numeric_ids)
                        add_uid(uid);
        if (preserve_uid && !(flags & XMIT_SAME_UID)) {
                if (!numeric_ids)
                        add_uid(uid);

-@@ -512,6 +524,7 @@ static struct file_struct *receive_file_
+@@ -508,6 +520,7 @@ static struct file_struct *receive_file_

                                              unsigned short flags, int f)
  {
        static time_t modtime;
                                              unsigned short flags, int f)
  {
        static time_t modtime;


@@ -93,7 +93,7 @@ command before "make":
        static mode_t mode;
        static int64 dev;
        static dev_t rdev;
        static mode_t mode;
        static int64 dev;
        static dev_t rdev;

-@@ -530,7 +543,7 @@ static struct file_struct *receive_file_
+@@ -526,7 +539,7 @@ static struct file_struct *receive_file_

        struct file_struct *file;
  
        if (!flist) {
        struct file_struct *file;
  
        if (!flist) {


@@ -102,7 +102,7 @@ command before "make":
                dev = 0, rdev = makedev(0, 0);
                rdev_major = 0;
                uid = 0, gid = 0;
                dev = 0, rdev = makedev(0, 0);
                rdev_major = 0;
                uid = 0, gid = 0;

-@@ -586,6 +599,8 @@ static struct file_struct *receive_file_
+@@ -582,6 +595,8 @@ static struct file_struct *receive_file_

                modtime = (time_t)read_int(f);
        if (!(flags & XMIT_SAME_MODE))
                mode = from_wire_mode(read_int(f));
                modtime = (time_t)read_int(f);
        if (!(flags & XMIT_SAME_MODE))
                mode = from_wire_mode(read_int(f));


@@ -111,7 +111,7 @@ command before "make":
  
        if (preserve_uid && !(flags & XMIT_SAME_UID))
                uid = (uid_t)read_int(f);
  
        if (preserve_uid && !(flags & XMIT_SAME_UID))
                uid = (uid_t)read_int(f);

-@@ -636,6 +651,7 @@ static struct file_struct *receive_file_
+@@ -632,6 +647,7 @@ static struct file_struct *receive_file_

  
        file->flags = 0;
        file->modtime = modtime;
  
        file->flags = 0;
        file->modtime = modtime;


@@ -119,7 +119,7 @@ command before "make":
        file->length = file_length;
        file->mode = mode;
        file->uid = uid;
        file->length = file_length;
        file->mode = mode;
        file->uid = uid;

-@@ -885,6 +901,7 @@ skip_filters:
+@@ -881,6 +897,7 @@ skip_filters:

  
        file->flags = flags;
        file->modtime = st.st_mtime;
  
        file->flags = flags;
        file->modtime = st.st_mtime;


@@ -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-02-14 02:45:10
+--- orig/generator.c   2005-02-20 22:13:19

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

-@@ -100,7 +100,7 @@ static int unchanged_file(char *fn, stru
+@@ -150,7 +150,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":
  }
  
  
  }
  
  

-@@ -612,7 +612,7 @@ static void recv_generator(char *fname, 
+@@ -725,7 +725,7 @@ static void recv_generator(char *fname, 

        }
  
        if (update_only && fnamecmp_type == FNAMECMP_FNAME
        }
  
        if (update_only && fnamecmp_type == FNAMECMP_FNAME


@@ -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-02-14 02:45:10
+--- orig/options.c     2005-02-20 01:12:42

 +++ options.c  2005-01-24 01:51:48
 @@ -50,6 +50,7 @@ int preserve_uid = 0;
  int preserve_gid = 0;
 +++ options.c  2005-01-24 01:51:48
 @@ -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;

-@@ -273,6 +274,7 @@ void usage(enum logcode F)
+@@ -279,6 +280,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");

-@@ -394,6 +396,7 @@ static struct poptOption long_options[] 
+@@ -403,6 +405,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_NONE,   &omit_dir_times, 0, 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_NONE,   &omit_dir_times, 0, 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 },

-@@ -1214,6 +1217,8 @@ void server_options(char **args,int *arg
+@@ -1265,6 +1268,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,17 +182,17 @@ command before "make":
        if (omit_dir_times && am_sender)
                argstr[x++] = 'O';
        if (preserve_perms)
        if (omit_dir_times && am_sender)
                argstr[x++] = 'O';
        if (preserve_perms)

---- orig/rsync.c       2005-02-14 02:45:10
+--- orig/rsync.c       2005-02-20 00:02:23

 +++ rsync.c    2005-01-24 01:59:12
 +++ rsync.c    2005-01-24 01:59:12

-@@ -26,6 +26,7 @@ extern int verbose;
- extern int dry_run;
+@@ -27,6 +27,7 @@ extern int dry_run;
+ extern int daemon_log_format_has_i;

  extern int preserve_times;
  extern int omit_dir_times;
 +extern int copy_atimes;
  extern int am_root;
  extern int am_server;
  extern int am_sender;
  extern int preserve_times;
  extern int omit_dir_times;
 +extern int copy_atimes;
  extern int am_root;
  extern int am_server;
  extern int am_sender;

-@@ -156,6 +157,7 @@ int set_perms(char *fname,struct file_st
+@@ -173,6 +174,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)

-@@ -168,18 +170,28 @@ int set_perms(char *fname,struct file_st
+@@ -185,18 +187,28 @@ int set_perms(char *fname,struct file_st

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


@@ -235,7 +235,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-02-14 02:45:10
+--- orig/rsync.h       2005-02-20 00:02:23

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


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

-@@ -115,6 +116,7 @@
+@@ -116,6 +117,7 @@

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


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

-@@ -483,6 +485,7 @@ struct file_struct {
+@@ -498,6 +500,7 @@ struct file_struct {

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


@@ -261,7 +261,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-02-14 02:45:11
+--- orig/rsync.yo      2005-02-20 01:12:43

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


@@ -270,8 +270,8 @@ command before "make":
 + -A, --copy-atimes           copy access times
   -S, --sparse                handle sparse files efficiently
   -n, --dry-run               show what would have been transferred
 + -A, --copy-atimes           copy access times
   -S, --sparse                handle sparse files efficiently
   -n, --dry-run               show what would have been transferred

-  -W, --whole-file            copy files whole
-@@ -643,6 +644,11 @@ dit(bf(-O, --omit-dir-times)) This tells
+  -W, --whole-file            copy files whole (without rsync algorithm)
+@@ -654,6 +655,11 @@ dit(bf(-O, --omit-dir-times)) This tells

  it is preserving modification times (see bf(--times)).  If NFS is sharing
  the directories on the receiving side, it is a good idea to use bf(-O).
  
  it is preserving modification times (see bf(--times)).  If NFS is sharing
  the directories on the receiving side, it is a good idea to use bf(-O).
  


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

---- orig/util.c        2005-02-14 02:45:11
+--- orig/util.c        2005-02-20 19:17:49

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

diff --git a/chmod-option.diff b/chmod-option.diff
index 599bd59..5f59c54 100644 (file)
--- a/chmod-option.diff
+++ b/chmod-option.diff
@@ -225,9 +225,9 @@ 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-02-20 00:02:23
+--- orig/options.c     2005-02-20 01:12:42

 +++ options.c  2005-02-16 15:38:40
 +++ options.c  2005-02-16 15:38:40

-@@ -132,6 +132,7 @@ char *log_format = NULL;
+@@ -134,6 +134,7 @@ char *log_format = NULL;

  char *password_file = NULL;
  char *rsync_path = RSYNC_PATH;
  char *backup_dir = NULL;
  char *password_file = NULL;
  char *rsync_path = RSYNC_PATH;
  char *backup_dir = 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;

-@@ -151,6 +152,8 @@ int list_only = 0;
+@@ -153,6 +154,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;

-@@ -278,6 +281,7 @@ void usage(enum logcode F)
+@@ -280,6 +283,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");

-@@ -396,6 +400,7 @@ static struct poptOption long_options[] 
+@@ -400,6 +404,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_NONE,   &omit_dir_times, 0, 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_NONE,   &omit_dir_times, 0, 0, 0 },

-@@ -1067,6 +1072,13 @@ int parse_arguments(int *argc, const cha
+@@ -1082,6 +1087,13 @@ int parse_arguments(int *argc, const cha

                return 0;
        }
  
                return 0;
        }
  


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

-@@ -1416,6 +1428,11 @@ void server_options(char **args,int *arg
+@@ -1431,6 +1443,11 @@ void server_options(char **args,int *arg

                }
        }
  
                }
        }
  


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

---- orig/rsync.yo      2005-02-19 09:27:49
+--- orig/rsync.yo      2005-02-20 01:12:43

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


@@ -296,7 +296,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,14 @@ dit(bf(-O, --omit-dir-times)) This tells
+@@ -654,6 +655,14 @@ dit(bf(-O, --omit-dir-times)) This tells

  it is preserving modification times (see bf(--times)).  If NFS is sharing
  the directories on the receiving side, it is a good idea to use bf(-O).
  
  it is preserving modification times (see bf(--times)).  If NFS is sharing
  the directories on the receiving side, it is a good idea to use bf(-O).
  

diff --git a/date-only.diff b/date-only.diff
index 18d5ed8..6fd12de 100644 (file)
--- a/date-only.diff
+++ b/date-only.diff
@@ -15,9 +15,9 @@ 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-13 05:50:28
+--- orig/generator.c   2005-02-20 22:13:19

 +++ generator.c        2004-11-11 22:15:27
 +++ generator.c        2004-11-11 22:15:27

-@@ -43,6 +43,7 @@ extern int inplace;
+@@ -49,6 +49,7 @@ extern int inplace;

  extern int make_backups;
  extern int csum_length;
  extern int ignore_times;
  extern int make_backups;
  extern int csum_length;
  extern int ignore_times;


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

-@@ -81,6 +82,8 @@ static int unchanged_attrs(struct file_s
+@@ -132,6 +133,8 @@ static void itemize(struct file_struct *

  /* 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,25 +34,25 @@ Jeremy Bornstein
        if (st->st_size != file->length)
                return 0;
  
        if (st->st_size != file->length)
                return 0;
  

---- orig/options.c     2005-02-13 05:50:28
+--- orig/options.c     2005-02-20 01:12:42

 +++ options.c  2005-01-28 19:14:15
 +++ options.c  2005-01-28 19:14:15

-@@ -87,6 +87,7 @@ int keep_partial = 0;
+@@ -88,6 +88,7 @@ int keep_partial = 0;

  int safe_symlinks = 0;
  int copy_unsafe_links = 0;
  int size_only = 0;
 +int date_only = 0;
  int daemon_bwlimit = 0;
  int bwlimit = 0;
  int safe_symlinks = 0;
  int copy_unsafe_links = 0;
  int size_only = 0;
 +int date_only = 0;
  int daemon_bwlimit = 0;
  int bwlimit = 0;

- size_t bwlimit_writemax = 0;
-@@ -300,6 +301,7 @@ void usage(enum logcode F)
+ int fuzzy_basis = 0;
+@@ -308,6 +309,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,"     --date-only             skip files that match in mod-time\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,"     --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,"     --date-only             skip files that match in mod-time\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,"     --compare-dest=DIR      also compare destination files relative to DIR\n");
-@@ -354,6 +356,7 @@ static struct poptOption long_options[] 
+   rprintf(F," -y, --fuzzy                 find similar file for basis if no dest file\n");
+@@ -364,6 +366,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 },

-@@ -1306,6 +1309,9 @@ void server_options(char **args,int *arg
+@@ -1371,6 +1374,9 @@ void server_options(char **args,int *arg

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


@@ -70,17 +70,17 @@ 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-02-13 21:51:10
+--- orig/rsync.yo      2005-02-20 01:12:43

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

-@@ -349,6 +349,7 @@ to the detailed description below for a 
+@@ -350,6 +350,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
 +     --date-only             skip files that match in mod-time
       --modify-window=NUM     compare mod-times with reduced accuracy
   -T, --temp-dir=DIR          create temporary files in directory DIR
       --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
 +     --date-only             skip files that match in mod-time
       --modify-window=NUM     compare mod-times with reduced accuracy
   -T, --temp-dir=DIR          create temporary files in directory DIR

-      --compare-dest=DIR      also compare received files relative to DIR
-@@ -434,6 +435,12 @@ regardless of timestamp. This is useful 
+  -y, --fuzzy                 find similar file for basis if no dest file
+@@ -446,6 +447,12 @@ regardless of timestamp. This is useful 

  after using another mirroring system which may not preserve timestamps
  exactly.
  
  after using another mirroring system which may not preserve timestamps
  exactly.
  

diff --git a/fname-convert.diff b/fname-convert.diff
index 84e1086..c36b33b 100644 (file)
--- a/fname-convert.diff
+++ b/fname-convert.diff
@@ -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-02-20 00:02:23
+--- orig/generator.c   2005-02-20 22:13:19

 +++ generator.c        2005-02-03 02:07:33
 +++ generator.c        2005-02-03 02:07:33

-@@ -339,7 +339,13 @@ static int find_fuzzy(struct file_struct
+@@ -340,7 +340,13 @@ static int find_fuzzy(struct file_struct

   * 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


@@ -409,9 +409,9 @@ 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-02-20 00:02:23
+--- orig/main.c        2005-02-20 01:12:42

 +++ main.c     2004-07-22 00:31:47
 +++ main.c     2004-07-22 00:31:47

-@@ -359,7 +359,7 @@ static pid_t do_cmd(char *cmd, char *mac
+@@ -361,7 +361,7 @@ static pid_t do_cmd(char *cmd, char *mac

                        whole_file = 1;
                ret = local_child(argc, args, f_in, f_out, child_main);
        } else
                        whole_file = 1;
                ret = local_child(argc, args, f_in, f_out, child_main);
        } else


@@ -420,9 +420,9 @@ 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-02-20 00:02:23
+--- orig/options.c     2005-02-20 01:12:42

 +++ options.c  2005-02-14 02:50:32
 +++ options.c  2005-02-14 02:50:32

-@@ -129,6 +129,7 @@ char *basis_dir[MAX_BASIS_DIRS+1];
+@@ -131,6 +131,7 @@ char *basis_dir[MAX_BASIS_DIRS+1];

  char *config_file = NULL;
  char *shell_cmd = NULL;
  char *log_format = NULL;
  char *config_file = NULL;
  char *shell_cmd = NULL;
  char *log_format = NULL;


@@ -430,7 +430,7 @@ Note that you'll need to run 'make proto' after applying this patch.
  char *password_file = NULL;
  char *rsync_path = RSYNC_PATH;
  char *backup_dir = NULL;
  char *password_file = NULL;
  char *rsync_path = RSYNC_PATH;
  char *backup_dir = NULL;

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

    rprintf(F,"     --compare-dest=DIR      also compare destination files relative to DIR\n");
    rprintf(F,"     --copy-dest=DIR         ... and include copies of unchanged files\n");
    rprintf(F,"     --link-dest=DIR         hardlink to files in DIR when unchanged\n");
    rprintf(F,"     --compare-dest=DIR      also compare destination files relative to DIR\n");
    rprintf(F,"     --copy-dest=DIR         ... and include copies of unchanged files\n");
    rprintf(F,"     --link-dest=DIR         hardlink to files in DIR when unchanged\n");


@@ -438,7 +438,7 @@ Note that you'll need to run 'make proto' after applying this patch.
    rprintf(F," -z, --compress              compress file data during the transfer\n");
    rprintf(F," -C, --cvs-exclude           auto-ignore files the same way CVS does\n");
    rprintf(F," -f, --filter=RULE           add a file-filtering RULE\n");
    rprintf(F," -z, --compress              compress file data during the transfer\n");
    rprintf(F," -C, --cvs-exclude           auto-ignore files the same way CVS does\n");
    rprintf(F," -f, --filter=RULE           add a file-filtering RULE\n");

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

    {"copy-dest",        0,  POPT_ARG_STRING, 0, OPT_COPY_DEST, 0, 0 },
    {"link-dest",        0,  POPT_ARG_STRING, 0, OPT_LINK_DEST, 0, 0 },
    {"fuzzy",           'y', POPT_ARG_NONE,   &fuzzy_basis, 0, 0, 0 },
    {"copy-dest",        0,  POPT_ARG_STRING, 0, OPT_COPY_DEST, 0, 0 },
    {"link-dest",        0,  POPT_ARG_STRING, 0, OPT_LINK_DEST, 0, 0 },
    {"fuzzy",           'y', POPT_ARG_NONE,   &fuzzy_basis, 0, 0, 0 },


@@ -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-02-18 20:17:35
+--- orig/util.c        2005-02-20 19:17:49

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

diff --git a/fsync.diff b/fsync.diff
index d96b9b5..41c5ba8 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-02-20 00:02:23
+--- orig/options.c     2005-02-20 01:12:42

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

-@@ -301,6 +302,7 @@ void usage(enum logcode F)
+@@ -304,6 +305,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");

-@@ -381,6 +383,7 @@ static struct poptOption long_options[] 
+@@ -385,6 +387,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 },

-@@ -1404,6 +1407,9 @@ void server_options(char **args,int *arg
+@@ -1419,6 +1422,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-20 00:16:35
+--- orig/receiver.c    2005-02-20 20:55:51

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


@@ -47,7 +47,7 @@ to be called on every file we write.
  extern int basis_dir_cnt;
  extern int make_backups;
  extern int cleanup_got_literal;
  extern int basis_dir_cnt;
  extern int make_backups;
  extern int cleanup_got_literal;

-@@ -248,6 +249,12 @@ static int receive_data(int f_in, char *
+@@ -312,6 +313,12 @@ static int receive_data(int f_in, char *

                exit_cleanup(RERR_FILEIO);
        }
  
                exit_cleanup(RERR_FILEIO);
        }
  


@@ -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-18 20:17:35
+--- orig/util.c        2005-02-20 19:17:49

 +++ 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 bdcea37..302563b 100644 (file)
--- a/ignore-case.diff
+++ b/ignore-case.diff
@@ -35,9 +35,9 @@ in a case-insensitive manner.
          case '?':
            /* Match anything but '/'. */
            if (*text == '/')
          case '?':
            /* Match anything but '/'. */
            if (*text == '/')

---- orig/options.c     2005-02-11 18:21:45
+--- orig/options.c     2005-02-20 01:12:42

 +++ options.c  2004-10-14 17:22:51
 +++ options.c  2004-10-14 17:22:51

-@@ -96,6 +96,7 @@ int max_delete = 0;
+@@ -99,6 +99,7 @@ int max_delete = 0;

  OFF_T max_size = 0;
  int ignore_errors = 0;
  int modify_window = 0;
  OFF_T max_size = 0;
  int ignore_errors = 0;
  int modify_window = 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;

-@@ -316,6 +317,7 @@ void usage(enum logcode F)
+@@ -325,6 +326,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");

-@@ -371,6 +373,7 @@ static struct poptOption long_options[] 
+@@ -382,6 +384,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 },

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

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


@@ -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-11 10:53:15
+--- orig/util.c        2005-02-20 19:17:49

 +++ 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 3bf0da4..ba2df4a 100644 (file)
--- a/link-by-hash.diff
+++ b/link-by-hash.diff
@@ -365,9 +365,9 @@ the file's name.
 +}
 +
 +#endif
 +}
 +
 +#endif

---- orig/options.c     2005-02-20 00:02:23
+--- orig/options.c     2005-02-20 01:12:42

 +++ options.c  2005-02-14 02:52:09
 +++ options.c  2005-02-14 02:52:09

-@@ -132,6 +132,7 @@ char *log_format = NULL;
+@@ -134,6 +134,7 @@ char *log_format = NULL;

  char *password_file = NULL;
  char *rsync_path = RSYNC_PATH;
  char *backup_dir = NULL;
  char *password_file = NULL;
  char *rsync_path = RSYNC_PATH;
  char *backup_dir = NULL;


@@ -375,7 +375,7 @@ the file's name.
  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;

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

    rprintf(F,"     --compare-dest=DIR      also compare destination files relative to DIR\n");
    rprintf(F,"     --copy-dest=DIR         ... and include copies of unchanged files\n");
    rprintf(F,"     --link-dest=DIR         hardlink to files in DIR when unchanged\n");
    rprintf(F,"     --compare-dest=DIR      also compare destination files relative to DIR\n");
    rprintf(F,"     --copy-dest=DIR         ... and include copies of unchanged files\n");
    rprintf(F,"     --link-dest=DIR         hardlink to files in DIR when unchanged\n");


@@ -383,7 +383,7 @@ the file's name.
    rprintf(F," -z, --compress              compress file data during the transfer\n");
    rprintf(F," -C, --cvs-exclude           auto-ignore files the same way CVS does\n");
    rprintf(F," -f, --filter=RULE           add a file-filtering RULE\n");
    rprintf(F," -z, --compress              compress file data during the transfer\n");
    rprintf(F," -C, --cvs-exclude           auto-ignore files the same way CVS does\n");
    rprintf(F," -f, --filter=RULE           add a file-filtering RULE\n");

-@@ -350,7 +352,7 @@ void usage(enum logcode F)
+@@ -353,7 +355,7 @@ void usage(enum logcode F)

  enum {OPT_VERSION = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
        OPT_FILTER, OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST,
        OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW,
  enum {OPT_VERSION = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
        OPT_FILTER, OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST,
        OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW,


@@ -392,7 +392,7 @@ the file's name.
        OPT_REFUSED_BASE = 9000};
  
  static struct poptOption long_options[] = {
        OPT_REFUSED_BASE = 9000};
  
  static struct poptOption long_options[] = {

-@@ -418,6 +420,7 @@ static struct poptOption long_options[] 
+@@ -422,6 +424,7 @@ static struct poptOption long_options[] 

    {"compare-dest",     0,  POPT_ARG_STRING, 0, OPT_COMPARE_DEST, 0, 0 },
    {"copy-dest",        0,  POPT_ARG_STRING, 0, OPT_COPY_DEST, 0, 0 },
    {"link-dest",        0,  POPT_ARG_STRING, 0, OPT_LINK_DEST, 0, 0 },
    {"compare-dest",     0,  POPT_ARG_STRING, 0, OPT_COMPARE_DEST, 0, 0 },
    {"copy-dest",        0,  POPT_ARG_STRING, 0, OPT_COPY_DEST, 0, 0 },
    {"link-dest",        0,  POPT_ARG_STRING, 0, OPT_LINK_DEST, 0, 0 },


@@ -400,7 +400,7 @@ the file's name.
    {"fuzzy",           'y', POPT_ARG_NONE,   &fuzzy_basis, 0, 0, 0 },
    /* TODO: Should this take an optional int giving the compression level? */
    {"compress",        'z', POPT_ARG_NONE,   &do_compression, 0, 0, 0 },
    {"fuzzy",           'y', POPT_ARG_NONE,   &fuzzy_basis, 0, 0, 0 },
    /* TODO: Should this take an optional int giving the compression level? */
    {"compress",        'z', POPT_ARG_NONE,   &do_compression, 0, 0, 0 },

-@@ -849,6 +852,21 @@ int parse_arguments(int *argc, const cha
+@@ -853,6 +856,21 @@ int parse_arguments(int *argc, const cha

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


@@ -422,7 +422,7 @@ the file's name.
                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. */

-@@ -1416,6 +1434,11 @@ void server_options(char **args,int *arg
+@@ -1431,6 +1449,11 @@ void server_options(char **args,int *arg

                }
        }
  
                }
        }
  


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

---- orig/receiver.c    2005-02-20 00:16:35
+--- orig/receiver.c    2005-02-20 20:55:51

 +++ receiver.c 2005-01-15 21:29:13
 +++ receiver.c 2005-01-15 21:29:13

-@@ -51,6 +51,7 @@ extern int delay_updates;
+@@ -52,6 +52,7 @@ extern int delay_updates;

  extern struct stats stats;
  extern char *log_format;
  extern char *tmpdir;
  extern struct stats stats;
  extern char *log_format;
  extern char *tmpdir;


@@ -444,7 +444,7 @@ the file's name.
  extern char *partial_dir;
  extern char *basis_dir[];
  
  extern char *partial_dir;
  extern char *basis_dir[];
  

-@@ -142,12 +143,13 @@ static int get_tmpname(char *fnametmp, c
+@@ -206,12 +207,13 @@ static int get_tmpname(char *fnametmp, c

  
  
  static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
  
  
  static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,


@@ -459,7 +459,7 @@ the file's name.
        int32 len;
        OFF_T offset = 0;
        OFF_T offset2;
        int32 len;
        OFF_T offset = 0;
        OFF_T offset2;

-@@ -167,6 +169,9 @@ static int receive_data(int f_in, char *
+@@ -231,6 +233,9 @@ static int receive_data(int f_in, char *

        } else
                mapbuf = NULL;
  
        } else
                mapbuf = NULL;
  


@@ -469,7 +469,7 @@ the file's name.
        sum_init(checksum_seed);
  
        while ((i = recv_token(f_in, &data)) != 0) {
        sum_init(checksum_seed);
  
        while ((i = recv_token(f_in, &data)) != 0) {

-@@ -183,6 +188,8 @@ static int receive_data(int f_in, char *
+@@ -247,6 +252,8 @@ static int receive_data(int f_in, char *

                        cleanup_got_literal = 1;
  
                        sum_update(data, i);
                        cleanup_got_literal = 1;
  
                        sum_update(data, i);


@@ -478,7 +478,7 @@ the file's name.
  
                        if (fd != -1 && write_file(fd,data,i) != i)
                                goto report_write_error;
  
                        if (fd != -1 && write_file(fd,data,i) != i)
                                goto report_write_error;

-@@ -209,6 +216,8 @@ static int receive_data(int f_in, char *
+@@ -273,6 +280,8 @@ static int receive_data(int f_in, char *

  
                        see_token(map, len);
                        sum_update(map, len);
  
                        see_token(map, len);
                        sum_update(map, len);


@@ -487,7 +487,7 @@ the file's name.
                }
  
                if (inplace) {
                }
  
                if (inplace) {

-@@ -249,6 +258,8 @@ static int receive_data(int f_in, char *
+@@ -313,6 +322,8 @@ static int receive_data(int f_in, char *

        }
  
        sum_end(file_sum1);
        }
  
        sum_end(file_sum1);


@@ -496,7 +496,7 @@ the file's name.
  
        if (mapbuf)
                unmap_file(mapbuf);
  
        if (mapbuf)
                unmap_file(mapbuf);

-@@ -294,7 +305,7 @@ static void read_gen_name(int fd, char *
+@@ -358,7 +369,7 @@ static void read_gen_name(int fd, char *

  
  static void discard_receive_data(int f_in, OFF_T length)
  {
  
  static void discard_receive_data(int f_in, OFF_T length)
  {


@@ -505,7 +505,7 @@ the file's name.
  }
  
  
  }
  
  

-@@ -562,8 +573,12 @@ int recv_files(int f_in, struct file_lis
+@@ -621,8 +632,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 */


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

---- orig/rsync.yo      2005-02-19 09:27:49
+--- orig/rsync.yo      2005-02-20 01:12:43

 +++ rsync.yo   2005-02-13 06:58:47
 +++ rsync.yo   2005-02-13 06:58:47

-@@ -355,6 +355,7 @@ to the detailed description below for a 
+@@ -356,6 +356,7 @@ to the detailed description below for a 

       --compare-dest=DIR      also compare received files relative to DIR
       --copy-dest=DIR         ... and include copies of unchanged files
       --link-dest=DIR         hardlink to files in DIR when unchanged
       --compare-dest=DIR      also compare received files relative to DIR
       --copy-dest=DIR         ... and include copies of unchanged files
       --link-dest=DIR         hardlink to files in DIR when unchanged

diff --git a/links-depth.diff b/links-depth.diff
index 2e7a758..affc777 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-14 02:45:10
+--- orig/flist.c       2005-02-20 00:16:35

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

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


@@ -16,7 +16,7 @@ in this modified version.
  extern int preserve_hard_links;
  extern int preserve_perms;
  extern int preserve_devices;
  extern int preserve_hard_links;
  extern int preserve_perms;
  extern int preserve_devices;

-@@ -737,6 +738,30 @@ static struct file_struct *receive_file_
+@@ -733,6 +734,30 @@ static struct file_struct *receive_file_

  }
  
  
  }
  
  


@@ -47,7 +47,7 @@ in this modified version.
  /**
   * Create a file_struct for a named file by reading its stat()
   * information and performing extensive checks against global
  /**
   * Create a file_struct for a named file by reading its stat()
   * information and performing extensive checks against global

-@@ -862,7 +887,13 @@ skip_filters:
+@@ -858,7 +883,13 @@ skip_filters:

        basename_len = strlen(basename) + 1; /* count the '\0' */
  
  #ifdef SUPPORT_LINKS
        basename_len = strlen(basename) + 1; /* count the '\0' */
  
  #ifdef SUPPORT_LINKS


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

---- orig/options.c     2005-02-14 02:45:10
+--- orig/options.c     2005-02-20 01:12:42

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

-@@ -263,6 +264,7 @@ void usage(enum logcode F)
+@@ -269,6 +270,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");

-@@ -383,6 +385,7 @@ static struct poptOption long_options[] 
+@@ -392,6 +394,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,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-02-14 02:45:11
+--- orig/rsync.yo      2005-02-20 01:12:43

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

diff --git a/netgroup-auth.diff b/netgroup-auth.diff
index e135646..d41d428 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-01-28 19:08:19
+--- orig/access.c      2005-02-14 02:45:09

 +++ 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 c15ef07..e176849 100644 (file)
--- a/openssl-support.diff
+++ b/openssl-support.diff
@@ -223,9 +223,9 @@ 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/main.c        2005-02-20 00:02:23
+--- orig/main.c        2005-02-20 01:12:42

 +++ main.c     2004-10-08 20:15:28
 +++ main.c     2004-10-08 20:15:28

-@@ -52,6 +52,9 @@ extern int write_batch;
+@@ -54,6 +54,9 @@ extern int write_batch;

  extern int batch_fd;
  extern int batch_gen_fd;
  extern int filesfrom_fd;
  extern int batch_fd;
  extern int batch_gen_fd;
  extern int filesfrom_fd;


@@ -235,7 +235,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
  extern pid_t cleanup_child_pid;
  extern struct stats stats;
  extern char *files_from;
  extern pid_t cleanup_child_pid;
  extern struct stats stats;
  extern char *files_from;

-@@ -823,33 +826,48 @@ static int start_client(int argc, char *
+@@ -836,33 +839,48 @@ static int start_client(int argc, char *

        if ((rc = copy_argv(argv)))
                return rc;
  
        if ((rc = copy_argv(argv)))
                return rc;
  


@@ -308,7 +308,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
                p = find_colon(argv[0]);
                if (p) { /* source is remote */
                        if (remote_filesfrom_file
                p = find_colon(argv[0]);
                if (p) { /* source is remote */
                        if (remote_filesfrom_file

-@@ -881,12 +899,26 @@ static int start_client(int argc, char *
+@@ -894,12 +912,26 @@ static int start_client(int argc, char *

                        argv++;
                } else { /* source is local */
                        am_sender = 1;
                        argv++;
                } else { /* source is local */
                        am_sender = 1;


@@ -338,9 +338,9 @@ can't say if I've left any cleanup/compatibility errors in the code.
                                p = strchr(host,'/');
                                if (p) {
                                        *p = '\0';
                                p = strchr(host,'/');
                                if (p) {
                                        *p = '\0';

---- orig/options.c     2005-02-20 00:02:23
+--- orig/options.c     2005-02-20 01:12:42

 +++ options.c  2004-11-27 18:31:46
 +++ options.c  2004-11-27 18:31:46

-@@ -148,6 +148,14 @@ int log_format_has_o_or_i = 0;
+@@ -150,6 +150,14 @@ int log_format_has_o_or_i = 0;

  int always_checksum = 0;
  int list_only = 0;
  
  int always_checksum = 0;
  int list_only = 0;
  


@@ -355,7 +355,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
  #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;
  

-@@ -173,6 +181,7 @@ static void print_rsync_version(enum log
+@@ -175,6 +183,7 @@ static void print_rsync_version(enum log

        char const *hardlinks = "no ";
        char const *links = "no ";
        char const *ipv6 = "no ";
        char const *hardlinks = "no ";
        char const *links = "no ";
        char const *ipv6 = "no ";


@@ -363,7 +363,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
        STRUCT_STAT *dumstat;
  
  #ifdef HAVE_SOCKETPAIR
        STRUCT_STAT *dumstat;
  
  #ifdef HAVE_SOCKETPAIR

-@@ -195,6 +204,10 @@ static void print_rsync_version(enum log
+@@ -197,6 +206,10 @@ static void print_rsync_version(enum log

        ipv6 = "";
  #endif
  
        ipv6 = "";
  #endif
  


@@ -374,7 +374,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
        rprintf(f, "%s  version %s  protocol version %d\n",
                RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION);
        rprintf(f,
        rprintf(f, "%s  version %s  protocol version %d\n",
                RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION);
        rprintf(f,

-@@ -208,10 +221,10 @@ static void print_rsync_version(enum log
+@@ -210,10 +223,10 @@ static void print_rsync_version(enum log

        /* Note that this field may not have type ino_t.  It depends
         * on the complicated interaction between largefile feature
         * macros. */
        /* Note that this field may not have type ino_t.  It depends
         * on the complicated interaction between largefile feature
         * macros. */


@@ -387,7 +387,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
  #ifdef MAINTAINER_MODE
        rprintf(f, "              panic action: \"%s\"\n",
                get_panic_action());
  #ifdef MAINTAINER_MODE
        rprintf(f, "              panic action: \"%s\"\n",
                get_panic_action());

-@@ -340,6 +353,13 @@ void usage(enum logcode F)
+@@ -343,6 +356,13 @@ void usage(enum logcode F)

    rprintf(F," -4, --ipv4                  prefer IPv4\n");
    rprintf(F," -6, --ipv6                  prefer IPv6\n");
  #endif
    rprintf(F," -4, --ipv4                  prefer IPv4\n");
    rprintf(F," -6, --ipv6                  prefer IPv6\n");
  #endif


@@ -401,7 +401,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
    rprintf(F," -h, --help                  show this help screen\n");
  
    rprintf(F,"\nUse \"rsync --daemon --help\" to see the daemon-mode command-line options.\n");
    rprintf(F," -h, --help                  show this help screen\n");
  
    rprintf(F,"\nUse \"rsync --daemon --help\" to see the daemon-mode command-line options.\n");

-@@ -350,7 +370,7 @@ void usage(enum logcode F)
+@@ -353,7 +373,7 @@ void usage(enum logcode F)

  enum {OPT_VERSION = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
        OPT_FILTER, OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST,
        OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW,
  enum {OPT_VERSION = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
        OPT_FILTER, OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST,
        OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW,


@@ -410,7 +410,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
        OPT_REFUSED_BASE = 9000};
  
  static struct poptOption long_options[] = {
        OPT_REFUSED_BASE = 9000};
  
  static struct poptOption long_options[] = {

-@@ -448,6 +468,13 @@ static struct poptOption long_options[] 
+@@ -452,6 +472,13 @@ static struct poptOption long_options[] 

    {"ipv4",            '4', POPT_ARG_VAL,    &default_af_hint, AF_INET, 0, 0 },
    {"ipv6",            '6', POPT_ARG_VAL,    &default_af_hint, AF_INET6, 0, 0 },
  #endif
    {"ipv4",            '4', POPT_ARG_VAL,    &default_af_hint, AF_INET, 0, 0 },
    {"ipv6",            '6', POPT_ARG_VAL,    &default_af_hint, AF_INET6, 0, 0 },
  #endif


@@ -424,7 +424,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
    /* All these options switch us into daemon-mode option-parsing. */
    {"address",          0,  POPT_ARG_STRING, 0, OPT_DAEMON, 0, 0 },
    {"config",           0,  POPT_ARG_STRING, 0, OPT_DAEMON, 0, 0 },
    /* All these options switch us into daemon-mode option-parsing. */
    {"address",          0,  POPT_ARG_STRING, 0, OPT_DAEMON, 0, 0 },
    {"config",           0,  POPT_ARG_STRING, 0, OPT_DAEMON, 0, 0 },

-@@ -849,6 +876,12 @@ int parse_arguments(int *argc, const cha
+@@ -853,6 +880,12 @@ int parse_arguments(int *argc, const cha

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


@@ -437,7 +437,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
                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. */

-@@ -1102,6 +1135,17 @@ int parse_arguments(int *argc, const cha
+@@ -1117,6 +1150,17 @@ int parse_arguments(int *argc, const cha

        if (delay_updates && !partial_dir)
                partial_dir = partialdir_for_delayupdate;
  
        if (delay_updates && !partial_dir)
                partial_dir = partialdir_for_delayupdate;
  

diff --git a/owner-group-mod.diff b/owner-group-mod.diff
index ed56748..2d38d64 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-02-20 00:02:23
+--- orig/options.c     2005-02-20 01:12:42

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

-@@ -394,8 +394,8 @@ static struct poptOption long_options[] 
+@@ -398,8 +398,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_NONE,   &omit_dir_times, 0, 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_NONE,   &omit_dir_times, 0, 0, 0 },

-@@ -734,6 +734,14 @@ int parse_arguments(int *argc, const cha
+@@ -738,6 +738,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;

-@@ -944,8 +952,8 @@ int parse_arguments(int *argc, const cha
+@@ -948,8 +956,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;
        }
  

-@@ -1242,10 +1250,16 @@ void server_options(char **args,int *arg
+@@ -1257,10 +1265,16 @@ void server_options(char **args,int *arg

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

diff --git a/soften-links.diff b/soften-links.diff
index f23dc65..d7614b4 100644 (file)
--- a/soften-links.diff
+++ b/soften-links.diff
@@ -9,10 +9,10 @@ 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-01-28 23:01:10
+--- orig/syscall.c     2005-02-14 02:45:11

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

- #if HAVE_LINK
+ #ifdef HAVE_LINK

  int do_link(char *fname1, char *fname2)
  {
 +      int st;
  int do_link(char *fname1, char *fname2)
  {
 +      int st;

diff --git a/time-limit.diff b/time-limit.diff
index 837c0d9..2585f44 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-02-03 02:04:20
+--- orig/io.c  2005-02-20 01:12:42

 +++ io.c       2004-07-17 15:28:36
 @@ -51,6 +51,7 @@ extern int eol_nulls;
  extern int csum_length;
 +++ io.c       2004-07-17 15:28:36
 @@ -51,6 +51,7 @@ extern int eol_nulls;
  extern int csum_length;


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

---- orig/options.c     2005-02-15 19:27:05
+--- orig/options.c     2005-02-20 01:12:42

 +++ options.c  2005-01-28 19:35:23
 +++ options.c  2005-01-28 19:35:23

-@@ -102,6 +102,7 @@ int checksum_seed = 0;
+@@ -104,6 +104,7 @@ int checksum_seed = 0;

  int inplace = 0;
  int delay_updates = 0;
  long block_size = 0; /* "long" because popt can't set an int32. */
  int inplace = 0;
  int delay_updates = 0;
  long block_size = 0; /* "long" because popt can't set an int32. */


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

-@@ -331,6 +332,8 @@ void usage(enum logcode F)
+@@ -337,6 +338,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,7 +60,7 @@ 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

-@@ -348,6 +351,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP
+@@ -354,6 +357,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_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,


@@ -68,7 +68,7 @@ Do we need configure support for mktime()?
        OPT_REFUSED_BASE = 9000};
  
  static struct poptOption long_options[] = {
        OPT_REFUSED_BASE = 9000};
  
  static struct poptOption long_options[] = {

-@@ -432,6 +436,8 @@ static struct poptOption long_options[] 
+@@ -439,6 +443,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 },

-@@ -837,6 +843,36 @@ int parse_arguments(int *argc, const cha
+@@ -853,6 +859,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. */

-@@ -1283,6 +1319,15 @@ void server_options(char **args,int *arg
+@@ -1340,6 +1376,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-02-15 19:27:05
+--- orig/rsync.yo      2005-02-20 01:12:43

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

-@@ -378,6 +378,8 @@ to the detailed description below for a 
+@@ -379,6 +379,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)

-@@ -1182,6 +1184,19 @@ transfer was too fast, it will wait befo
+@@ -1180,6 +1182,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-14 02:45:11
+--- orig/util.c        2005-02-20 19:17:49

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