Fixed patch fuzz.

diff --git a/chmod-option.diff b/chmod-option.diff
index 7a01926effa13b7d1ac99308f13d38b9b0b726be..599bd599f9a685b2371391d37ca45187195bcc73 100644 (file)
--- a/chmod-option.diff
+++ b/chmod-option.diff
@@ -202,18 +202,18 @@ command before "make":
 +      }
 +      return 0;
 +}
---- orig/flist.c       2005-02-19 09:27:48
+--- orig/flist.c       2005-02-20 00:16:35
 +++ flist.c    2004-09-18 01:51:11
-@@ -69,6 +69,8 @@ extern int orig_umask;
- extern int list_only;
- extern char *log_format;
+@@ -65,6 +65,8 @@ extern char *log_format;
+ 
+ extern char curr_dir[MAXPATHLEN];
  
 +extern struct chmod_mode_struct *chmod_modes;
 +
  extern struct filter_list_struct filter_list;
  extern struct filter_list_struct server_filter_list;
  
-@@ -887,7 +889,10 @@ skip_filters:
+@@ -882,7 +884,10 @@ skip_filters:
        file->flags = flags;
        file->modtime = st.st_mtime;
        file->length = st.st_size;
@@ -225,7 +225,7 @@ command before "make":
        file->uid = st.st_uid;
        file->gid = st.st_gid;
  
---- orig/options.c     2005-02-19 09:27:48
+--- orig/options.c     2005-02-20 00:02:23
 +++ options.c  2005-02-16 15:38:40
 @@ -132,6 +132,7 @@ char *log_format = NULL;
  char *password_file = NULL;
@@ -235,7 +235,7 @@ command before "make":
  char backup_dir_buf[MAXPATHLEN];
  int rsync_port = 0;
  int compare_dest = 0;
-@@ -150,6 +151,8 @@ int list_only = 0;
+@@ -151,6 +152,8 @@ int list_only = 0;
  #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;
-@@ -277,6 +280,7 @@ void usage(enum logcode F)
+@@ -278,6 +281,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");
@@ -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");
-@@ -395,6 +399,7 @@ static struct poptOption long_options[] 
+@@ -396,6 +400,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 },
@@ -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 },
-@@ -1056,6 +1061,13 @@ int parse_arguments(int *argc, const cha
+@@ -1067,6 +1072,13 @@ int parse_arguments(int *argc, const cha
                return 0;
        }
  
@@ -273,8 +273,8 @@ command before "make":
 +
        if (log_format) {
                if (strstr(log_format, "%i") != NULL)
-                       itemize_changes = 1;
-@@ -1405,6 +1417,11 @@ void server_options(char **args,int *arg
+                       log_format_has_i = 1;
+@@ -1416,6 +1428,11 @@ void server_options(char **args,int *arg
                }
        }
  

diff --git a/fname-convert.diff b/fname-convert.diff
index cc9c0de125ce5ffb24470f19dbdf1828a05cbba4..84e10862c1404f89059b8d5ba39bea684d4e1955 100644 (file)
--- a/fname-convert.diff
+++ b/fname-convert.diff
@@ -87,17 +87,17 @@ Note that you'll need to run 'make proto' after applying this patch.
  
  #define RERR_SIGNAL     20      /* status returned when sent SIGUSR1, SIGINT */
  #define RERR_WAITCHILD  21      /* some error returned by waitpid() */
---- orig/flist.c       2005-02-19 09:27:48
+--- orig/flist.c       2005-02-20 00:16:35
 +++ flist.c    2005-02-19 09:31:41
-@@ -68,6 +68,7 @@ extern int max_delete;
- extern int orig_umask;
+@@ -62,6 +62,7 @@ extern int orig_umask;
  extern int list_only;
+ extern unsigned int curr_dir_len;
  extern char *log_format;
 +extern char *fname_convert_cmd;
  
- extern struct filter_list_struct filter_list;
- extern struct filter_list_struct server_filter_list;
-@@ -346,7 +347,10 @@ void send_file_entry(struct file_struct 
+ extern char curr_dir[MAXPATHLEN];
+ 
+@@ -341,7 +342,10 @@ void send_file_entry(struct file_struct 
  
        io_write_phase = "send_file_entry";
  
@@ -109,7 +109,7 @@ Note that you'll need to run 'make proto' after applying this patch.
  
        flags = base_flags;
  
-@@ -562,6 +566,9 @@ static struct file_struct *receive_file_
+@@ -557,6 +561,9 @@ static struct file_struct *receive_file_
  
        strlcpy(lastname, thisname, MAXPATHLEN);
  
@@ -119,7 +119,7 @@ Note that you'll need to run 'make proto' after applying this patch.
        clean_fname(thisname, 0);
  
        if (sanitize_paths)
-@@ -1075,6 +1082,9 @@ struct file_list *send_file_list(int f, 
+@@ -1070,6 +1077,9 @@ struct file_list *send_file_list(int f, 
        start_write = stats.total_written;
        gettimeofday(&start_tv, NULL);
  
@@ -129,7 +129,7 @@ Note that you'll need to run 'make proto' after applying this patch.
        flist = flist_new(WITH_HLINK, "send_file_list");
  
        io_start_buffering_out();
-@@ -1257,6 +1267,9 @@ struct file_list *send_file_list(int f, 
+@@ -1252,6 +1262,9 @@ struct file_list *send_file_list(int f, 
        stats.flist_size = stats.total_written - start_write;
        stats.num_files = flist->count;
  
@@ -139,7 +139,7 @@ Note that you'll need to run 'make proto' after applying this patch.
        if (verbose > 3)
                output_flist(flist, who_am_i());
  
-@@ -1278,6 +1291,9 @@ struct file_list *recv_file_list(int f)
+@@ -1273,6 +1286,9 @@ struct file_list *recv_file_list(int f)
  
        start_read = stats.total_read;
  
@@ -149,7 +149,7 @@ Note that you'll need to run 'make proto' after applying this patch.
        flist = flist_new(WITH_HLINK, "recv_file_list");
        received_flist = flist;
  
-@@ -1331,6 +1347,9 @@ struct file_list *recv_file_list(int f)
+@@ -1326,6 +1342,9 @@ struct file_list *recv_file_list(int f)
                        io_error |= read_int(f);
        }
  
@@ -382,9 +382,9 @@ Note that you'll need to run 'make proto' after applying this patch.
 +      if (verbose > 2)
 +              rprintf(FINFO, "Converted filename: %s -> %s\n", src, dest);
 +}
---- orig/generator.c   2005-02-19 09:27:48
+--- orig/generator.c   2005-02-20 00:02:23
 +++ generator.c        2005-02-03 02:07:33
-@@ -331,7 +331,13 @@ static int find_fuzzy(struct file_struct
+@@ -339,7 +339,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
@@ -399,9 +399,9 @@ Note that you'll need to run 'make proto' after applying this patch.
  static void recv_generator(char *fname, struct file_list *flist,
                           struct file_struct *file, int ndx,
                           int f_out, int f_out_name)
---- orig/log.c 2005-02-19 09:27:48
+--- orig/log.c 2005-02-20 00:02:23
 +++ log.c      2004-07-03 20:18:02
-@@ -60,6 +60,7 @@ struct {
+@@ -62,6 +62,7 @@ struct {
        { RERR_STREAMIO   , "error in rsync protocol data stream" },
        { RERR_MESSAGEIO  , "errors with program diagnostics" },
        { RERR_IPC        , "error in IPC code" },
@@ -409,7 +409,7 @@ Note that you'll need to run 'make proto' after applying this patch.
        { RERR_SIGNAL     , "received SIGUSR1 or SIGINT" },
        { RERR_WAITCHILD  , "some error returned by waitpid()" },
        { RERR_MALLOC     , "error allocating core memory buffers" },
---- orig/main.c        2005-02-16 17:08:13
+--- orig/main.c        2005-02-20 00:02:23
 +++ main.c     2004-07-22 00:31:47
 @@ -359,7 +359,7 @@ static pid_t do_cmd(char *cmd, char *mac
                        whole_file = 1;
@@ -420,7 +420,7 @@ Note that you'll need to run 'make proto' after applying this patch.
  
        if (dir)
                free(dir);
---- orig/options.c     2005-02-19 09:27:48
+--- orig/options.c     2005-02-20 00:02:23
 +++ options.c  2005-02-14 02:50:32
 @@ -129,6 +129,7 @@ char *basis_dir[MAX_BASIS_DIRS+1];
  char *config_file = 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;
-@@ -310,6 +311,7 @@ void usage(enum logcode F)
+@@ -311,6 +312,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");
@@ -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");
-@@ -418,6 +420,7 @@ static struct poptOption long_options[] 
+@@ -419,6 +421,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 },

diff --git a/link-by-hash.diff b/link-by-hash.diff
index 1f27c61dd738f9ae2f004ae521cd8f27a02ccac7..3bf0da4491a0bb5c1094b16b78ef86a7251c7d20 100644 (file)
--- a/link-by-hash.diff
+++ b/link-by-hash.diff
@@ -365,7 +365,7 @@ the file's name.
 +}
 +
 +#endif
---- orig/options.c     2005-02-19 09:27:48
+--- orig/options.c     2005-02-20 00:02:23
 +++ options.c  2005-02-14 02:52:09
 @@ -132,6 +132,7 @@ char *log_format = NULL;
  char *password_file = NULL;
@@ -375,7 +375,7 @@ the file's name.
  char backup_dir_buf[MAXPATHLEN];
  int rsync_port = 0;
  int compare_dest = 0;
-@@ -310,6 +311,7 @@ void usage(enum logcode F)
+@@ -311,6 +312,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");
@@ -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");
-@@ -349,7 +351,7 @@ void usage(enum logcode F)
+@@ -350,7 +352,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,
@@ -392,7 +392,7 @@ the file's name.
        OPT_REFUSED_BASE = 9000};
  
  static struct poptOption long_options[] = {
-@@ -417,6 +419,7 @@ static struct poptOption long_options[] 
+@@ -418,6 +420,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 },
@@ -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 },
-@@ -838,6 +841,21 @@ int parse_arguments(int *argc, const cha
+@@ -849,6 +852,21 @@ int parse_arguments(int *argc, const cha
                        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. */
-@@ -1405,6 +1423,11 @@ void server_options(char **args,int *arg
+@@ -1416,6 +1434,11 @@ void server_options(char **args,int *arg
                }
        }
  
@@ -434,17 +434,17 @@ the file's name.
        if (files_from && (!am_sender || remote_filesfrom_file)) {
                if (remote_filesfrom_file) {
                        args[ac++] = "--files-from";
---- orig/receiver.c    2005-02-19 09:27:48
+--- orig/receiver.c    2005-02-20 00:16:35
 +++ receiver.c 2005-01-15 21:29:13
-@@ -37,6 +37,7 @@ extern int preserve_hard_links;
- extern int preserve_perms;
- extern int io_error;
+@@ -51,6 +51,7 @@ extern int delay_updates;
+ extern struct stats stats;
+ extern char *log_format;
  extern char *tmpdir;
 +extern char *link_by_hash_dir;
  extern char *partial_dir;
  extern char *basis_dir[];
- extern int basis_dir_cnt;
-@@ -140,12 +141,13 @@ static int get_tmpname(char *fnametmp, c
+ 
+@@ -142,12 +143,13 @@ static int get_tmpname(char *fnametmp, c
  
  
  static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
@@ -459,7 +459,7 @@ the file's name.
        int32 len;
        OFF_T offset = 0;
        OFF_T offset2;
-@@ -165,6 +167,9 @@ static int receive_data(int f_in, char *
+@@ -167,6 +169,9 @@ static int receive_data(int f_in, char *
        } else
                mapbuf = NULL;
  
@@ -469,7 +469,7 @@ the file's name.
        sum_init(checksum_seed);
  
        while ((i = recv_token(f_in, &data)) != 0) {
-@@ -181,6 +186,8 @@ static int receive_data(int f_in, char *
+@@ -183,6 +188,8 @@ static int receive_data(int f_in, char *
                        cleanup_got_literal = 1;
  
                        sum_update(data, i);
@@ -478,7 +478,7 @@ the file's name.
  
                        if (fd != -1 && write_file(fd,data,i) != i)
                                goto report_write_error;
-@@ -207,6 +214,8 @@ static int receive_data(int f_in, char *
+@@ -209,6 +216,8 @@ static int receive_data(int f_in, char *
  
                        see_token(map, len);
                        sum_update(map, len);
@@ -487,7 +487,7 @@ the file's name.
                }
  
                if (inplace) {
-@@ -247,6 +256,8 @@ static int receive_data(int f_in, char *
+@@ -249,6 +258,8 @@ static int receive_data(int f_in, char *
        }
  
        sum_end(file_sum1);
@@ -496,7 +496,7 @@ the file's name.
  
        if (mapbuf)
                unmap_file(mapbuf);
-@@ -292,7 +303,7 @@ static void read_gen_name(int fd, char *
+@@ -294,7 +305,7 @@ static void read_gen_name(int fd, char *
  
  static void discard_receive_data(int f_in, OFF_T length)
  {
@@ -505,7 +505,7 @@ the file's name.
  }
  
  
-@@ -558,8 +569,12 @@ int recv_files(int f_in, struct file_lis
+@@ -562,8 +573,12 @@ int recv_files(int f_in, struct file_lis
                        rprintf(FINFO, "%s\n", safe_fname(fname));
  
                /* recv file data */
@@ -519,17 +519,17 @@ the file's name.
  
                if (!log_before_transfer)
                        log_recv(file, &initial_stats, iflags);
---- orig/rsync.c       2005-02-19 09:27:48
+--- orig/rsync.c       2005-02-20 00:02:23
 +++ rsync.c    2005-02-19 09:32:31
-@@ -40,6 +40,7 @@ extern int keep_dirlinks;
+@@ -41,6 +41,7 @@ extern int keep_dirlinks;
  extern int make_backups;
  extern struct stats stats;
  extern char *backup_dir;
 +extern char *link_by_hash_dir;
  extern char *log_format;
- 
- 
-@@ -279,7 +280,12 @@ void finish_transfer(char *fname, char *
+ extern char *backup_suffix;
+ extern int backup_suffix_len;
+@@ -306,7 +307,12 @@ void finish_transfer(char *fname, char *
                rprintf(FINFO, "renaming %s to %s\n",
                        safe_fname(fnametmp), safe_fname(fname));
        }
@@ -543,9 +543,9 @@ the file's name.
        if (ret < 0) {
                rsyserr(FERROR, errno, "%s %s -> \"%s\"",
                    ret == -2 ? "copy" : "rename",
---- orig/rsync.h       2005-02-19 09:27:49
+--- orig/rsync.h       2005-02-20 00:02:23
 +++ rsync.h    2004-07-03 20:20:15
-@@ -619,6 +619,14 @@ struct stats {
+@@ -620,6 +620,14 @@ struct stats {
        int current_file_index;
  };
  

diff --git a/openssl-support.diff b/openssl-support.diff
index 0c2b1a591d10b5d3d44c79a421f508da923cd65d..c15ef0775e9acec8fe0659a2e2a7c14fd053fed8 100644 (file)
--- a/openssl-support.diff
+++ b/openssl-support.diff
@@ -72,7 +72,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
        if (verbose > 3) {
                rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): entered\n",
                        code, safe_fname(file), line);
---- orig/clientserver.c        2005-02-14 02:45:10
+--- orig/clientserver.c        2005-02-20 00:02:22
 +++ clientserver.c     2004-10-08 20:44:59
 @@ -45,6 +45,9 @@ extern int select_timeout;
  extern int orig_umask;
@@ -84,7 +84,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
  extern char *bind_address;
  extern struct filter_list_struct server_filter_list;
  extern char *config_file;
-@@ -100,8 +103,18 @@ int start_socket_client(char *host, char
+@@ -102,8 +105,18 @@ int start_socket_client(char *host, char
                exit_cleanup(RERR_SOCKETIO);
  
        ret = start_inband_exchange(user, path, fd, fd, argc);
@@ -104,7 +104,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
  }
  
  int start_inband_exchange(char *user, char *path, int f_in, int f_out, 
-@@ -162,6 +175,33 @@ int start_inband_exchange(char *user, ch
+@@ -164,6 +177,33 @@ int start_inband_exchange(char *user, ch
        if (verbose > 1)
                print_child_argv(sargs);
  
@@ -138,7 +138,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
        p = strchr(path,'/');
        if (p) *p = 0;
        io_printf(f_out, "%s\n", path);
-@@ -190,6 +230,10 @@ int start_inband_exchange(char *user, ch
+@@ -192,6 +232,10 @@ int start_inband_exchange(char *user, ch
                         * server to terminate the listing of modules.
                         * We don't want to go on and transfer
                         * anything; just exit. */
@@ -149,7 +149,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
                        exit(0);
                }
  
-@@ -197,6 +241,10 @@ int start_inband_exchange(char *user, ch
+@@ -199,6 +243,10 @@ int start_inband_exchange(char *user, ch
                        rprintf(FERROR, "%s\n", line);
                        /* This is always fatal; the server will now
                         * close the socket. */
@@ -160,7 +160,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
                        return RERR_STARTCLIENT;
                } else {
                        rprintf(FINFO,"%s\n", line);
-@@ -526,6 +574,7 @@ static void send_listing(int fd)
+@@ -536,6 +584,7 @@ static void send_listing(int fd)
                io_printf(fd,"@RSYNCD: EXIT\n");
  }
  
@@ -168,7 +168,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
  /* this is called when a connection is established to a client
     and we want to start talking. The setup of the system is done from
     here */
-@@ -575,6 +624,9 @@ int start_daemon(int f_in, int f_out)
+@@ -585,6 +634,9 @@ int start_daemon(int f_in, int f_out)
        if (protocol_version > remote_protocol)
                protocol_version = remote_protocol;
  
@@ -178,7 +178,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
        line[0] = 0;
        if (!read_line(f_in, line, sizeof line - 1))
                return -1;
-@@ -584,6 +636,20 @@ int start_daemon(int f_in, int f_out)
+@@ -594,6 +646,20 @@ int start_daemon(int f_in, int f_out)
                return -1;
        }
  
@@ -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)
---- orig/main.c        2005-02-14 02:45:10
+--- orig/main.c        2005-02-20 00:02:23
 +++ main.c     2004-10-08 20:15:28
-@@ -53,6 +53,9 @@ extern int write_batch;
+@@ -52,6 +52,9 @@ extern int write_batch;
  extern int batch_fd;
  extern int batch_gen_fd;
  extern int filesfrom_fd;
@@ -233,8 +233,8 @@ can't say if I've left any cleanup/compatibility errors in the code.
 +extern int use_ssl;
 +#endif
  extern pid_t cleanup_child_pid;
+ extern struct stats stats;
  extern char *files_from;
- extern char *remote_filesfrom_file;
 @@ -823,33 +826,48 @@ static int start_client(int argc, char *
        if ((rc = copy_argv(argv)))
                return rc;
@@ -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';
---- orig/options.c     2005-02-14 02:45:10
+--- orig/options.c     2005-02-20 00:02:23
 +++ options.c  2004-11-27 18:31:46
-@@ -144,6 +144,14 @@ int quiet = 0;
+@@ -148,6 +148,14 @@ int log_format_has_o_or_i = 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;
  
-@@ -169,6 +177,7 @@ static void print_rsync_version(enum log
+@@ -173,6 +181,7 @@ static void print_rsync_version(enum log
        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
-@@ -191,6 +200,10 @@ static void print_rsync_version(enum log
+@@ -195,6 +204,10 @@ static void print_rsync_version(enum log
        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,
-@@ -204,10 +217,10 @@ static void print_rsync_version(enum log
+@@ -208,10 +221,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. */
@@ -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());
-@@ -335,6 +348,13 @@ void usage(enum logcode F)
+@@ -340,6 +353,13 @@ void usage(enum logcode F)
    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");
-@@ -345,7 +365,7 @@ void usage(enum logcode F)
+@@ -350,7 +370,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,
@@ -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[] = {
-@@ -442,6 +462,13 @@ static struct poptOption long_options[] 
+@@ -448,6 +468,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
@@ -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 },
-@@ -834,6 +861,12 @@ int parse_arguments(int *argc, const cha
+@@ -849,6 +876,12 @@ int parse_arguments(int *argc, const cha
                        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. */
-@@ -1066,6 +1099,17 @@ int parse_arguments(int *argc, const cha
+@@ -1102,6 +1135,17 @@ int parse_arguments(int *argc, const cha
        if (delay_updates && !partial_dir)
                partial_dir = partialdir_for_delayupdate;
  
@@ -455,7 +455,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
        if (inplace) {
  #ifdef HAVE_FTRUNCATE
                if (partial_dir) {
---- orig/rsync.h       2005-02-14 02:45:10
+--- orig/rsync.h       2005-02-20 00:02:23
 +++ rsync.h    2004-10-08 21:01:33
 @@ -32,6 +32,7 @@
  
@@ -465,7 +465,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
  
  #define BACKUP_SUFFIX "~"
  
-@@ -384,6 +385,11 @@ enum msgcode {
+@@ -399,6 +400,11 @@ enum msgcode {
  # define SIZEOF_INT64 SIZEOF_OFF_T
  #endif
  

diff --git a/remove-sent-files.diff b/remove-sent-files.diff
index 2cf615cff4a74cd3531e537e50f4915b43a59ddf..bbdcdf1025e3c96f67e98e5dde0b994e625cda66 100644 (file)
--- a/remove-sent-files.diff
+++ b/remove-sent-files.diff
@@ -166,11 +166,11 @@ command before "make":
        *argc = ac;
        return;
  
---- orig/receiver.c    2005-02-20 00:02:23
+--- orig/receiver.c    2005-02-20 00:16:35
 +++ receiver.c 2005-02-15 21:33:52
-@@ -45,6 +45,7 @@ extern int basis_dir_cnt;
+@@ -41,6 +41,7 @@ extern int io_error;
+ extern int basis_dir_cnt;
  extern int make_backups;
- extern int do_progress;
  extern int cleanup_got_literal;
 +extern int remove_sent_files;
  extern int module_id;
@@ -246,17 +246,17 @@ command before "make":
  
  When an option is refused, the server prints an error message and exits.
  To prevent all compression, you can use "dont compress = *" (see below)
---- orig/sender.c      2005-02-20 00:02:23
+--- orig/sender.c      2005-02-20 00:16:35
 +++ sender.c   2005-02-20 00:10:24
-@@ -30,6 +30,7 @@ extern int csum_length;
- extern struct stats stats;
+@@ -29,6 +29,7 @@ extern int daemon_log_format_has_i;
+ extern int csum_length;
  extern int io_error;
  extern int protocol_version;
 +extern int remove_sent_files;
  extern int updating_basis_file;
  extern int make_backups;
  extern int do_progress;
-@@ -99,7 +100,32 @@ static struct sum_struct *receive_sums(i
+@@ -98,7 +99,32 @@ static struct sum_struct *receive_sums(i
        return s;
  }
  
@@ -289,7 +289,7 @@ command before "make":
  
  void send_files(struct file_list *flist, int f_out, int f_in)
  {
-@@ -120,6 +146,8 @@ void send_files(struct file_list *flist,
+@@ -119,6 +145,8 @@ void send_files(struct file_list *flist,
        if (verbose > 2)
                rprintf(FINFO, "send_files starting\n");
  
@@ -298,7 +298,7 @@ command before "make":
        while (1) {
                unsigned int offset;
  
-@@ -286,6 +314,9 @@ void send_files(struct file_list *flist,
+@@ -285,6 +313,9 @@ void send_files(struct file_list *flist,
                        rprintf(FINFO, "sender finished %s\n",
                                safe_fname(fname));
                }