Updated to apply cleanly.

diff --git a/ODBC-dblog.diff b/ODBC-dblog.diff
index 78ac5bb..777681a 100644 (file)
--- a/ODBC-dblog.diff
+++ b/ODBC-dblog.diff
@@ -89,7 +89,7 @@ This patch adds the following options:
 
 
 --- Makefile.in        15 May 2004 00:48:11 -0000      1.101
 
 
 --- Makefile.in        15 May 2004 00:48:11 -0000      1.101

-+++ Makefile.in        18 Jun 2004 17:21:24 -0000
++++ Makefile.in        30 Jun 2004 00:03:29 -0000

 @@ -32,7 +32,7 @@ ZLIBOBJ=zlib/deflate.o zlib/infblock.o z
        zlib/inflate.o zlib/inftrees.o zlib/infutil.o zlib/trees.o \
        zlib/zutil.o zlib/adler32.o
 @@ -32,7 +32,7 @@ ZLIBOBJ=zlib/deflate.o zlib/infblock.o z
        zlib/inflate.o zlib/inftrees.o zlib/infutil.o zlib/trees.o \
        zlib/zutil.o zlib/adler32.o


@@ -100,7 +100,7 @@ This patch adds the following options:
        fileio.o batch.o clientname.o
  OBJS3=progress.o pipe.o
 --- cleanup.c  13 May 2004 07:08:18 -0000      1.22
        fileio.o batch.o clientname.o
  OBJS3=progress.o pipe.o
 --- cleanup.c  13 May 2004 07:08:18 -0000      1.22

-+++ cleanup.c  18 Jun 2004 17:21:24 -0000
++++ cleanup.c  30 Jun 2004 00:03:29 -0000

 @@ -140,7 +140,12 @@ void _exit_cleanup(int code, const char 
                        code = RERR_VANISHED;
        }
 @@ -140,7 +140,12 @@ void _exit_cleanup(int code, const char 
                        code = RERR_VANISHED;
        }


@@ -116,7 +116,7 @@ This patch adds the following options:
        if (verbose > 2) {
                rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): about to call exit(%d)\n",
 --- clientserver.c     13 Jun 2004 14:18:48 -0000      1.127
        if (verbose > 2) {
                rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): about to call exit(%d)\n",
 --- clientserver.c     13 Jun 2004 14:18:48 -0000      1.127

-+++ clientserver.c     18 Jun 2004 17:21:24 -0000
++++ clientserver.c     30 Jun 2004 00:03:29 -0000

 @@ -315,6 +315,9 @@ static int rsync_module(int f_in, int f_
        exclude_path_prefix = NULL;
  
 @@ -315,6 +315,9 @@ static int rsync_module(int f_in, int f_
        exclude_path_prefix = NULL;
  


@@ -138,7 +138,7 @@ This patch adds the following options:
                        rprintf(FLOG, "rsync %s %s from %s (%s)\n",
                                am_sender ? "on" : "to",
 --- configure.in       30 Apr 2004 18:03:33 -0000      1.196
                        rprintf(FLOG, "rsync %s %s from %s (%s)\n",
                                am_sender ? "on" : "to",
 --- configure.in       30 Apr 2004 18:03:33 -0000      1.196

-+++ configure.in       18 Jun 2004 17:21:24 -0000
++++ configure.in       30 Jun 2004 00:03:29 -0000

 @@ -94,6 +94,8 @@ AC_ARG_WITH(rsync-path,
        [  --with-rsync-path=PATH  set default --rsync-path to PATH (default: rsync)],
        [ RSYNC_PATH="$with_rsync_path" ],
 @@ -94,6 +94,8 @@ AC_ARG_WITH(rsync-path,
        [  --with-rsync-path=PATH  set default --rsync-path to PATH (default: rsync)],
        [ RSYNC_PATH="$with_rsync_path" ],


@@ -164,7 +164,7 @@ This patch adds the following options:
  if test x"$with_included_popt" = x"yes"
  then
 --- /dev/null  1 Jan 1970 00:00:00 -0000
  if test x"$with_included_popt" = x"yes"
  then
 --- /dev/null  1 Jan 1970 00:00:00 -0000

-+++ dblog-tables-mysql.sql     18 Jun 2004 17:21:24 -0000
++++ dblog-tables-mysql.sql     30 Jun 2004 00:03:29 -0000

 @@ -0,0 +1,43 @@
 +drop table transfer;
 +drop table exit;
 @@ -0,0 +1,43 @@
 +drop table transfer;
 +drop table exit;


@@ -210,7 +210,7 @@ This patch adds the following options:
 +      foreign key (session_id) references session (id)
 +);
 --- /dev/null  1 Jan 1970 00:00:00 -0000
 +      foreign key (session_id) references session (id)
 +);
 --- /dev/null  1 Jan 1970 00:00:00 -0000

-+++ dblog-tables-postgresql.sql        18 Jun 2004 17:21:24 -0000
++++ dblog-tables-postgresql.sql        30 Jun 2004 00:03:29 -0000

 @@ -0,0 +1,45 @@
 +drop table transfer;
 +drop table exit;
 @@ -0,0 +1,45 @@
 +drop table transfer;
 +drop table exit;


@@ -258,7 +258,7 @@ This patch adds the following options:
 +      foreign key (session_id) references session (id)
 +);
 --- /dev/null  1 Jan 1970 00:00:00 -0000
 +      foreign key (session_id) references session (id)
 +);
 --- /dev/null  1 Jan 1970 00:00:00 -0000

-+++ dblog.c    18 Jun 2004 17:21:24 -0000
++++ dblog.c    30 Jun 2004 00:03:30 -0000

 @@ -0,0 +1,352 @@
 +/*
 + *  ODBC Database logging functions
 @@ -0,0 +1,352 @@
 +/*
 + *  ODBC Database logging functions


@@ -613,7 +613,7 @@ This patch adds the following options:
 +      }
 +}
 --- loadparm.c 19 May 2004 22:19:19 -0000      1.51
 +      }
 +}
 --- loadparm.c 19 May 2004 22:19:19 -0000      1.51

-+++ loadparm.c 18 Jun 2004 17:21:25 -0000
++++ loadparm.c 30 Jun 2004 00:03:30 -0000

 @@ -123,6 +123,17 @@ typedef struct
        BOOL list;
        BOOL use_chroot;
 @@ -123,6 +123,17 @@ typedef struct
        BOOL list;
        BOOL use_chroot;


@@ -687,7 +687,7 @@ This patch adds the following options:
  FN_LOCAL_BOOL(lp_ignore_nonreadable, ignore_nonreadable)
  FN_LOCAL_STRING(lp_uid, uid)
 --- log.c      7 Jun 2004 22:51:14 -0000       1.74
  FN_LOCAL_BOOL(lp_ignore_nonreadable, ignore_nonreadable)
  FN_LOCAL_STRING(lp_uid, uid)
 --- log.c      7 Jun 2004 22:51:14 -0000       1.74

-+++ log.c      18 Jun 2004 17:21:25 -0000
++++ log.c      30 Jun 2004 00:03:30 -0000

 @@ -75,7 +75,7 @@ struct {
  /*
   * Map from rsync error code to name, or return NULL.
 @@ -75,7 +75,7 @@ struct {
  /*
   * Map from rsync error code to name, or return NULL.


@@ -697,8 +697,8 @@ 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++) {

---- main.c     18 Jun 2004 16:50:20 -0000      1.198
-+++ main.c     18 Jun 2004 17:21:25 -0000
+--- main.c     28 Jun 2004 17:45:40 -0000      1.201
++++ main.c     30 Jun 2004 00:03:30 -0000

 @@ -121,6 +121,9 @@ static void report(int f)
  
        if (am_daemon) {
 @@ -121,6 +121,9 @@ static void report(int f)
  
        if (am_daemon) {


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

---- receiver.c 14 Jun 2004 15:09:36 -0000      1.82
-+++ receiver.c 18 Jun 2004 17:21:25 -0000
-@@ -461,7 +461,9 @@ int recv_files(int f_in,struct file_list
+--- receiver.c 29 Jun 2004 15:12:01 -0000      1.83
++++ receiver.c 30 Jun 2004 00:03:30 -0000
+@@ -463,7 +463,9 @@ int recv_files(int f_in,struct file_list

                recv_ok = receive_data(f_in,mapbuf,fd2,fname,file->length);
  
                log_recv(file, &initial_stats);
                recv_ok = receive_data(f_in,mapbuf,fd2,fname,file->length);
  
                log_recv(file, &initial_stats);


@@ -723,7 +723,7 @@ This patch adds the following options:
                if (fd1 != -1) {
                        close(fd1);
 --- sender.c   18 Jun 2004 16:55:12 -0000      1.41
                if (fd1 != -1) {
                        close(fd1);
 --- sender.c   18 Jun 2004 16:55:12 -0000      1.41

-+++ sender.c   18 Jun 2004 17:21:25 -0000
++++ sender.c   30 Jun 2004 00:03:30 -0000

 @@ -281,6 +281,9 @@ void send_files(struct file_list *flist,
                } else  { /* not read_batch */
                        match_sums(f_out, s, mbuf, st.st_size);
 @@ -281,6 +281,9 @@ void send_files(struct file_list *flist,
                } else  { /* not read_batch */
                        match_sums(f_out, s, mbuf, st.st_size);

diff --git a/acls.diff b/acls.diff
index 81f8bd8..92526d8 100644 (file)
--- a/acls.diff
+++ b/acls.diff
@@ -8,7 +8,7 @@ After applying this patch, run these commands for a successful build:
 
 
 --- Makefile.in        15 May 2004 00:48:11 -0000      1.101
 
 
 --- Makefile.in        15 May 2004 00:48:11 -0000      1.101

-+++ Makefile.in        18 Jun 2004 17:21:45 -0000
++++ Makefile.in        30 Jun 2004 00:04:05 -0000

 @@ -25,7 +25,7 @@ VERSION=@VERSION@
  .SUFFIXES:
  .SUFFIXES: .c .o
 @@ -25,7 +25,7 @@ VERSION=@VERSION@
  .SUFFIXES:
  .SUFFIXES: .c .o


@@ -28,7 +28,7 @@ After applying this patch, run these commands for a successful build:
  DAEMON_OBJ = params.o loadparm.o clientserver.o access.o connection.o authenticate.o
  popt_OBJS=popt/findme.o  popt/popt.o  popt/poptconfig.o \
 --- /dev/null  1 Jan 1970 00:00:00 -0000
  DAEMON_OBJ = params.o loadparm.o clientserver.o access.o connection.o authenticate.o
  popt_OBJS=popt/findme.o  popt/popt.o  popt/poptconfig.o \
 --- /dev/null  1 Jan 1970 00:00:00 -0000

-+++ acls.c     18 Jun 2004 17:21:45 -0000
++++ acls.c     30 Jun 2004 00:04:05 -0000

 @@ -0,0 +1,1119 @@
 +/* -*- c-file-style: "linux" -*-
 +   Copyright (C) Andrew Tridgell 1996
 @@ -0,0 +1,1119 @@
 +/* -*- c-file-style: "linux" -*-
 +   Copyright (C) Andrew Tridgell 1996


@@ -1150,7 +1150,7 @@ After applying this patch, run these commands for a successful build:
 +
 +#endif /* SUPPORT_ACLS */
 --- backup.c   10 Jun 2004 16:43:52 -0000      1.32
 +
 +#endif /* SUPPORT_ACLS */
 --- backup.c   10 Jun 2004 16:43:52 -0000      1.32

-+++ backup.c   18 Jun 2004 17:21:45 -0000
++++ backup.c   30 Jun 2004 00:04:05 -0000

 @@ -105,6 +105,7 @@ static int make_bak_dir(char *fullpath)
                        } else {
                                do_lchown(fullpath, st.st_uid, st.st_gid);
 @@ -105,6 +105,7 @@ static int make_bak_dir(char *fullpath)
                        } else {
                                do_lchown(fullpath, st.st_uid, st.st_gid);


@@ -1177,7 +1177,7 @@ After applying this patch, run these commands for a successful build:
  
        if (verbose > 1)
 --- configure.in       30 Apr 2004 18:03:33 -0000      1.196
  
        if (verbose > 1)
 --- configure.in       30 Apr 2004 18:03:33 -0000      1.196

-+++ configure.in       18 Jun 2004 17:21:45 -0000
++++ configure.in       30 Jun 2004 00:04:05 -0000

 @@ -434,6 +434,11 @@ if test x"$ac_cv_func_strcasecmp" = x"no
      AC_CHECK_LIB(resolv, strcasecmp)
  fi
 @@ -434,6 +434,11 @@ if test x"$ac_cv_func_strcasecmp" = x"no
      AC_CHECK_LIB(resolv, strcasecmp)
  fi


@@ -1266,7 +1266,7 @@ After applying this patch, run these commands for a successful build:
  AC_OUTPUT
  
 --- flist.c    18 Jun 2004 16:29:21 -0000      1.231
  AC_OUTPUT
  
 --- flist.c    18 Jun 2004 16:29:21 -0000      1.231

-+++ flist.c    18 Jun 2004 17:21:46 -0000
++++ flist.c    30 Jun 2004 00:04:06 -0000

 @@ -945,6 +945,8 @@ void send_file_name(int f, struct file_l
  
        if (!file)
 @@ -945,6 +945,8 @@ void send_file_name(int f, struct file_l
  
        if (!file)


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

---- generator.c        18 Jun 2004 16:30:24 -0000      1.88
-+++ generator.c        18 Jun 2004 17:21:46 -0000
-@@ -345,6 +345,10 @@ void recv_generator(char *fname, struct 
+--- generator.c        29 Jun 2004 19:19:00 -0000      1.92
++++ generator.c        30 Jun 2004 00:04:06 -0000
+@@ -343,6 +343,10 @@ static void recv_generator(char *fname, 

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


@@ -1319,7 +1319,7 @@ After applying this patch, run these commands for a successful build:
        }
  
 --- mkproto.awk        1 Jan 2004 21:10:50 -0000       1.6
        }
  
 --- mkproto.awk        1 Jan 2004 21:10:50 -0000       1.6

-+++ mkproto.awk        18 Jun 2004 17:21:46 -0000
++++ mkproto.awk        30 Jun 2004 00:04:06 -0000

 @@ -58,7 +58,7 @@ BEGIN {
    next;
  }
 @@ -58,7 +58,7 @@ BEGIN {
    next;
  }


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

---- options.c  7 Jun 2004 22:05:22 -0000       1.156
-+++ options.c  18 Jun 2004 17:21:46 -0000
+--- options.c  20 Jun 2004 19:47:05 -0000      1.157
++++ options.c  30 Jun 2004 00:04:06 -0000

 @@ -43,6 +43,7 @@ int keep_dirlinks = 0;
  int copy_links = 0;
  int preserve_links = 0;
 @@ -43,6 +43,7 @@ int keep_dirlinks = 0;
  int copy_links = 0;
  int preserve_links = 0;


@@ -1428,7 +1428,7 @@ After applying this patch, run these commands for a successful build:
                argstr[x++] = 'o';
        if (preserve_gid)
 --- rsync.c    11 Jun 2004 07:40:45 -0000      1.141
                argstr[x++] = 'o';
        if (preserve_gid)
 --- rsync.c    11 Jun 2004 07:40:45 -0000      1.141

-+++ rsync.c    18 Jun 2004 17:21:46 -0000
++++ rsync.c    30 Jun 2004 00:04:06 -0000

 @@ -204,6 +204,14 @@ int set_perms(char *fname,struct file_st
        }
  #endif
 @@ -204,6 +204,14 @@ int set_perms(char *fname,struct file_st
        }
  #endif


@@ -1445,7 +1445,7 @@ After applying this patch, run these commands for a successful build:
                if (updated)
                        rprintf(FINFO,"%s\n",fname);
 --- rsync.h    16 May 2004 07:28:24 -0000      1.204
                if (updated)
                        rprintf(FINFO,"%s\n",fname);
 --- rsync.h    16 May 2004 07:28:24 -0000      1.204

-+++ rsync.h    18 Jun 2004 17:21:47 -0000
++++ rsync.h    30 Jun 2004 00:04:06 -0000

 @@ -538,6 +538,40 @@ static inline int flist_up(struct file_l
  #include "lib/permstring.h"
  #include "lib/addrinfo.h"
 @@ -538,6 +538,40 @@ static inline int flist_up(struct file_l
  #include "lib/permstring.h"
  #include "lib/addrinfo.h"


@@ -1488,7 +1488,7 @@ After applying this patch, run these commands for a successful build:
  
  /* We have replacement versions of these if they're missing. */
 --- rsync.yo   5 Jun 2004 16:16:30 -0000       1.171
  
  /* We have replacement versions of these if they're missing. */
 --- rsync.yo   5 Jun 2004 16:16:30 -0000       1.171

-+++ rsync.yo   18 Jun 2004 17:21:47 -0000
++++ rsync.yo   30 Jun 2004 00:04:07 -0000

 @@ -296,6 +296,7 @@ verb(
       --safe-links            ignore "unsafe" symlinks
   -H, --hard-links            preserve hard links
 @@ -296,6 +296,7 @@ verb(
       --safe-links            ignore "unsafe" symlinks
   -H, --hard-links            preserve hard links


@@ -1510,7 +1510,7 @@ After applying this patch, run these commands for a successful build:
  destination file to be the same as the source file.  On most systems,
  only the super-user can set file ownership.  By default, the preservation
 --- /dev/null  1 Jan 1970 00:00:00 -0000
  destination file to be the same as the source file.  On most systems,
  only the super-user can set file ownership.  By default, the preservation
 --- /dev/null  1 Jan 1970 00:00:00 -0000

-+++ smb_acls.h 18 Jun 2004 17:21:47 -0000
++++ smb_acls.h 30 Jun 2004 00:04:07 -0000

 @@ -0,0 +1,277 @@
 +/* 
 +   Unix SMB/Netbios implementation.
 @@ -0,0 +1,277 @@
 +/* 
 +   Unix SMB/Netbios implementation.


@@ -1790,7 +1790,7 @@ After applying this patch, run these commands for a successful build:
 +#endif /* No ACLs. */
 +#endif /* _SMB_ACLS_H */
 --- /dev/null  1 Jan 1970 00:00:00 -0000
 +#endif /* No ACLs. */
 +#endif /* _SMB_ACLS_H */
 --- /dev/null  1 Jan 1970 00:00:00 -0000

-+++ sysacls.c  18 Jun 2004 17:21:48 -0000
++++ sysacls.c  30 Jun 2004 00:04:08 -0000

 @@ -0,0 +1,3117 @@
 +/*
 +   Unix SMB/Netbios implementation.
 @@ -0,0 +1,3117 @@
 +/*
 +   Unix SMB/Netbios implementation.


@@ -4910,7 +4910,7 @@ After applying this patch, run these commands for a successful build:
 +
 +#endif /* No ACLs. */
 --- uidlist.c  28 Apr 2004 17:31:31 -0000      1.24
 +
 +#endif /* No ACLs. */
 --- uidlist.c  28 Apr 2004 17:31:31 -0000      1.24

-+++ uidlist.c  18 Jun 2004 17:21:48 -0000
++++ uidlist.c  30 Jun 2004 00:04:08 -0000

 @@ -34,6 +34,7 @@
  extern int verbose;
  extern int preserve_uid;
 @@ -34,6 +34,7 @@
  extern int verbose;
  extern int preserve_uid;

diff --git a/atimes.diff b/atimes.diff
index 271557f..8104dc0 100644 (file)
--- a/atimes.diff
+++ b/atimes.diff
@@ -5,7 +5,7 @@ command before "make":
 
 
 --- batch.c    15 May 2004 19:31:10 -0000      1.32
 
 
 --- batch.c    15 May 2004 19:31:10 -0000      1.32

-+++ batch.c    18 Jun 2004 17:23:13 -0000
++++ batch.c    30 Jun 2004 00:06:21 -0000

 @@ -335,6 +335,8 @@ void show_flist(int index, struct file_s
                rprintf(FINFO, "flist->flags=%#x\n", fptr[i]->flags);
                rprintf(FINFO, "flist->modtime=%#lx\n",
 @@ -335,6 +335,8 @@ void show_flist(int index, struct file_s
                rprintf(FINFO, "flist->flags=%#x\n", fptr[i]->flags);
                rprintf(FINFO, "flist->modtime=%#lx\n",


@@ -16,7 +16,7 @@ command before "make":
                        (double) fptr[i]->length);
                rprintf(FINFO, "flist->mode=%#o\n", (int) fptr[i]->mode);
 --- flist.c    18 Jun 2004 16:29:21 -0000      1.231
                        (double) fptr[i]->length);
                rprintf(FINFO, "flist->mode=%#o\n", (int) fptr[i]->mode);
 --- flist.c    18 Jun 2004 16:29:21 -0000      1.231

-+++ flist.c    18 Jun 2004 17:23:13 -0000
++++ flist.c    30 Jun 2004 00:06:21 -0000

 @@ -58,6 +58,7 @@ extern int relative_paths;
  extern int implied_dirs;
  extern int copy_links;
 @@ -58,6 +58,7 @@ extern int relative_paths;
  extern int implied_dirs;
  extern int copy_links;


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

---- generator.c        18 Jun 2004 16:30:24 -0000      1.88
-+++ generator.c        18 Jun 2004 17:23:14 -0000
-@@ -102,7 +102,7 @@ static int skip_file(char *fname, struct
+--- generator.c        29 Jun 2004 19:19:00 -0000      1.92
++++ generator.c        30 Jun 2004 00:06:21 -0000
+@@ -99,7 +99,7 @@ static int skip_file(char *fname, struct
+       if (ignore_times)

                return 0;
                return 0;

-       }

  
  

--      return (cmp_modtime(st->st_mtime,file->modtime) == 0);
-+      return cmp_time(st->st_mtime,file->modtime) == 0;
+-      return cmp_modtime(st->st_mtime, file->modtime) == 0;
++      return cmp_time(st->st_mtime, file->modtime) == 0;

  }
  
  
  }
  
  

-@@ -485,7 +485,7 @@ void recv_generator(char *fname, struct 
-               return;
+@@ -484,7 +484,7 @@ static void recv_generator(char *fname, 

        }
  
        }
  

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

                if (verbose > 1)
                        rprintf(FINFO,"%s is newer\n",fname);
                return;
                if (verbose > 1)
                        rprintf(FINFO,"%s is newer\n",fname);
                return;

---- options.c  7 Jun 2004 22:05:22 -0000       1.156
-+++ options.c  18 Jun 2004 17:23:14 -0000
+--- options.c  20 Jun 2004 19:47:05 -0000      1.157
++++ options.c  30 Jun 2004 00:06:21 -0000

 @@ -48,6 +48,7 @@ int preserve_devices = 0;
  int preserve_uid = 0;
  int preserve_gid = 0;
 @@ -48,6 +48,7 @@ int preserve_devices = 0;
  int preserve_uid = 0;
  int preserve_gid = 0;


@@ -184,7 +184,7 @@ command before "make":
                argstr[x++] = 'p';
        if (recurse)
 --- rsync.c    11 Jun 2004 07:40:45 -0000      1.141
                argstr[x++] = 'p';
        if (recurse)
 --- rsync.c    11 Jun 2004 07:40:45 -0000      1.141

-+++ rsync.c    18 Jun 2004 17:23:14 -0000
++++ rsync.c    30 Jun 2004 00:06:22 -0000

 @@ -25,6 +25,7 @@
  extern int verbose;
  extern int dry_run;
 @@ -25,6 +25,7 @@
  extern int verbose;
  extern int dry_run;


@@ -230,7 +230,7 @@ command before "make":
  
        change_uid = am_root && preserve_uid && st->st_uid != file->uid;
 --- rsync.h    16 May 2004 07:28:24 -0000      1.204
  
        change_uid = am_root && preserve_uid && st->st_uid != file->uid;
 --- rsync.h    16 May 2004 07:28:24 -0000      1.204

-+++ rsync.h    18 Jun 2004 17:23:14 -0000
++++ rsync.h    30 Jun 2004 00:06:22 -0000

 @@ -54,6 +54,7 @@
  #define XMIT_HAS_IDEV_DATA (1<<9)
  #define XMIT_SAME_DEV (1<<10)
 @@ -54,6 +54,7 @@
  #define XMIT_HAS_IDEV_DATA (1<<9)
  #define XMIT_SAME_DEV (1<<10)


@@ -256,7 +256,7 @@ command before "make":
        gid_t gid;
        mode_t mode;
 --- rsync.yo   5 Jun 2004 16:16:30 -0000       1.171
        gid_t gid;
        mode_t mode;
 --- rsync.yo   5 Jun 2004 16:16:30 -0000       1.171

-+++ rsync.yo   18 Jun 2004 17:23:15 -0000
++++ rsync.yo   30 Jun 2004 00:06:23 -0000

 @@ -300,6 +300,7 @@ verb(
   -g, --group                 preserve group
   -D, --devices               preserve devices (root only)
 @@ -300,6 +300,7 @@ verb(
   -g, --group                 preserve group
   -D, --devices               preserve devices (root only)


@@ -278,7 +278,7 @@ command before "make":
  instead it will just report the actions it would have taken.
  
 --- tls.c      15 May 2004 19:09:42 -0000      1.20
  instead it will just report the actions it would have taken.
  
 --- tls.c      15 May 2004 19:09:42 -0000      1.20

-+++ tls.c      18 Jun 2004 17:23:15 -0000
++++ tls.c      30 Jun 2004 00:06:23 -0000

 @@ -39,6 +39,7 @@
  
  
 @@ -39,6 +39,7 @@
  
  


@@ -415,7 +415,7 @@ command before "make":
        return 0;
  }
 --- util.c     9 Jun 2004 21:51:07 -0000       1.149
        return 0;
  }
 --- util.c     9 Jun 2004 21:51:07 -0000       1.149

-+++ util.c     18 Jun 2004 17:23:15 -0000
++++ util.c     30 Jun 2004 00:06:23 -0000

 @@ -127,31 +127,39 @@ void overflow(char *str)
  
  
 @@ -127,31 +127,39 @@ void overflow(char *str)
  
  


@@ -483,7 +483,7 @@ command before "make":
        if (file2 > file1) {
                if (file2 - file1 <= modify_window)
 --- /dev/null  1 Jan 1970 00:00:00 -0000
        if (file2 > file1) {
                if (file2 - file1 <= modify_window)
 --- /dev/null  1 Jan 1970 00:00:00 -0000

-+++ testsuite/copy-atimes.test 18 Jun 2004 17:23:15 -0000
++++ testsuite/copy-atimes.test 30 Jun 2004 00:06:23 -0000

 @@ -0,0 +1,19 @@
 +#! /bin/sh
 +
 @@ -0,0 +1,19 @@
 +#! /bin/sh
 +


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

---- testsuite/rsync.fns        18 May 2004 00:41:55 -0000      1.60
-+++ testsuite/rsync.fns        18 Jun 2004 17:23:15 -0000
+--- testsuite/rsync.fns        24 Jun 2004 04:46:02 -0000      1.61
++++ testsuite/rsync.fns        30 Jun 2004 00:06:23 -0000

 @@ -50,7 +50,7 @@ printmsg() {
  
  
 @@ -50,7 +50,7 @@ printmsg() {
  
  

diff --git a/compare-dest.diff b/compare-dest.diff
index 8270374..88ae3dc 100644 (file)
--- a/compare-dest.diff
+++ b/compare-dest.diff
@@ -7,8 +7,8 @@ they are suppled).
 
 Before compiling, be sure to run "make proto".
 
 
 Before compiling, be sure to run "make proto".
 

---- generator.c        29 Jun 2004 19:19:00 -0000      1.92
-+++ generator.c        30 Jun 2004 06:50:26 -0000
+--- generator.c        30 Jun 2004 07:27:30 -0000      1.93
++++ generator.c        30 Jun 2004 07:40:25 -0000

 @@ -42,7 +42,7 @@ extern int size_only;
  extern int io_timeout;
  extern int protocol_version;
 @@ -42,7 +42,7 @@ extern int size_only;
  extern int io_timeout;
  extern int protocol_version;


@@ -166,7 +166,7 @@ Before compiling, be sure to run "make proto".
        write_int(f_out,i);
        generate_and_send_sums(mapbuf, st.st_size, f_out);
  
        write_int(f_out,i);
        generate_and_send_sums(mapbuf, st.st_size, f_out);
  

-@@ -543,10 +563,11 @@ static void recv_generator(char *fname, 
+@@ -543,7 +563,8 @@ static void recv_generator(char *fname, 

  }
  
  
  }
  
  


@@ -175,11 +175,7 @@ Before compiling, be sure to run "make proto".
 +                  int f_nameout)
  {
        int i;
 +                  int f_nameout)
  {
        int i;

--      int phase=0;
-+      int phase = 0;
-       char fbuf[MAXPATHLEN];
- 
-       if (verbose > 2) {
+       int phase = 0;

 @@ -584,7 +605,7 @@ void generate_files(int f, struct file_l
                }
  
 @@ -584,7 +605,7 @@ void generate_files(int f, struct file_l
                }
  


@@ -207,20 +203,18 @@ Before compiling, be sure to run "make proto".
        }
  
        if (verbose > 2)
        }
  
        if (verbose > 2)

---- main.c     28 Jun 2004 17:45:40 -0000      1.201
-+++ main.c     30 Jun 2004 06:50:27 -0000
-@@ -428,8 +428,8 @@ static void do_server_sender(int f_in, i
- static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
+--- main.c     30 Jun 2004 07:27:30 -0000      1.202
++++ main.c     30 Jun 2004 07:40:25 -0000
+@@ -429,7 +429,7 @@ static int do_recv(int f_in,int f_out,st

  {
        int pid;
  {
        int pid;

--      int status=0;
+       int status = 0;

 -      int error_pipe[2];
 -      int error_pipe[2];

-+      int status = 0;

 +      int error_pipe[2], name_pipe[2];
  
        if (preserve_hard_links)
                init_hard_links(flist);
 +      int error_pipe[2], name_pipe[2];
  
        if (preserve_hard_links)
                init_hard_links(flist);

-@@ -441,17 +441,19 @@ static int do_recv(int f_in,int f_out,st
+@@ -441,8 +441,8 @@ static int do_recv(int f_in,int f_out,st

                }
        }
  
                }
        }
  


@@ -231,10 +225,9 @@ Before compiling, be sure to run "make proto".
                exit_cleanup(RERR_SOCKETIO);
        }
  
                exit_cleanup(RERR_SOCKETIO);
        }
  

-       io_flush(NORMAL_FLUSH);
+@@ -450,8 +450,10 @@ static int do_recv(int f_in,int f_out,st

  
  

--      if ((pid=do_fork()) == 0) {
-+      if ((pid = do_fork()) == 0) {
+       if ((pid = do_fork()) == 0) {

                close(error_pipe[0]);
 +              close(name_pipe[1]);
                if (f_in != f_out)
                close(error_pipe[0]);
 +              close(name_pipe[1]);
                if (f_in != f_out)


@@ -271,7 +264,7 @@ Before compiling, be sure to run "make proto".
        get_redo_num(); /* Read final MSG_DONE and any prior messages. */
        report(-1);
 --- options.c  20 Jun 2004 19:47:05 -0000      1.157
        get_redo_num(); /* Read final MSG_DONE and any prior messages. */
        report(-1);
 --- options.c  20 Jun 2004 19:47:05 -0000      1.157

-+++ options.c  30 Jun 2004 06:50:27 -0000
++++ options.c  30 Jun 2004 07:40:26 -0000

 @@ -117,7 +117,8 @@ unsigned int backup_dir_remainder;
  
  char *backup_suffix = NULL;
 @@ -117,7 +117,8 @@ unsigned int backup_dir_remainder;
  
  char *backup_suffix = NULL;


@@ -398,8 +391,8 @@ Before compiling, be sure to run "make proto".
        }
  
        if (files_from && (!am_sender || remote_filesfrom_file)) {
        }
  
        if (files_from && (!am_sender || remote_filesfrom_file)) {

---- receiver.c 29 Jun 2004 15:12:01 -0000      1.83
-+++ receiver.c 30 Jun 2004 06:50:27 -0000
+--- receiver.c 30 Jun 2004 07:27:30 -0000      1.84
++++ receiver.c 30 Jun 2004 07:40:26 -0000

 @@ -36,7 +36,6 @@ extern int preserve_perms;
  extern int cvs_exclude;
  extern int io_error;
 @@ -36,7 +36,6 @@ extern int preserve_perms;
  extern int cvs_exclude;
  extern int io_error;


@@ -465,7 +458,7 @@ Before compiling, be sure to run "make proto".
                         * wouldn't be necessary if robust_rename()
                         * and the underlying robust_unlink could cope
 --- rsync.h    16 May 2004 07:28:24 -0000      1.204
                         * wouldn't be necessary if robust_rename()
                         * and the underlying robust_unlink could cope
 --- rsync.h    16 May 2004 07:28:24 -0000      1.204

-+++ rsync.h    30 Jun 2004 06:50:27 -0000
++++ rsync.h    30 Jun 2004 07:40:26 -0000

 @@ -98,6 +98,8 @@
  
  #define MAX_ARGS 1000
 @@ -98,6 +98,8 @@
  
  #define MAX_ARGS 1000

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

---- generator.c        18 Jun 2004 16:30:24 -0000      1.88
-+++ generator.c        18 Jun 2004 17:23:46 -0000
+--- generator.c        23 Jun 2004 16:51:21 -0000      1.89
++++ generator.c        23 Jun 2004 17:18:42 -0000

 @@ -39,6 +39,7 @@ extern int opt_ignore_existing;
  extern int csum_length;
  extern int ignore_times;
 @@ -39,6 +39,7 @@ extern int opt_ignore_existing;
  extern int csum_length;
  extern int ignore_times;


@@ -30,12 +30,12 @@ Jeremy Bornstein
  static int skip_file(char *fname, struct file_struct *file, STRUCT_STAT *st)
  {
 +      if (date_only)
  static int skip_file(char *fname, struct file_struct *file, STRUCT_STAT *st)
  {
 +      if (date_only)

-+              return cmp_modtime(st->st_mtime,file->modtime) == 0;
-       if (st->st_size != file->length) {
++              return cmp_modtime(st->st_mtime, file->modtime) == 0;
+       if (st->st_size != file->length)

                return 0;
                return 0;

-       }
---- options.c  7 Jun 2004 22:05:22 -0000       1.156
-+++ options.c  18 Jun 2004 17:23:47 -0000
+       if (link_dest) {
+--- options.c  20 Jun 2004 19:47:05 -0000      1.157
++++ options.c  23 Jun 2004 17:18:43 -0000

 @@ -84,6 +84,7 @@ int keep_partial = 0;
  int safe_symlinks = 0;
  int copy_unsafe_links = 0;
 @@ -84,6 +84,7 @@ int keep_partial = 0;
  int safe_symlinks = 0;
  int copy_unsafe_links = 0;


@@ -71,7 +71,7 @@ Jeremy Bornstein
                if (asprintf(&arg, "--modify-window=%d", modify_window) < 0)
                        goto oom;
 --- rsync.yo   5 Jun 2004 16:16:30 -0000       1.171
                if (asprintf(&arg, "--modify-window=%d", modify_window) < 0)
                        goto oom;
 --- rsync.yo   5 Jun 2004 16:16:30 -0000       1.171

-+++ rsync.yo   18 Jun 2004 17:23:47 -0000
++++ rsync.yo   23 Jun 2004 17:18:44 -0000

 @@ -321,6 +321,7 @@ verb(
       --timeout=TIME          set I/O timeout in seconds
   -I, --ignore-times          turn off mod time & file size quick check
 @@ -321,6 +321,7 @@ verb(
       --timeout=TIME          set I/O timeout in seconds
   -I, --ignore-times          turn off mod time & file size quick check

diff --git a/fname-convert.diff b/fname-convert.diff
index 4860345..f28a250 100644 (file)
--- a/fname-convert.diff
+++ b/fname-convert.diff
@@ -48,7 +48,7 @@ Note that you'll need to run 'make proto' after applying this patch.
 
 
 --- Makefile.in        15 May 2004 00:48:11 -0000      1.101
 
 
 --- Makefile.in        15 May 2004 00:48:11 -0000      1.101

-+++ Makefile.in        28 Jun 2004 21:08:38 -0000
++++ Makefile.in        30 Jun 2004 00:08:18 -0000

 @@ -35,7 +35,7 @@ OBJS1=rsync.o generator.o receiver.o cle
        main.o checksum.o match.o syscall.o log.o backup.o
  OBJS2=options.o flist.o io.o compat.o hlink.o token.o uidlist.o socket.o \
 @@ -35,7 +35,7 @@ OBJS1=rsync.o generator.o receiver.o cle
        main.o checksum.o match.o syscall.o log.o backup.o
  OBJS2=options.o flist.o io.o compat.o hlink.o token.o uidlist.o socket.o \


@@ -59,7 +59,7 @@ Note that you'll need to run 'make proto' after applying this patch.
  popt_OBJS=popt/findme.o  popt/popt.o  popt/poptconfig.o \
        popt/popthelp.o popt/poptparse.o
 --- cleanup.c  13 May 2004 07:08:18 -0000      1.22
  popt_OBJS=popt/findme.o  popt/popt.o  popt/poptconfig.o \
        popt/popthelp.o popt/poptparse.o
 --- cleanup.c  13 May 2004 07:08:18 -0000      1.22

-+++ cleanup.c  28 Jun 2004 21:08:38 -0000
++++ cleanup.c  30 Jun 2004 00:08:18 -0000

 @@ -24,6 +24,7 @@
  extern int io_error;
  extern int keep_partial;
 @@ -24,6 +24,7 @@
  extern int io_error;
  extern int keep_partial;


@@ -78,7 +78,7 @@ Note that you'll need to run 'make proto' after applying this patch.
                do_unlink(cleanup_fname);
        if (code) {
 --- errcode.h  15 Dec 2003 08:04:14 -0000      1.8
                do_unlink(cleanup_fname);
        if (code) {
 --- errcode.h  15 Dec 2003 08:04:14 -0000      1.8

-+++ errcode.h  28 Jun 2004 21:08:38 -0000
++++ errcode.h  30 Jun 2004 00:08:18 -0000

 @@ -34,6 +34,7 @@
  #define RERR_STREAMIO   12      /* error in rsync protocol data stream */
  #define RERR_MESSAGEIO  13      /* errors with program diagnostics */
 @@ -34,6 +34,7 @@
  #define RERR_STREAMIO   12      /* error in rsync protocol data stream */
  #define RERR_MESSAGEIO  13      /* errors with program diagnostics */


@@ -88,7 +88,7 @@ Note that you'll need to run 'make proto' after applying this patch.
  #define RERR_SIGNAL     20      /* status returned when sent SIGUSR1, SIGINT */
  #define RERR_WAITCHILD  21      /* some error returned by waitpid() */
 --- flist.c    18 Jun 2004 16:29:21 -0000      1.231
  #define RERR_SIGNAL     20      /* status returned when sent SIGUSR1, SIGINT */
  #define RERR_WAITCHILD  21      /* some error returned by waitpid() */
 --- flist.c    18 Jun 2004 16:29:21 -0000      1.231

-+++ flist.c    28 Jun 2004 21:08:38 -0000
++++ flist.c    30 Jun 2004 00:08:18 -0000

 @@ -43,6 +43,7 @@ extern int cvs_exclude;
  
  extern int recurse;
 @@ -43,6 +43,7 @@ extern int cvs_exclude;
  
  extern int recurse;


@@ -160,7 +160,7 @@ Note that you'll need to run 'make proto' after applying this patch.
                output_flist(flist);
  
 --- /dev/null  1 Jan 1970 00:00:00 -0000
                output_flist(flist);
  
 --- /dev/null  1 Jan 1970 00:00:00 -0000

-+++ fnameconv.c        28 Jun 2004 21:08:38 -0000
++++ fnameconv.c        30 Jun 2004 00:08:18 -0000

 @@ -0,0 +1,220 @@
 +/*  -*- c-file-style: "linux" -*-
 + *
 @@ -0,0 +1,220 @@
 +/*  -*- c-file-style: "linux" -*-
 + *


@@ -382,8 +382,8 @@ 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);
 +}

---- generator.c        23 Jun 2004 21:21:19 -0000      1.90
-+++ generator.c        28 Jun 2004 21:08:39 -0000
+--- generator.c        29 Jun 2004 19:19:00 -0000      1.92
++++ generator.c        30 Jun 2004 00:08:18 -0000

 @@ -265,6 +265,12 @@ static void generate_and_send_sums(struc
   *
   * @note This comment was added later by mbp who was trying to work it
 @@ -265,6 +265,12 @@ static void generate_and_send_sums(struc
   *
   * @note This comment was added later by mbp who was trying to work it


@@ -394,11 +394,11 @@ Note that you'll need to run 'make proto' after applying this patch.
 + * files are printf()ed here but regular files are rprintf()ed on the
 + * sender (unconverted). To solve the above, move all progress
 + * reporting to the sender.
 + * files are printf()ed here but regular files are rprintf()ed on the
 + * sender (unconverted). To solve the above, move all progress
 + * reporting to the sender.

-  **/
- void recv_generator(char *fname, struct file_struct *file, int i, int f_out)
- {
+  */
+ static void recv_generator(char *fname, struct file_struct *file, int i,
+                          int f_out)

 --- log.c      7 Jun 2004 22:51:14 -0000       1.74
 --- log.c      7 Jun 2004 22:51:14 -0000       1.74

-+++ log.c      28 Jun 2004 21:08:39 -0000
++++ log.c      30 Jun 2004 00:08:19 -0000

 @@ -57,6 +57,7 @@ struct {
        { RERR_STREAMIO   , "error in rsync protocol data stream" },
        { RERR_MESSAGEIO  , "errors with program diagnostics" },
 @@ -57,6 +57,7 @@ struct {
        { RERR_STREAMIO   , "error in rsync protocol data stream" },
        { RERR_MESSAGEIO  , "errors with program diagnostics" },


@@ -408,7 +408,7 @@ Note that you'll need to run 'make proto' after applying this patch.
        { RERR_WAITCHILD  , "some error returned by waitpid()" },
        { RERR_MALLOC     , "error allocating core memory buffers" },
 --- main.c     28 Jun 2004 17:45:40 -0000      1.201
        { RERR_WAITCHILD  , "some error returned by waitpid()" },
        { RERR_MALLOC     , "error allocating core memory buffers" },
 --- main.c     28 Jun 2004 17:45:40 -0000      1.201

-+++ main.c     28 Jun 2004 21:08:39 -0000
++++ main.c     30 Jun 2004 00:08:19 -0000

 @@ -304,7 +304,7 @@ static pid_t do_cmd(char *cmd, char *mac
                        create_flist_from_batch(); /* sets batch_flist */
                ret = local_child(argc, args, f_in, f_out, child_main);
 @@ -304,7 +304,7 @@ static pid_t do_cmd(char *cmd, char *mac
                        create_flist_from_batch(); /* sets batch_flist */
                ret = local_child(argc, args, f_in, f_out, child_main);


@@ -419,7 +419,7 @@ Note that you'll need to run 'make proto' after applying this patch.
  
        if (dir)
 --- options.c  20 Jun 2004 19:47:05 -0000      1.157
  
        if (dir)
 --- options.c  20 Jun 2004 19:47:05 -0000      1.157

-+++ options.c  28 Jun 2004 21:08:39 -0000
++++ options.c  30 Jun 2004 00:08:19 -0000

 @@ -127,6 +127,7 @@ char *backup_dir = NULL;
  char backup_dir_buf[MAXPATHLEN];
  int rsync_port = RSYNC_PORT;
 @@ -127,6 +127,7 @@ char *backup_dir = NULL;
  char backup_dir_buf[MAXPATHLEN];
  int rsync_port = RSYNC_PORT;


@@ -445,7 +445,7 @@ Note that you'll need to run 'make proto' after applying this patch.
    {"compress",        'z', POPT_ARG_NONE,   &do_compression, 0, 0, 0 },
    {"daemon",           0,  POPT_ARG_NONE,   &daemon_opt, 0, 0, 0 },
 --- pipe.c     18 Jun 2004 16:00:33 -0000      1.8
    {"compress",        'z', POPT_ARG_NONE,   &do_compression, 0, 0, 0 },
    {"daemon",           0,  POPT_ARG_NONE,   &daemon_opt, 0, 0, 0 },
 --- pipe.c     18 Jun 2004 16:00:33 -0000      1.8

-+++ pipe.c     28 Jun 2004 21:08:39 -0000
++++ pipe.c     30 Jun 2004 00:08:19 -0000

 @@ -23,7 +23,6 @@
  
  extern int am_sender;
 @@ -23,7 +23,6 @@
  
  extern int am_sender;


@@ -476,7 +476,7 @@ Note that you'll need to run 'make proto' after applying this patch.
                rsyserr(FERROR, errno, "fork");
                exit_cleanup(RERR_IPC);
 --- syscall.c  18 Feb 2004 22:33:21 -0000      1.30
                rsyserr(FERROR, errno, "fork");
                exit_cleanup(RERR_IPC);
 --- syscall.c  18 Feb 2004 22:33:21 -0000      1.30

-+++ syscall.c  28 Jun 2004 21:08:39 -0000
++++ syscall.c  30 Jun 2004 00:08:19 -0000

 @@ -231,3 +231,34 @@ char *d_name(struct dirent *di)
        return di->d_name;
  #endif
 @@ -231,3 +231,34 @@ char *d_name(struct dirent *di)
        return di->d_name;
  #endif


@@ -513,7 +513,7 @@ Note that you'll need to run 'make proto' after applying this patch.
 +      return result;
 +}
 --- util.c     9 Jun 2004 21:51:07 -0000       1.149
 +      return result;
 +}
 --- util.c     9 Jun 2004 21:51:07 -0000       1.149

-+++ util.c     28 Jun 2004 21:08:40 -0000
++++ util.c     30 Jun 2004 00:08:20 -0000

 @@ -1153,3 +1153,55 @@ void *_realloc_array(void *ptr, unsigned
                return malloc(size * num);
        return realloc(ptr, size * num);
 @@ -1153,3 +1153,55 @@ void *_realloc_array(void *ptr, unsigned
                return malloc(size * num);
        return realloc(ptr, size * num);

diff --git a/fuzzy.diff b/fuzzy.diff
index 0dbc1ba..0a31901 100644 (file)
--- a/fuzzy.diff
+++ b/fuzzy.diff
@@ -4,8 +4,8 @@ I greatly simplified the changes to generator.c, making the patch
 easier to maintain and fixing the failing test in the testsuite.
 Very lightly tested.
 
 easier to maintain and fixing the failing test in the testsuite.
 Very lightly tested.
 

---- generator.c        29 Jun 2004 19:19:00 -0000      1.92
-+++ generator.c        30 Jun 2004 07:35:56 -0000
+--- generator.c        30 Jun 2004 07:27:30 -0000      1.93
++++ generator.c        30 Jun 2004 07:43:46 -0000

 @@ -41,6 +41,7 @@ extern int ignore_times;
  extern int size_only;
  extern int io_timeout;
 @@ -41,6 +41,7 @@ extern int ignore_times;
  extern int size_only;
  extern int io_timeout;


@@ -235,7 +235,7 @@ Very lightly tested.
        write_int(f_out,i);
        generate_and_send_sums(mapbuf, st.st_size, f_out);
  
        write_int(f_out,i);
        generate_and_send_sums(mapbuf, st.st_size, f_out);
  

-@@ -543,10 +656,11 @@ static void recv_generator(char *fname, 
+@@ -543,7 +656,8 @@ static void recv_generator(char *fname, 

  }
  
  
  }
  
  


@@ -244,11 +244,7 @@ Very lightly tested.
 +                  int f_nameout)
  {
        int i;
 +                  int f_nameout)
  {
        int i;

--      int phase=0;
-+      int phase = 0;
-       char fbuf[MAXPATHLEN];
- 
-       if (verbose > 2) {
+       int phase = 0;

 @@ -584,7 +698,7 @@ void generate_files(int f, struct file_l
                }
  
 @@ -584,7 +698,7 @@ void generate_files(int f, struct file_l
                }
  


@@ -276,20 +272,18 @@ Very lightly tested.
        }
  
        if (verbose > 2)
        }
  
        if (verbose > 2)

---- main.c     28 Jun 2004 17:45:40 -0000      1.201
-+++ main.c     30 Jun 2004 07:35:57 -0000
-@@ -428,8 +428,8 @@ static void do_server_sender(int f_in, i
- static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
+--- main.c     30 Jun 2004 07:27:30 -0000      1.202
++++ main.c     30 Jun 2004 07:43:47 -0000
+@@ -429,7 +429,7 @@ static int do_recv(int f_in,int f_out,st

  {
        int pid;
  {
        int pid;

--      int status=0;
+       int status = 0;

 -      int error_pipe[2];
 -      int error_pipe[2];

-+      int status = 0;

 +      int error_pipe[2], name_pipe[2];
  
        if (preserve_hard_links)
                init_hard_links(flist);
 +      int error_pipe[2], name_pipe[2];
  
        if (preserve_hard_links)
                init_hard_links(flist);

-@@ -441,17 +441,19 @@ static int do_recv(int f_in,int f_out,st
+@@ -441,8 +441,8 @@ static int do_recv(int f_in,int f_out,st

                }
        }
  
                }
        }
  


@@ -300,10 +294,9 @@ Very lightly tested.
                exit_cleanup(RERR_SOCKETIO);
        }
  
                exit_cleanup(RERR_SOCKETIO);
        }
  

-       io_flush(NORMAL_FLUSH);
+@@ -450,8 +450,10 @@ static int do_recv(int f_in,int f_out,st

  
  

--      if ((pid=do_fork()) == 0) {
-+      if ((pid = do_fork()) == 0) {
+       if ((pid = do_fork()) == 0) {

                close(error_pipe[0]);
 +              close(name_pipe[1]);
                if (f_in != f_out)
                close(error_pipe[0]);
 +              close(name_pipe[1]);
                if (f_in != f_out)


@@ -340,7 +333,7 @@ Very lightly tested.
        get_redo_num(); /* Read final MSG_DONE and any prior messages. */
        report(-1);
 --- options.c  20 Jun 2004 19:47:05 -0000      1.157
        get_redo_num(); /* Read final MSG_DONE and any prior messages. */
        report(-1);
 --- options.c  20 Jun 2004 19:47:05 -0000      1.157

-+++ options.c  30 Jun 2004 07:35:57 -0000
++++ options.c  30 Jun 2004 07:43:47 -0000

 @@ -94,6 +94,7 @@ int ignore_errors = 0;
  int modify_window = 0;
  int blocking_io = -1;
 @@ -94,6 +94,7 @@ int ignore_errors = 0;
  int modify_window = 0;
  int blocking_io = -1;


@@ -375,8 +368,8 @@ Very lightly tested.
        *argc = ac;
        return;
  
        *argc = ac;
        return;
  

---- receiver.c 29 Jun 2004 15:12:01 -0000      1.83
-+++ receiver.c 30 Jun 2004 07:35:57 -0000
+--- receiver.c 30 Jun 2004 07:27:30 -0000      1.84
++++ receiver.c 30 Jun 2004 07:43:47 -0000

 @@ -36,7 +36,6 @@ extern int preserve_perms;
  extern int cvs_exclude;
  extern int io_error;
 @@ -36,7 +36,6 @@ extern int preserve_perms;
  extern int cvs_exclude;
  extern int io_error;


@@ -442,7 +435,7 @@ Very lightly tested.
                         * wouldn't be necessary if robust_rename()
                         * and the underlying robust_unlink could cope
 --- rsync.yo   5 Jun 2004 16:16:30 -0000       1.171
                         * wouldn't be necessary if robust_rename()
                         * and the underlying robust_unlink could cope
 --- rsync.yo   5 Jun 2004 16:16:30 -0000       1.171

-+++ rsync.yo   30 Jun 2004 07:35:58 -0000
++++ rsync.yo   30 Jun 2004 07:43:48 -0000

 @@ -325,6 +325,7 @@ verb(
   -T  --temp-dir=DIR          create temporary files in directory DIR
       --compare-dest=DIR      also compare received files relative to DIR
 @@ -325,6 +325,7 @@ verb(
   -T  --temp-dir=DIR          create temporary files in directory DIR
       --compare-dest=DIR      also compare received files relative to DIR

diff --git a/g2r-basis-filename.diff b/g2r-basis-filename.diff
index 787457e..3ef5a81 100644 (file)
--- a/g2r-basis-filename.diff
+++ b/g2r-basis-filename.diff
@@ -7,8 +7,8 @@ support for multiple --compare-dest options).
 
 You must run "make proto" before compiling.
 
 
 You must run "make proto" before compiling.
 

---- generator.c        29 Jun 2004 19:19:00 -0000      1.92
-+++ generator.c        29 Jun 2004 19:24:22 -0000
+--- generator.c        30 Jun 2004 07:27:30 -0000      1.93
++++ generator.c        30 Jun 2004 07:45:03 -0000

 @@ -267,7 +267,7 @@ static void generate_and_send_sums(struc
   * out.  It might be wrong.
   */
 @@ -267,7 +267,7 @@ static void generate_and_send_sums(struc
   * out.  It might be wrong.
   */


@@ -121,7 +121,7 @@ You must run "make proto" before compiling.
        write_int(f_out,i);
        generate_and_send_sums(mapbuf, st.st_size, f_out);
  
        write_int(f_out,i);
        generate_and_send_sums(mapbuf, st.st_size, f_out);
  

-@@ -543,10 +559,11 @@ static void recv_generator(char *fname, 
+@@ -543,7 +559,8 @@ static void recv_generator(char *fname, 

  }
  
  
  }
  
  


@@ -130,11 +130,7 @@ You must run "make proto" before compiling.
 +                  int f_nameout)
  {
        int i;
 +                  int f_nameout)
  {
        int i;

--      int phase=0;
-+      int phase = 0;
-       char fbuf[MAXPATHLEN];
- 
-       if (verbose > 2) {
+       int phase = 0;

 @@ -584,7 +601,7 @@ void generate_files(int f, struct file_l
                }
  
 @@ -584,7 +601,7 @@ void generate_files(int f, struct file_l
                }
  


@@ -162,20 +158,18 @@ You must run "make proto" before compiling.
        }
  
        if (verbose > 2)
        }
  
        if (verbose > 2)

---- main.c     28 Jun 2004 17:45:40 -0000      1.201
-+++ main.c     29 Jun 2004 19:24:22 -0000
-@@ -428,8 +428,8 @@ static void do_server_sender(int f_in, i
- static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
+--- main.c     30 Jun 2004 07:27:30 -0000      1.202
++++ main.c     30 Jun 2004 07:45:03 -0000
+@@ -429,7 +429,7 @@ static int do_recv(int f_in,int f_out,st

  {
        int pid;
  {
        int pid;

--      int status=0;
+       int status = 0;

 -      int error_pipe[2];
 -      int error_pipe[2];

-+      int status = 0;

 +      int error_pipe[2], name_pipe[2];
  
        if (preserve_hard_links)
                init_hard_links(flist);
 +      int error_pipe[2], name_pipe[2];
  
        if (preserve_hard_links)
                init_hard_links(flist);

-@@ -441,17 +441,19 @@ static int do_recv(int f_in,int f_out,st
+@@ -441,8 +441,8 @@ static int do_recv(int f_in,int f_out,st

                }
        }
  
                }
        }
  


@@ -186,10 +180,9 @@ You must run "make proto" before compiling.
                exit_cleanup(RERR_SOCKETIO);
        }
  
                exit_cleanup(RERR_SOCKETIO);
        }
  

-       io_flush(NORMAL_FLUSH);
+@@ -450,8 +450,10 @@ static int do_recv(int f_in,int f_out,st

  
  

--      if ((pid=do_fork()) == 0) {
-+      if ((pid = do_fork()) == 0) {
+       if ((pid = do_fork()) == 0) {

                close(error_pipe[0]);
 +              close(name_pipe[1]);
                if (f_in != f_out)
                close(error_pipe[0]);
 +              close(name_pipe[1]);
                if (f_in != f_out)


@@ -225,8 +218,8 @@ You must run "make proto" before compiling.
  
        get_redo_num(); /* Read final MSG_DONE and any prior messages. */
        report(-1);
  
        get_redo_num(); /* Read final MSG_DONE and any prior messages. */
        report(-1);

---- receiver.c 29 Jun 2004 15:12:01 -0000      1.83
-+++ receiver.c 29 Jun 2004 19:24:22 -0000
+--- receiver.c 30 Jun 2004 07:27:30 -0000      1.84
++++ receiver.c 30 Jun 2004 07:45:03 -0000

 @@ -293,14 +293,15 @@ static int receive_data(int f_in,struct 
   * main routine for receiver process.
   *
 @@ -293,14 +293,15 @@ static int receive_data(int f_in,struct 
   * main routine for receiver process.
   *

diff --git a/inplace.diff b/inplace.diff
index 98e4660..c29bb27 100644 (file)
--- a/inplace.diff
+++ b/inplace.diff
@@ -1,7 +1,7 @@
 Patch from Mark Curtis to implement the --inplace option.
 
 --- match.c    21 May 2004 08:27:04 -0000      1.62
 Patch from Mark Curtis to implement the --inplace option.
 
 --- match.c    21 May 2004 08:27:04 -0000      1.62

-+++ match.c    18 Jun 2004 17:27:29 -0000
++++ match.c    30 Jun 2004 00:09:37 -0000

 @@ -23,6 +23,7 @@ extern int verbose;
  extern int am_server;
  extern int do_progress;
 @@ -23,6 +23,7 @@ extern int verbose;
  extern int am_server;
  extern int do_progress;


@@ -21,8 +21,8 @@ Patch from Mark Curtis to implement the --inplace option.
                        if (verbose > 3)
                                rprintf(FINFO,"potential match at %.0f target=%.0f %.0f sum=%08x\n",
                                        (double)offset,(double)j,(double)i,sum);
                        if (verbose > 3)
                                rprintf(FINFO,"potential match at %.0f target=%.0f %.0f sum=%08x\n",
                                        (double)offset,(double)j,(double)i,sum);

---- options.c  7 Jun 2004 22:05:22 -0000       1.156
-+++ options.c  18 Jun 2004 17:27:29 -0000
+--- options.c  20 Jun 2004 19:47:05 -0000      1.157
++++ options.c  30 Jun 2004 00:09:38 -0000

 @@ -94,6 +94,7 @@ int ignore_errors = 0;
  int modify_window = 0;
  int blocking_io = -1;
 @@ -94,6 +94,7 @@ int ignore_errors = 0;
  int modify_window = 0;
  int blocking_io = -1;


@@ -67,8 +67,8 @@ Patch from Mark Curtis to implement the --inplace option.
        if (tmpdir) {
                args[ac++] = "--temp-dir";
                args[ac++] = tmpdir;
        if (tmpdir) {
                args[ac++] = "--temp-dir";
                args[ac++] = tmpdir;

---- receiver.c 14 Jun 2004 15:09:36 -0000      1.82
-+++ receiver.c 18 Jun 2004 17:27:30 -0000
+--- receiver.c 29 Jun 2004 15:12:01 -0000      1.83
++++ receiver.c 30 Jun 2004 00:09:38 -0000

 @@ -48,6 +48,7 @@ extern int ignore_errors;
  extern int orig_umask;
  extern int keep_partial;
 @@ -48,6 +48,7 @@ extern int ignore_errors;
  extern int orig_umask;
  extern int keep_partial;


@@ -110,7 +110,7 @@ Patch from Mark Curtis to implement the --inplace option.
        if (do_progress)
                end_progress(total_size);
  
        if (do_progress)
                end_progress(total_size);
  

-@@ -418,37 +431,50 @@ int recv_files(int f_in,struct file_list
+@@ -420,37 +433,50 @@ int recv_files(int f_in,struct file_list

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


@@ -190,7 +190,7 @@ Patch from Mark Curtis to implement the --inplace option.
  
                cleanup_set(fnametmp, fname, file, mapbuf, fd1, fd2);
 --- rsync.c    11 Jun 2004 07:40:45 -0000      1.141
  
                cleanup_set(fnametmp, fname, file, mapbuf, fd1, fd2);
 --- rsync.c    11 Jun 2004 07:40:45 -0000      1.141

-+++ rsync.c    18 Jun 2004 17:27:30 -0000
++++ rsync.c    30 Jun 2004 00:09:38 -0000

 @@ -34,6 +34,7 @@ extern int force_delete;
  extern int recurse;
  extern int make_backups;
 @@ -34,6 +34,7 @@ extern int force_delete;
  extern int recurse;
  extern int make_backups;


@@ -212,7 +212,7 @@ Patch from Mark Curtis to implement the --inplace option.
        ret = robust_rename(fnametmp, fname, file->mode & INITACCESSPERMS);
        if (ret < 0) {
 --- rsync.yo   5 Jun 2004 16:16:30 -0000       1.171
        ret = robust_rename(fnametmp, fname, file->mode & INITACCESSPERMS);
        if (ret < 0) {
 --- rsync.yo   5 Jun 2004 16:16:30 -0000       1.171

-+++ rsync.yo   18 Jun 2004 17:27:30 -0000
++++ rsync.yo   30 Jun 2004 00:09:39 -0000

 @@ -289,6 +289,7 @@ verb(
       --backup-dir            make backups into this directory
       --suffix=SUFFIX         backup suffix (default ~ w/o --backup-dir)
 @@ -289,6 +289,7 @@ verb(
       --backup-dir            make backups into this directory
       --suffix=SUFFIX         backup suffix (default ~ w/o --backup-dir)

diff --git a/link-by-hash.diff b/link-by-hash.diff
index faa8d70..f5135b6 100644 (file)
--- a/link-by-hash.diff
+++ b/link-by-hash.diff
@@ -12,7 +12,7 @@ the file's name.
 
 
 --- Makefile.in        15 May 2004 00:48:11 -0000      1.101
 
 
 --- Makefile.in        15 May 2004 00:48:11 -0000      1.101

-+++ Makefile.in        18 Jun 2004 17:27:47 -0000
++++ Makefile.in        30 Jun 2004 00:10:04 -0000

 @@ -35,7 +35,7 @@ OBJS1=rsync.o generator.o receiver.o cle
        main.o checksum.o match.o syscall.o log.o backup.o
  OBJS2=options.o flist.o io.o compat.o hlink.o token.o uidlist.o socket.o \
 @@ -35,7 +35,7 @@ OBJS1=rsync.o generator.o receiver.o cle
        main.o checksum.o match.o syscall.o log.o backup.o
  OBJS2=options.o flist.o io.o compat.o hlink.o token.o uidlist.o socket.o \


@@ -23,7 +23,7 @@ the file's name.
  popt_OBJS=popt/findme.o  popt/popt.o  popt/poptconfig.o \
        popt/popthelp.o popt/poptparse.o
 --- /dev/null  1 Jan 1970 00:00:00 -0000
  popt_OBJS=popt/findme.o  popt/popt.o  popt/poptconfig.o \
        popt/popthelp.o popt/poptparse.o
 --- /dev/null  1 Jan 1970 00:00:00 -0000

-+++ hashlink.c 18 Jun 2004 17:27:47 -0000
++++ hashlink.c 30 Jun 2004 00:10:04 -0000

 @@ -0,0 +1,342 @@
 +/*
 +   Copyright (C) Cronosys, LLC 2004
 @@ -0,0 +1,342 @@
 +/*
 +   Copyright (C) Cronosys, LLC 2004


@@ -367,8 +367,8 @@ the file's name.
 +}
 +
 +#endif
 +}
 +
 +#endif

---- options.c  7 Jun 2004 22:05:22 -0000       1.156
-+++ options.c  18 Jun 2004 17:27:47 -0000
+--- options.c  20 Jun 2004 19:47:05 -0000      1.157
++++ options.c  30 Jun 2004 00:10:04 -0000

 @@ -124,6 +124,7 @@ char *log_format = NULL;
  char *password_file = NULL;
  char *rsync_path = RSYNC_PATH;
 @@ -124,6 +124,7 @@ char *log_format = NULL;
  char *password_file = NULL;
  char *rsync_path = RSYNC_PATH;


@@ -434,8 +434,8 @@ 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";

---- receiver.c 14 Jun 2004 15:09:36 -0000      1.82
-+++ receiver.c 18 Jun 2004 17:27:47 -0000
+--- receiver.c 29 Jun 2004 15:12:01 -0000      1.83
++++ receiver.c 30 Jun 2004 00:10:04 -0000

 @@ -48,6 +48,7 @@ extern int ignore_errors;
  extern int orig_umask;
  extern int keep_partial;
 @@ -48,6 +48,7 @@ extern int ignore_errors;
  extern int orig_umask;
  extern int keep_partial;


@@ -512,7 +512,7 @@ the file's name.
                        close(fd1);
                        continue;
                }
                        close(fd1);
                        continue;
                }

-@@ -445,7 +456,7 @@ int recv_files(int f_in,struct file_list
+@@ -447,7 +458,7 @@ int recv_files(int f_in,struct file_list

                if (fd2 == -1) {
                        rsyserr(FERROR, errno, "mkstemp %s failed",
                                full_fname(fnametmp));
                if (fd2 == -1) {
                        rsyserr(FERROR, errno, "mkstemp %s failed",
                                full_fname(fnametmp));


@@ -521,7 +521,7 @@ the file's name.
                        if (mapbuf) unmap_file(mapbuf);
                        if (fd1 != -1) close(fd1);
                        continue;
                        if (mapbuf) unmap_file(mapbuf);
                        if (fd1 != -1) close(fd1);
                        continue;

-@@ -458,7 +469,11 @@ int recv_files(int f_in,struct file_list
+@@ -460,7 +471,11 @@ int recv_files(int f_in,struct file_list

                }
  
                /* recv file data */
                }
  
                /* recv file data */


@@ -535,7 +535,7 @@ the file's name.
                log_recv(file, &initial_stats);
  
 --- rsync.c    11 Jun 2004 07:40:45 -0000      1.141
                log_recv(file, &initial_stats);
  
 --- rsync.c    11 Jun 2004 07:40:45 -0000      1.141

-+++ rsync.c    18 Jun 2004 17:27:47 -0000
++++ rsync.c    30 Jun 2004 00:10:04 -0000

 @@ -34,6 +34,7 @@ extern int force_delete;
  extern int recurse;
  extern int make_backups;
 @@ -34,6 +34,7 @@ extern int force_delete;
  extern int recurse;
  extern int make_backups;


@@ -560,7 +560,7 @@ the file's name.
                rsyserr(FERROR, errno, "%s %s -> \"%s\"",
                    ret == -2 ? "copy" : "rename",
 --- rsync.h    16 May 2004 07:28:24 -0000      1.204
                rsyserr(FERROR, errno, "%s %s -> \"%s\"",
                    ret == -2 ? "copy" : "rename",
 --- rsync.h    16 May 2004 07:28:24 -0000      1.204

-+++ rsync.h    18 Jun 2004 17:27:48 -0000
++++ rsync.h    30 Jun 2004 00:10:04 -0000

 @@ -522,6 +522,14 @@ struct stats {
        int current_file_index;
  };
 @@ -522,6 +522,14 @@ struct stats {
        int current_file_index;
  };

diff --git a/local-batch.diff b/local-batch.diff
index c1b10b3..b7b1d1d 100644 (file)
--- a/local-batch.diff
+++ b/local-batch.diff
@@ -1,5 +1,5 @@
 --- batch.c    15 May 2004 19:31:10 -0000      1.32
 --- batch.c    15 May 2004 19:31:10 -0000      1.32

-+++ batch.c    18 Jun 2004 17:16:35 -0000
++++ batch.c    30 Jun 2004 00:10:16 -0000

 @@ -172,6 +172,7 @@ void close_batch_csums_file(void)
  
  /**
 @@ -172,6 +172,7 @@ void close_batch_csums_file(void)
  
  /**


@@ -29,7 +29,7 @@
                rsyserr(FERROR, errno, "Batch file %s write error", filename);
                close(f_delta);
 --- flist.c    18 Jun 2004 16:29:21 -0000      1.231
                rsyserr(FERROR, errno, "Batch file %s write error", filename);
                close(f_delta);
 --- flist.c    18 Jun 2004 16:29:21 -0000      1.231

-+++ flist.c    18 Jun 2004 17:16:35 -0000
++++ flist.c    30 Jun 2004 00:10:16 -0000

 @@ -950,7 +950,7 @@ void send_file_name(int f, struct file_l
  
        flist_expand(flist);
 @@ -950,7 +950,7 @@ void send_file_name(int f, struct file_l
  
        flist_expand(flist);


@@ -58,8 +58,8 @@
        }
  
        if (verbose > 3)
        }
  
        if (verbose > 3)

---- generator.c        18 Jun 2004 16:30:24 -0000      1.88
-+++ generator.c        18 Jun 2004 17:16:35 -0000
+--- generator.c        29 Jun 2004 19:19:00 -0000      1.92
++++ generator.c        30 Jun 2004 00:10:16 -0000

 @@ -48,6 +48,7 @@ extern int whole_file;
  extern int local_server;
  extern int read_batch;
 @@ -48,6 +48,7 @@ extern int whole_file;
  extern int local_server;
  extern int read_batch;


@@ -68,7 +68,7 @@
  extern int list_only;
  extern int only_existing;
  extern int orig_umask;
  extern int list_only;
  extern int only_existing;
  extern int orig_umask;

-@@ -227,16 +228,27 @@ static BOOL disable_deltas_p(void)
+@@ -224,16 +225,27 @@ static BOOL disable_deltas_p(void)

   * Generate and send a stream of signatures/checksums that describe a buffer
   *
   * Generate approximately one checksum every block_len bytes.
   * Generate and send a stream of signatures/checksums that describe a buffer
   *
   * Generate approximately one checksum every block_len bytes.


@@ -98,7 +98,7 @@
  
        for (i = 0; i < sum.count; i++) {
                unsigned int n1 = MIN(len, sum.blength);
  
        for (i = 0; i < sum.count; i++) {
                unsigned int n1 = MIN(len, sum.blength);

-@@ -256,10 +268,30 @@ static void generate_and_send_sums(struc
+@@ -253,10 +265,30 @@ static void generate_and_send_sums(struc

                write_buf(f_out, sum2, sum.s2length);
                len -= n1;
                offset += n1;
                write_buf(f_out, sum2, sum.s2length);
                len -= n1;
                offset += n1;


@@ -127,9 +127,9 @@
 +              write_batch_csum_info(&i, NULL);
 +}
  
 +              write_batch_csum_info(&i, NULL);
 +}
  

- /**
+ /*

   * Acts on file number @p i from @p flist, whose name is @p fname.
   * Acts on file number @p i from @p flist, whose name is @p fname.

-@@ -454,9 +486,7 @@ void recv_generator(char *fname, struct 
+@@ -452,9 +484,7 @@ static void recv_generator(char *fname, 

                if (preserve_hard_links && hard_link_check(file, HL_SKIP))
                        return;
                if (errno == ENOENT) {
                if (preserve_hard_links && hard_link_check(file, HL_SKIP))
                        return;
                if (errno == ENOENT) {


@@ -140,7 +140,7 @@
                } else if (verbose > 1) {
                        rsyserr(FERROR, errno,
                                "recv_generator: failed to open %s",
                } else if (verbose > 1) {
                        rsyserr(FERROR, errno,
                                "recv_generator: failed to open %s",

-@@ -473,9 +503,7 @@ void recv_generator(char *fname, struct 
+@@ -471,9 +501,7 @@ static void recv_generator(char *fname, 

                /* now pretend the file didn't exist */
                if (preserve_hard_links && hard_link_check(file, HL_SKIP))
                        return;
                /* now pretend the file didn't exist */
                if (preserve_hard_links && hard_link_check(file, HL_SKIP))
                        return;


@@ -151,7 +151,7 @@
                return;
        }
  
                return;
        }
  

-@@ -503,8 +531,7 @@ void recv_generator(char *fname, struct 
+@@ -502,8 +530,7 @@ static void recv_generator(char *fname, 

        }
  
        if (disable_deltas_p()) {
        }
  
        if (disable_deltas_p()) {


@@ -161,7 +161,7 @@
                return;
        }
  
                return;
        }
  

-@@ -517,8 +544,7 @@ void recv_generator(char *fname, struct 
+@@ -516,8 +543,7 @@ static void recv_generator(char *fname, 

                /* pretend the file didn't exist */
                if (preserve_hard_links && hard_link_check(file, HL_SKIP))
                        return;
                /* pretend the file didn't exist */
                if (preserve_hard_links && hard_link_check(file, HL_SKIP))
                        return;


@@ -171,7 +171,7 @@
                return;
        }
  
                return;
        }
  

-@@ -536,7 +562,7 @@ void recv_generator(char *fname, struct 
+@@ -535,7 +561,7 @@ static void recv_generator(char *fname, 

                rprintf(FINFO, "generating and sending sums for %d\n", i);
  
        write_int(f_out,i);
                rprintf(FINFO, "generating and sending sums for %d\n", i);
  
        write_int(f_out,i);


@@ -180,9 +180,9 @@
  
        close(fd);
        if (mapbuf)
  
        close(fd);
        if (mapbuf)

---- main.c     18 Jun 2004 16:50:20 -0000      1.198
-+++ main.c     18 Jun 2004 17:16:36 -0000
-@@ -1029,6 +1029,10 @@ int main(int argc,char *argv[])
+--- main.c     28 Jun 2004 17:45:40 -0000      1.201
++++ main.c     30 Jun 2004 00:10:16 -0000
+@@ -1039,6 +1039,10 @@ int main(int argc,char *argv[])

  
        if (write_batch && !am_server) {
                write_batch_argvs_file(orig_argc, orig_argv);
  
        if (write_batch && !am_server) {
                write_batch_argvs_file(orig_argc, orig_argv);


@@ -193,8 +193,8 @@
        }
  
        if (am_daemon && !am_server)
        }
  
        if (am_daemon && !am_server)

---- options.c  7 Jun 2004 22:05:22 -0000       1.156
-+++ options.c  18 Jun 2004 17:16:36 -0000
+--- options.c  20 Jun 2004 19:47:05 -0000      1.157
++++ options.c  30 Jun 2004 00:10:17 -0000

 @@ -643,6 +643,15 @@ int parse_arguments(int *argc, const cha
                        "write-batch and read-batch can not be used together\n");
                exit_cleanup(RERR_SYNTAX);
 @@ -643,6 +643,15 @@ int parse_arguments(int *argc, const cha
                        "write-batch and read-batch can not be used together\n");
                exit_cleanup(RERR_SYNTAX);


@@ -226,7 +226,7 @@
                if (asprintf(&arg, "--timeout=%d", io_timeout) < 0)
                        goto oom;
 --- pipe.c     18 Jun 2004 16:00:33 -0000      1.8
                if (asprintf(&arg, "--timeout=%d", io_timeout) < 0)
                        goto oom;
 --- pipe.c     18 Jun 2004 16:00:33 -0000      1.8

-+++ pipe.c     18 Jun 2004 17:16:36 -0000
++++ pipe.c     30 Jun 2004 00:10:17 -0000

 @@ -26,6 +26,7 @@ extern int am_server;
  extern int blocking_io;
  extern int orig_umask;
 @@ -26,6 +26,7 @@ extern int am_server;
  extern int blocking_io;
  extern int orig_umask;


@@ -249,8 +249,8 @@
                if (!am_sender)
                        filesfrom_fd = -1;
  
                if (!am_sender)
                        filesfrom_fd = -1;
  

---- receiver.c 14 Jun 2004 15:09:36 -0000      1.82
-+++ receiver.c 18 Jun 2004 17:16:36 -0000
+--- receiver.c 29 Jun 2004 15:12:01 -0000      1.83
++++ receiver.c 30 Jun 2004 00:10:17 -0000

 @@ -46,6 +46,7 @@ extern int cleanup_got_literal;
  extern int module_id;
  extern int ignore_errors;
 @@ -46,6 +46,7 @@ extern int cleanup_got_literal;
  extern int module_id;
  extern int ignore_errors;


@@ -279,7 +279,7 @@
                        rprintf(FERROR,"Invalid file index %d in recv_files (count=%d)\n",
                                i, flist->count);
 --- token.c    18 Jun 2004 16:22:14 -0000      1.31
                        rprintf(FERROR,"Invalid file index %d in recv_files (count=%d)\n",
                                i, flist->count);
 --- token.c    18 Jun 2004 16:22:14 -0000      1.31

-+++ token.c    18 Jun 2004 17:16:36 -0000
++++ token.c    30 Jun 2004 00:10:17 -0000

 @@ -80,6 +80,8 @@ static int simple_recv_token(int f,char 
  
        if (residue == 0) {
 @@ -80,6 +80,8 @@ static int simple_recv_token(int f,char 
  
        if (residue == 0) {

diff --git a/max-size.diff b/max-size.diff
index cdf968a..5bbe414 100644 (file)
--- a/max-size.diff
+++ b/max-size.diff
@@ -1,5 +1,5 @@
---- generator.c        18 Jun 2004 16:30:24 -0000      1.88
-+++ generator.c        20 Jun 2004 21:15:50 -0000
+--- generator.c        29 Jun 2004 19:19:00 -0000      1.92
++++ generator.c        30 Jun 2004 00:10:59 -0000

 @@ -39,6 +39,7 @@ extern int opt_ignore_existing;
  extern int csum_length;
  extern int ignore_times;
 @@ -39,6 +39,7 @@ extern int opt_ignore_existing;
  extern int csum_length;
  extern int ignore_times;


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

-@@ -346,6 +347,10 @@ void recv_generator(char *fname, struct 
+@@ -344,6 +345,10 @@ static void recv_generator(char *fname, 

                    && verbose && f_out != -1)
                        rprintf(FINFO,"%s/\n",fname);
                return;
                    && verbose && f_out != -1)
                        rprintf(FINFO,"%s/\n",fname);
                return;


@@ -20,7 +20,7 @@
  
        if (preserve_links && S_ISLNK(file->mode)) {
 --- options.c  20 Jun 2004 19:47:05 -0000      1.157
  
        if (preserve_links && S_ISLNK(file->mode)) {
 --- options.c  20 Jun 2004 19:47:05 -0000      1.157

-+++ options.c  20 Jun 2004 21:15:50 -0000
++++ options.c  30 Jun 2004 00:10:59 -0000

 @@ -90,6 +90,7 @@ int delete_after = 0;
  int only_existing = 0;
  int opt_ignore_existing = 0;
 @@ -90,6 +90,7 @@ int delete_after = 0;
  int only_existing = 0;
  int opt_ignore_existing = 0;


@@ -108,7 +108,7 @@
                char *r_or_w = write_batch ? "write" : "read";
                if (asprintf(&arg, "--%s-batch=%s", r_or_w, batch_prefix) < 0)
 --- rsync.yo   5 Jun 2004 16:16:30 -0000       1.171
                char *r_or_w = write_batch ? "write" : "read";
                if (asprintf(&arg, "--%s-batch=%s", r_or_w, batch_prefix) < 0)
 --- rsync.yo   5 Jun 2004 16:16:30 -0000       1.171

-+++ rsync.yo   20 Jun 2004 21:15:51 -0000
++++ rsync.yo   30 Jun 2004 00:11:00 -0000

 @@ -315,6 +315,7 @@ verb(
       --delete-after          receiver deletes after transfer, not before
       --ignore-errors         delete even if there are I/O errors
 @@ -315,6 +315,7 @@ verb(
       --delete-after          receiver deletes after transfer, not before
       --ignore-errors         delete even if there are I/O errors

diff --git a/openssl-support.diff b/openssl-support.diff
index 9cb5e01..1960c1b 100644 (file)
--- a/openssl-support.diff
+++ b/openssl-support.diff
@@ -38,7 +38,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
 
 
 --- Makefile.in        15 May 2004 00:48:11 -0000      1.101
 
 
 --- Makefile.in        15 May 2004 00:48:11 -0000      1.101

-+++ Makefile.in        18 Jun 2004 17:28:26 -0000
++++ Makefile.in        30 Jun 2004 00:11:17 -0000

 @@ -39,7 +39,7 @@ OBJS3=progress.o pipe.o
  DAEMON_OBJ = params.o loadparm.o clientserver.o access.o connection.o authenticate.o
  popt_OBJS=popt/findme.o  popt/popt.o  popt/poptconfig.o \
 @@ -39,7 +39,7 @@ OBJS3=progress.o pipe.o
  DAEMON_OBJ = params.o loadparm.o clientserver.o access.o connection.o authenticate.o
  popt_OBJS=popt/findme.o  popt/popt.o  popt/poptconfig.o \


@@ -49,7 +49,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
  TLS_OBJ = tls.o syscall.o lib/permstring.o
  
 --- cleanup.c  13 May 2004 07:08:18 -0000      1.22
  TLS_OBJ = tls.o syscall.o lib/permstring.o
  
 --- cleanup.c  13 May 2004 07:08:18 -0000      1.22

-+++ cleanup.c  18 Jun 2004 17:28:26 -0000
++++ cleanup.c  30 Jun 2004 00:11:17 -0000

 @@ -24,6 +24,9 @@
  extern int io_error;
  extern int keep_partial;
 @@ -24,6 +24,9 @@
  extern int io_error;
  extern int keep_partial;


@@ -73,7 +73,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
                rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): entered\n",
                        code, file, line);
 --- clientserver.c     13 Jun 2004 14:18:48 -0000      1.127
                rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): entered\n",
                        code, file, line);
 --- clientserver.c     13 Jun 2004 14:18:48 -0000      1.127

-+++ clientserver.c     18 Jun 2004 17:28:26 -0000
++++ clientserver.c     30 Jun 2004 00:11:17 -0000

 @@ -46,6 +46,9 @@ extern int io_timeout;
  extern int orig_umask;
  extern int no_detach;
 @@ -46,6 +46,9 @@ extern int io_timeout;
  extern int orig_umask;
  extern int no_detach;


@@ -190,7 +190,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
                        /* it's some sort of command that I don't understand */
                        io_printf(f_out, "@ERROR: Unknown command '%s'\n", line);
 --- config.h.in        29 Apr 2004 19:40:39 -0000      1.90
                        /* it's some sort of command that I don't understand */
                        io_printf(f_out, "@ERROR: Unknown command '%s'\n", line);
 --- config.h.in        29 Apr 2004 19:40:39 -0000      1.90

-+++ config.h.in        18 Jun 2004 17:28:26 -0000
++++ config.h.in        30 Jun 2004 00:11:17 -0000

 @@ -167,6 +167,9 @@
  /* */
  #undef HAVE_OFF64_T
 @@ -167,6 +167,9 @@
  /* */
  #undef HAVE_OFF64_T


@@ -202,7 +202,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
  #undef HAVE_READLINK
  
 --- configure.in       30 Apr 2004 18:03:33 -0000      1.196
  #undef HAVE_READLINK
  
 --- configure.in       30 Apr 2004 18:03:33 -0000      1.196

-+++ configure.in       18 Jun 2004 17:28:26 -0000
++++ configure.in       30 Jun 2004 00:11:17 -0000

 @@ -271,6 +271,21 @@ yes
        AC_SEARCH_LIBS(getaddrinfo, inet6)
  fi
 @@ -271,6 +271,21 @@ yes
        AC_SEARCH_LIBS(getaddrinfo, inet6)
  fi


@@ -225,8 +225,8 @@ 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)

---- main.c     18 Jun 2004 16:50:20 -0000      1.198
-+++ main.c     18 Jun 2004 17:28:26 -0000
+--- main.c     28 Jun 2004 17:45:40 -0000      1.201
++++ main.c     30 Jun 2004 00:11:17 -0000

 @@ -52,6 +52,9 @@ extern int rsync_port;
  extern int read_batch;
  extern int write_batch;
 @@ -52,6 +52,9 @@ extern int rsync_port;
  extern int read_batch;
  extern int write_batch;


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

-@@ -709,17 +712,32 @@ static int start_client(int argc, char *
+@@ -719,17 +722,32 @@ static int start_client(int argc, char *

        pid_t pid;
        int f_in,f_out;
        int rc;
        pid_t pid;
        int f_in,f_out;
        int rc;


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

-@@ -767,12 +785,27 @@ static int start_client(int argc, char *
+@@ -777,12 +795,27 @@ static int start_client(int argc, char *

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


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

---- options.c  7 Jun 2004 22:05:22 -0000       1.156
-+++ options.c  18 Jun 2004 17:28:27 -0000
+--- options.c  20 Jun 2004 19:47:05 -0000      1.157
++++ options.c  30 Jun 2004 00:11:18 -0000

 @@ -133,6 +133,14 @@ int quiet = 0;
  int always_checksum = 0;
  int list_only = 0;
 @@ -133,6 +133,14 @@ int quiet = 0;
  int always_checksum = 0;
  int list_only = 0;


@@ -427,7 +427,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
                bwlimit_writemax = (size_t)bwlimit * 128;
                if (bwlimit_writemax < 512)
 --- rsync.h    16 May 2004 07:28:24 -0000      1.204
                bwlimit_writemax = (size_t)bwlimit * 128;
                if (bwlimit_writemax < 512)
 --- rsync.h    16 May 2004 07:28:24 -0000      1.204

-+++ rsync.h    18 Jun 2004 17:28:27 -0000
++++ rsync.h    30 Jun 2004 00:11:18 -0000

 @@ -32,6 +32,7 @@
  
  #define DEFAULT_LOCK_FILE "/var/run/rsyncd.lock"
 @@ -32,6 +32,7 @@
  
  #define DEFAULT_LOCK_FILE "/var/run/rsyncd.lock"


@@ -449,7 +449,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
   * ino_t and dev_t internally, even if this platform does not
   * allow files to have 64-bit inums.  That's because the
 --- /dev/null  1 Jan 1970 00:00:00 -0000
   * ino_t and dev_t internally, even if this platform does not
   * allow files to have 64-bit inums.  That's because the
 --- /dev/null  1 Jan 1970 00:00:00 -0000

-+++ ssl.c      18 Jun 2004 17:28:27 -0000
++++ ssl.c      30 Jun 2004 00:11:18 -0000

 @@ -0,0 +1,366 @@
 +/* -*- c-file-style: "linux" -*-
 + * ssl.c: operations for negotiating SSL rsync connections. 
 @@ -0,0 +1,366 @@
 +/* -*- c-file-style: "linux" -*-
 + * ssl.c: operations for negotiating SSL rsync connections. 

diff --git a/remove-sent-files.diff b/remove-sent-files.diff
index 4b21eff..399c1a4 100644 (file)
--- a/remove-sent-files.diff
+++ b/remove-sent-files.diff
@@ -4,8 +4,8 @@ command before "make":
     make proto
 
 
     make proto
 
 

---- io.c       9 Jun 2004 03:07:50 -0000       1.129
-+++ io.c       18 Jun 2004 17:24:12 -0000
+--- io.c       23 Jun 2004 01:13:09 -0000      1.131
++++ io.c       30 Jun 2004 00:07:33 -0000

 @@ -225,6 +225,14 @@ static void read_msg_fd(void)
                read_loop(fd, buf, 4);
                redo_list_add(IVAL(buf,0));
 @@ -225,6 +225,14 @@ static void read_msg_fd(void)
                read_loop(fd, buf, 4);
                redo_list_add(IVAL(buf,0));


@@ -21,7 +21,7 @@ command before "make":
        case MSG_INFO:
        case MSG_ERROR:
        case MSG_LOG:
        case MSG_INFO:
        case MSG_ERROR:
        case MSG_LOG:

-@@ -636,6 +644,16 @@ static int readfd_unbuffered(int fd, cha
+@@ -634,6 +642,16 @@ static int readfd_unbuffered(int fd, cha

                        read_loop(fd, buffer, remaining);
                        bufferIdx = 0;
                        break;
                        read_loop(fd, buffer, remaining);
                        bufferIdx = 0;
                        break;


@@ -38,8 +38,8 @@ command before "make":
                case MSG_INFO:
                case MSG_ERROR:
                        if (remaining >= sizeof line) {
                case MSG_INFO:
                case MSG_ERROR:
                        if (remaining >= sizeof line) {

---- main.c     18 Jun 2004 16:50:20 -0000      1.198
-+++ main.c     18 Jun 2004 17:24:12 -0000
+--- main.c     28 Jun 2004 17:45:40 -0000      1.201
++++ main.c     30 Jun 2004 00:07:33 -0000

 @@ -42,6 +42,7 @@ extern int list_only;
  extern int local_server;
  extern int log_got_error;
 @@ -42,6 +42,7 @@ extern int list_only;
  extern int local_server;
  extern int log_got_error;


@@ -48,7 +48,7 @@ command before "make":
  extern int orig_umask;
  extern int keep_dirlinks;
  extern int preserve_hard_links;
  extern int orig_umask;
  extern int keep_dirlinks;
  extern int preserve_hard_links;

-@@ -575,6 +576,8 @@ void start_server(int f_in, int f_out, i
+@@ -585,6 +586,8 @@ void start_server(int f_in, int f_out, i

  
        if (am_sender) {
                keep_dirlinks = 0; /* Must be disabled on the sender. */
  
        if (am_sender) {
                keep_dirlinks = 0; /* Must be disabled on the sender. */


@@ -57,7 +57,7 @@ command before "make":
                if (!read_batch) {
                        recv_exclude_list(f_in);
                        if (cvs_exclude)
                if (!read_batch) {
                        recv_exclude_list(f_in);
                        if (cvs_exclude)

-@@ -642,6 +645,9 @@ int client_run(int f_in, int f_out, pid_
+@@ -652,6 +655,9 @@ int client_run(int f_in, int f_out, pid_

                exit_cleanup(status);
        }
  
                exit_cleanup(status);
        }
  


@@ -67,8 +67,8 @@ command before "make":
        if (argc == 0)
                list_only = 1;
  
        if (argc == 0)
                list_only = 1;
  

---- options.c  7 Jun 2004 22:05:22 -0000       1.156
-+++ options.c  18 Jun 2004 17:24:12 -0000
+--- options.c  20 Jun 2004 19:47:05 -0000      1.157
++++ options.c  30 Jun 2004 00:07:33 -0000

 @@ -87,6 +87,7 @@ int size_only = 0;
  int bwlimit = 0;
  size_t bwlimit_writemax = 0;
 @@ -87,6 +87,7 @@ int size_only = 0;
  int bwlimit = 0;
  size_t bwlimit_writemax = 0;


@@ -134,8 +134,8 @@ command before "make":
        *argc = ac;
        return;
  
        *argc = ac;
        return;
  

---- receiver.c 14 Jun 2004 15:09:36 -0000      1.82
-+++ receiver.c 18 Jun 2004 17:24:13 -0000
+--- receiver.c 29 Jun 2004 15:12:01 -0000      1.83
++++ receiver.c 30 Jun 2004 00:07:33 -0000

 @@ -48,6 +48,7 @@ extern int ignore_errors;
  extern int orig_umask;
  extern int keep_partial;
 @@ -48,6 +48,7 @@ extern int ignore_errors;
  extern int orig_umask;
  extern int keep_partial;


@@ -153,7 +153,7 @@ command before "make":
        char fnamecmpbuf[MAXPATHLEN];
        struct map_struct *mapbuf;
        struct file_struct *file;
        char fnamecmpbuf[MAXPATHLEN];
        struct map_struct *mapbuf;
        struct file_struct *file;

-@@ -482,16 +483,20 @@ int recv_files(int f_in,struct file_list
+@@ -484,16 +485,20 @@ int recv_files(int f_in,struct file_list

  
                cleanup_disable();
  
  
                cleanup_disable();
  


@@ -179,7 +179,7 @@ command before "make":
                }
        }
 --- rsync.h    16 May 2004 07:28:24 -0000      1.204
                }
        }
 --- rsync.h    16 May 2004 07:28:24 -0000      1.204

-+++ rsync.h    18 Jun 2004 17:24:13 -0000
++++ rsync.h    30 Jun 2004 00:07:34 -0000

 @@ -60,6 +60,7 @@
  #define FLAG_TOP_DIR (1<<0)
  #define FLAG_HLINK_EOL (1<<1) /* generator only */
 @@ -60,6 +60,7 @@
  #define FLAG_TOP_DIR (1<<0)
  #define FLAG_HLINK_EOL (1<<1) /* generator only */


@@ -197,7 +197,7 @@ command before "make":
        MSG_REDO=4,     /* reprocess indicated flist index */
        MSG_ERROR=FERROR, MSG_INFO=FINFO, MSG_LOG=FLOG, /* remote logging */
 --- rsync.yo   5 Jun 2004 16:16:30 -0000       1.171
        MSG_REDO=4,     /* reprocess indicated flist index */
        MSG_ERROR=FERROR, MSG_INFO=FINFO, MSG_LOG=FLOG, /* remote logging */
 --- rsync.yo   5 Jun 2004 16:16:30 -0000       1.171

-+++ rsync.yo   18 Jun 2004 17:24:14 -0000
++++ rsync.yo   30 Jun 2004 00:07:34 -0000

 @@ -313,6 +313,7 @@ verb(
       --delete                delete files that don't exist on sender
       --delete-excluded       also delete excluded files on receiver
 @@ -313,6 +313,7 @@ verb(
       --delete                delete files that don't exist on sender
       --delete-excluded       also delete excluded files on receiver


@@ -219,7 +219,7 @@ command before "make":
  even when there are I/O errors.
  
 --- sender.c   18 Jun 2004 16:55:12 -0000      1.41
  even when there are I/O errors.
  
 --- sender.c   18 Jun 2004 16:55:12 -0000      1.41

-+++ sender.c   18 Jun 2004 17:24:14 -0000
++++ sender.c   30 Jun 2004 00:07:34 -0000

 @@ -27,6 +27,7 @@ extern int dry_run;
  extern int am_server;
  extern int am_daemon;
 @@ -27,6 +27,7 @@ extern int dry_run;
  extern int am_server;
  extern int am_daemon;