Updated to apply to latest source.

[rsync/rsync-patches.git] / inplace.diff

diff --git a/inplace.diff b/inplace.diff
index dd95430..8c337f8 100644 (file)
--- a/inplace.diff
+++ b/inplace.diff
@@ -23,7 +23,7 @@ Optional:
      memmove lchown vsnprintf snprintf asprintf setsid glob strpbrk \
      strlcat strlcpy strtol mallinfo getgroups setgroups geteuid getegid)
  
---- orig/match.c       2004-07-07 08:38:52
+--- orig/match.c       2004-07-15 02:21:10
 +++ match.c    2004-07-04 08:03:36
 @@ -23,6 +23,7 @@ extern int verbose;
  extern int am_server;
@@ -88,7 +88,7 @@ Optional:
                        want_i = i + 1;
  
                        matched(f,s,buf,offset,i);
---- orig/options.c     2004-06-20 19:30:00
+--- orig/options.c     2004-07-15 16:51:50
 +++ options.c  2004-07-03 20:19:54
 @@ -94,6 +94,7 @@ int ignore_errors = 0;
  int modify_window = 0;
@@ -98,7 +98,7 @@ Optional:
  unsigned int block_size = 0;
  
  
-@@ -149,6 +150,7 @@ char *bind_address;
+@@ -148,6 +149,7 @@ char *bind_address;
  static void print_rsync_version(enum logcode f)
  {
        char const *got_socketpair = "no ";
@@ -106,7 +106,7 @@ Optional:
        char const *hardlinks = "no ";
        char const *links = "no ";
        char const *ipv6 = "no ";
-@@ -158,6 +160,10 @@ static void print_rsync_version(enum log
+@@ -157,6 +159,10 @@ static void print_rsync_version(enum log
        got_socketpair = "";
  #endif
  
@@ -117,7 +117,7 @@ Optional:
  #if SUPPORT_HARD_LINKS
        hardlinks = "";
  #endif
-@@ -183,8 +189,8 @@ static void print_rsync_version(enum log
+@@ -182,8 +188,8 @@ 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. */
@@ -128,7 +128,7 @@ Optional:
                (int) (sizeof dumstat->st_ino * 8),
                (int) (sizeof (uint64) * 8));
  #ifdef MAINTAINER_MODE
-@@ -234,6 +240,7 @@ void usage(enum logcode F)
+@@ -233,6 +239,7 @@ void usage(enum logcode F)
    rprintf(F,"     --backup-dir            make backups into this directory\n");
    rprintf(F,"     --suffix=SUFFIX         backup suffix (default %s w/o --backup-dir)\n",BACKUP_SUFFIX);
    rprintf(F," -u, --update                update only (don't overwrite newer files)\n");
@@ -136,7 +136,7 @@ Optional:
    rprintf(F," -K, --keep-dirlinks         treat symlinked dir on receiver as dir\n");
    rprintf(F," -l, --links                 copy symlinks as symlinks\n");
    rprintf(F," -L, --copy-links            copy the referent of all symlinks\n");
-@@ -341,6 +348,7 @@ static struct poptOption long_options[] 
+@@ -340,6 +347,7 @@ static struct poptOption long_options[] 
    {"sparse",          'S', POPT_ARG_NONE,   &sparse_files, 0, 0, 0 },
    {"cvs-exclude",     'C', POPT_ARG_NONE,   &cvs_exclude, 0, 0, 0 },
    {"update",          'u', POPT_ARG_NONE,   &update_only, 0, 0, 0 },
@@ -144,7 +144,7 @@ Optional:
    {"keep-dirlinks",   'K', POPT_ARG_NONE,   &keep_dirlinks, 0, 0, 0 },
    {"links",           'l', POPT_ARG_NONE,   &preserve_links, 0, 0, 0 },
    {"copy-links",      'L', POPT_ARG_NONE,   &copy_links, 0, 0, 0 },
-@@ -739,6 +747,18 @@ int parse_arguments(int *argc, const cha
+@@ -738,6 +746,18 @@ int parse_arguments(int *argc, const cha
                        bwlimit_writemax = 512;
        }
  
@@ -163,7 +163,7 @@ Optional:
        if (files_from) {
                char *colon;
                if (*argc != 2 && !(am_server && am_sender && *argc == 1)) {
-@@ -963,6 +983,9 @@ void server_options(char **args,int *arg
+@@ -955,6 +975,9 @@ void server_options(char **args,int *arg
        if (opt_ignore_existing && am_sender)
                args[ac++] = "--ignore-existing";
  
@@ -173,7 +173,7 @@ Optional:
        if (tmpdir) {
                args[ac++] = "--temp-dir";
                args[ac++] = tmpdir;
---- orig/receiver.c    2004-07-02 18:23:01
+--- orig/receiver.c    2004-07-14 17:12:06
 +++ receiver.c 2004-07-03 20:19:54
 @@ -48,6 +48,7 @@ extern int ignore_errors;
  extern int orig_umask;
@@ -218,7 +218,7 @@ Optional:
        if (do_progress)
                end_progress(total_size);
  
-@@ -414,44 +429,59 @@ int recv_files(int f_in,struct file_list
+@@ -414,44 +429,59 @@ int recv_files(int f_in, struct file_lis
                } else
                        mapbuf = NULL;
  
@@ -336,7 +336,7 @@ Optional:
        /* move tmp file over real file */
        if (verbose > 2)
                rprintf(FINFO, "renaming %s to %s\n", fnametmp, fname);
---- orig/rsync.yo      2004-06-17 06:32:00
+--- orig/rsync.yo      2004-07-15 02:21:11
 +++ rsync.yo   2004-07-03 20:19:55
 @@ -289,6 +289,7 @@ verb(
       --backup-dir            make backups into this directory