Adding filter-attribute-mods patch; updating patches.

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

diff --git a/preallocate.diff b/preallocate.diff
index 5f0980b..2ffb7f1 100644 (file)
--- a/preallocate.diff
+++ b/preallocate.diff
@@ -9,8 +9,8 @@ To use this patch, run these commands for a successful build:
     ./configure
     make
 
     ./configure
     make
 

+based-on: 181c9faf928faad08ef095f4667afe460ec3bef6

 diff --git a/compat.c b/compat.c
 diff --git a/compat.c b/compat.c

-index 6e00072..c9590cc 100644

 --- a/compat.c
 +++ b/compat.c
 @@ -32,6 +32,7 @@ extern int inplace;
 --- a/compat.c
 +++ b/compat.c
 @@ -32,6 +32,7 @@ extern int inplace;


@@ -38,7 +38,6 @@ index 6e00072..c9590cc 100644
                if (append_mode == 1)
                        append_mode = 2;
 diff --git a/configure.in b/configure.in
                if (append_mode == 1)
                        append_mode = 2;
 diff --git a/configure.in b/configure.in

-index bc7d4a7..61f9b05 100644

 --- a/configure.in
 +++ b/configure.in
 @@ -553,13 +553,40 @@ AC_CHECK_FUNCS(waitpid wait4 getcwd strdup chown chmod lchmod mknod mkfifo \
 --- a/configure.in
 +++ b/configure.in
 @@ -553,13 +553,40 @@ AC_CHECK_FUNCS(waitpid wait4 getcwd strdup chown chmod lchmod mknod mkfifo \


@@ -84,7 +83,6 @@ index bc7d4a7..61f9b05 100644
  if test $ac_cv_func_getpgrp = yes; then
      AC_FUNC_GETPGRP
 diff --git a/options.c b/options.c
  if test $ac_cv_func_getpgrp = yes; then
      AC_FUNC_GETPGRP
 diff --git a/options.c b/options.c

-index e7c6c61..6f848f1 100644

 --- a/options.c
 +++ b/options.c
 @@ -73,6 +73,7 @@ int remove_source_files = 0;
 --- a/options.c
 +++ b/options.c
 @@ -73,6 +73,7 @@ int remove_source_files = 0;


@@ -142,7 +140,7 @@ index e7c6c61..6f848f1 100644
    {"inplace",          0,  POPT_ARG_VAL,    &inplace, 1, 0, 0 },
    {"no-inplace",       0,  POPT_ARG_VAL,    &inplace, 0, 0, 0 },
    {"append",           0,  POPT_ARG_NONE,   0, OPT_APPEND, 0, 0 },
    {"inplace",          0,  POPT_ARG_VAL,    &inplace, 1, 0, 0 },
    {"no-inplace",       0,  POPT_ARG_VAL,    &inplace, 0, 0, 0 },
    {"append",           0,  POPT_ARG_NONE,   0, OPT_APPEND, 0, 0 },

-@@ -2609,6 +2618,9 @@ void server_options(char **args, int *argc_p)
+@@ -2626,6 +2635,9 @@ void server_options(char **args, int *argc_p)

        else if (remove_source_files)
                args[ac++] = "--remove-sent-files";
  
        else if (remove_source_files)
                args[ac++] = "--remove-sent-files";
  


@@ -153,7 +151,6 @@ index e7c6c61..6f848f1 100644
                rprintf(FERROR, "argc overflow in server_options().\n");
                exit_cleanup(RERR_MALLOC);
 diff --git a/receiver.c b/receiver.c
                rprintf(FERROR, "argc overflow in server_options().\n");
                exit_cleanup(RERR_MALLOC);
 diff --git a/receiver.c b/receiver.c

-index 4325e30..739a0ba 100644

 --- a/receiver.c
 +++ b/receiver.c
 @@ -44,6 +44,7 @@ extern int cleanup_got_literal;
 --- a/receiver.c
 +++ b/receiver.c
 @@ -44,6 +44,7 @@ extern int cleanup_got_literal;


@@ -201,10 +198,9 @@ index 4325e30..739a0ba 100644
                        full_fname(fname));
        }
 diff --git a/rsync.h b/rsync.h
                        full_fname(fname));
        }
 diff --git a/rsync.h b/rsync.h

-index be7cf8a..0ad3075 100644

 --- a/rsync.h
 +++ b/rsync.h
 --- a/rsync.h
 +++ b/rsync.h

-@@ -634,6 +634,13 @@ struct ht_int64_node {
+@@ -638,6 +638,13 @@ struct ht_int64_node {

  #define ACLS_NEED_MASK 1
  #endif
  
  #define ACLS_NEED_MASK 1
  #endif
  


@@ -219,7 +215,6 @@ index be7cf8a..0ad3075 100644
        int32 num;
        uint32 unum;
 diff --git a/rsync.yo b/rsync.yo
        int32 num;
        uint32 unum;
 diff --git a/rsync.yo b/rsync.yo

-index 941f7a5..36a2077 100644

 --- a/rsync.yo
 +++ b/rsync.yo
 @@ -359,6 +359,7 @@ to the detailed description below for a complete description.  verb(
 --- a/rsync.yo
 +++ b/rsync.yo
 @@ -359,6 +359,7 @@ to the detailed description below for a complete description.  verb(


@@ -230,7 +225,7 @@ index 941f7a5..36a2077 100644
   -n, --dry-run               perform a trial run with no changes made
   -W, --whole-file            copy files whole (w/o delta-xfer algorithm)
   -x, --one-file-system       don't cross filesystem boundaries
   -n, --dry-run               perform a trial run with no changes made
   -W, --whole-file            copy files whole (w/o delta-xfer algorithm)
   -x, --one-file-system       don't cross filesystem boundaries

-@@ -1120,6 +1121,18 @@ NOTE: Don't use this option when the destination is a Solaris "tmpfs"
+@@ -1127,6 +1128,18 @@ NOTE: Don't use this option when the destination is a Solaris "tmpfs"

  filesystem. It doesn't seem to handle seeks over null regions
  correctly and ends up corrupting the files.
  
  filesystem. It doesn't seem to handle seeks over null regions
  correctly and ends up corrupting the files.
  


@@ -250,7 +245,6 @@ index 941f7a5..36a2077 100644
  make any changes (and produces mostly the same output as a real run).  It
  is most commonly used in combination with the bf(-v, --verbose) and/or
 diff --git a/syscall.c b/syscall.c
  make any changes (and produces mostly the same output as a real run).  It
  is most commonly used in combination with the bf(-v, --verbose) and/or
 diff --git a/syscall.c b/syscall.c

-index cfabc3e..81fb957 100644

 --- a/syscall.c
 +++ b/syscall.c
 @@ -29,6 +29,10 @@
 --- a/syscall.c
 +++ b/syscall.c
 @@ -29,6 +29,10 @@


@@ -287,7 +281,6 @@ index cfabc3e..81fb957 100644
 +}
 +#endif
 diff --git a/t_stub.c b/t_stub.c
 +}
 +#endif
 diff --git a/t_stub.c b/t_stub.c

-index 02cfa69..52a7f02 100644

 --- a/t_stub.c
 +++ b/t_stub.c
 @@ -22,6 +22,7 @@
 --- a/t_stub.c
 +++ b/t_stub.c
 @@ -22,6 +22,7 @@


@@ -299,7 +292,6 @@ index 02cfa69..52a7f02 100644
  int relative_paths = 0;
  int module_dirlen = 0;
 diff --git a/util.c b/util.c
  int relative_paths = 0;
  int module_dirlen = 0;
 diff --git a/util.c b/util.c

-index 0cafed6..20dd0d3 100644

 --- a/util.c
 +++ b/util.c
 @@ -26,6 +26,7 @@
 --- a/util.c
 +++ b/util.c
 @@ -26,6 +26,7 @@


@@ -310,7 +302,7 @@ index 0cafed6..20dd0d3 100644
  extern int module_id;
  extern int modify_window;
  extern int relative_paths;
  extern int module_id;
  extern int modify_window;
  extern int relative_paths;

-@@ -276,6 +277,10 @@ int copy_file(const char *source, const char *dest, int ofd,
+@@ -324,6 +325,10 @@ int copy_file(const char *source, const char *dest, int ofd, mode_t mode)

        int ifd;
        char buf[1024 * 8];
        int len;   /* Number of bytes read into `buf'. */
        int ifd;
        char buf[1024 * 8];
        int len;   /* Number of bytes read into `buf'. */


@@ -321,7 +313,7 @@ index 0cafed6..20dd0d3 100644
  
        if ((ifd = do_open(source, O_RDONLY, 0)) < 0) {
                int save_errno = errno;
  
        if ((ifd = do_open(source, O_RDONLY, 0)) < 0) {
                int save_errno = errno;

-@@ -309,7 +314,27 @@ int copy_file(const char *source, const char *dest, int ofd,
+@@ -349,7 +354,27 @@ int copy_file(const char *source, const char *dest, int ofd, mode_t mode)

                }
        }
  
                }
        }
  


@@ -349,7 +341,7 @@ index 0cafed6..20dd0d3 100644
                if (full_write(ofd, buf, len) < 0) {
                        int save_errno = errno;
                        rsyserr(FERROR_XFER, errno, "write %s", full_fname(dest));
                if (full_write(ofd, buf, len) < 0) {
                        int save_errno = errno;
                        rsyserr(FERROR_XFER, errno, "write %s", full_fname(dest));

-@@ -334,6 +359,16 @@ int copy_file(const char *source, const char *dest, int ofd,
+@@ -374,6 +399,16 @@ int copy_file(const char *source, const char *dest, int ofd, mode_t mode)

                        full_fname(source));
        }
  
                        full_fname(source));
        }