Fixed failing hunks.

[rsync/rsync-patches.git] / chmod-option.diff

diff --git a/chmod-option.diff b/chmod-option.diff
index a9bc07e..0886dbc 100644 (file)
--- a/chmod-option.diff
+++ b/chmod-option.diff
@@ -1,5 +1,11 @@
---- Makefile.in        10 Feb 2004 17:06:11 -0000      1.98
-+++ Makefile.in        20 Mar 2004 17:56:44 -0000
+After applying this patch and running configure, you MUST run this
+command before "make":
+
+    make proto
+
+
+--- Makefile.in        2 May 2004 17:04:14 -0000       1.100
++++ Makefile.in        13 May 2004 18:36:43 -0000
 @@ -34,7 +34,7 @@ ZLIBOBJ=zlib/deflate.o zlib/infblock.o z
  OBJS1=rsync.o generator.o receiver.o cleanup.o sender.o exclude.o util.o \
        main.o checksum.o match.o syscall.o log.o backup.o
@@ -9,8 +15,8 @@
  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 \
---- chmod.c    2004-02-13 17:08:33.000000000 -0800
-+++ chmod.c    2004-03-20 10:04:19.000000000 -0800
+--- /dev/null  1 Jan 1970 00:00:00 -0000
++++ chmod.c    13 May 2004 18:36:43 -0000
 @@ -0,0 +1,184 @@
 +#include "rsync.h"
 +
@@ -196,8 +202,8 @@
 +      }
 +      return 0;
 +}
---- flist.c    14 Apr 2004 23:33:34 -0000      1.213
-+++ flist.c    15 Apr 2004 19:00:26 -0000
+--- flist.c    11 May 2004 17:25:16 -0000      1.221
++++ flist.c    13 May 2004 18:36:43 -0000
 @@ -33,6 +33,7 @@ extern int verbose;
  extern int do_progress;
  extern int am_root;
@@ -206,7 +212,7 @@
  extern int am_daemon;
  extern int always_checksum;
  extern int module_id;
-@@ -64,6 +65,8 @@ extern int sanitize_paths;
+@@ -63,6 +64,8 @@ extern int sanitize_paths;
  extern int read_batch;
  extern int write_batch;
  
@@ -227,8 +233,8 @@
        file->uid = st.st_uid;
        file->gid = st.st_gid;
  
---- options.c  14 Apr 2004 23:33:34 -0000      1.146
-+++ options.c  15 Apr 2004 19:00:26 -0000
+--- options.c  6 May 2004 21:08:01 -0000       1.148
++++ options.c  13 May 2004 18:36:43 -0000
 @@ -121,6 +121,7 @@ char *log_format = NULL;
  char *password_file = NULL;
  char *rsync_path = RSYNC_PATH;
@@ -288,20 +294,8 @@
        }
  
        if (files_from && (!am_sender || remote_filesfrom_file)) {
---- proto.h    14 Apr 2004 23:33:30 -0000      1.188
-+++ proto.h    15 Apr 2004 19:00:26 -0000
-@@ -25,6 +25,9 @@ void file_checksum(char *fname,char *sum
- void sum_init(void);
- void sum_update(char *p, int len);
- void sum_end(char *sum);
-+struct chmod_mode_struct *parse_chmod(char *modestr);
-+int tweak_mode(int mode, struct chmod_mode_struct *chmod_modes);
-+int free_chmod_mode(struct chmod_mode_struct *chmod_modes);
- void close_all(void);
- void _exit_cleanup(int code, const char *file, int line);
- void cleanup_disable(void);
---- rsync.yo   15 Apr 2004 18:32:24 -0000      1.157
-+++ rsync.yo   15 Apr 2004 19:00:27 -0000
+--- rsync.yo   7 May 2004 00:18:37 -0000       1.169
++++ rsync.yo   13 May 2004 18:36:44 -0000
 @@ -299,6 +299,7 @@ verb(
   -g, --group                 preserve group
   -D, --devices               preserve devices (root only)
@@ -310,7 +304,7 @@
   -S, --sparse                handle sparse files efficiently
   -n, --dry-run               show what would have been transferred
   -W, --whole-file            copy whole files, no incremental checks
-@@ -536,6 +537,14 @@ modified cannot be effective; in other w
+@@ -545,6 +546,14 @@ modified cannot be effective; in other w
  cause the next transfer to behave as if it used -I, and all files will have
  their checksums compared and show up in log messages even if they haven't
  changed.
@@ -325,8 +319,8 @@
  
  dit(bf(-n, --dry-run)) This tells rsync to not do any file transfers,
  instead it will just report the actions it would have taken.
---- testsuite/chmod.test       2004-02-13 17:08:33.000000000 -0800
-+++ testsuite/chmod.test       Sat Mar 20 10:30:48 2004
+--- /dev/null  1 Jan 1970 00:00:00 -0000
++++ testsuite/chmod.test       13 May 2004 18:36:44 -0000
 @@ -0,0 +1,43 @@
 +#! /bin/sh
 +