Updated to apply to latest source.

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

diff --git a/chmod-option.diff b/chmod-option.diff
index 3fb8615ae219cd3655d0313e2cc01ddb22e02484..df5cdff05dc3f6839cf22d9820ccbc4bdfefbfe8 100644 (file)
--- a/chmod-option.diff
+++ b/chmod-option.diff
@@ -4,8 +4,8 @@ command before "make":
     make proto
 
 
---- Makefile.in        15 May 2004 00:48:11 -0000      1.101
-+++ Makefile.in        18 Jun 2004 17:22:08 -0000
+--- orig/Makefile.in   2004-07-04 08:59:17
++++ Makefile.in        2004-07-03 20:13:41
 @@ -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
@@ -15,8 +15,8 @@ command before "make":
  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 \
---- /dev/null  1 Jan 1970 00:00:00 -0000
-+++ chmod.c    18 Jun 2004 17:22:08 -0000
+--- orig/chmod.c       2004-06-18 17:22:08
++++ chmod.c    2004-06-18 17:22:08
 @@ -0,0 +1,184 @@
 +#include "rsync.h"
 +
@@ -202,8 +202,8 @@ command before "make":
 +      }
 +      return 0;
 +}
---- flist.c    18 Jun 2004 16:29:21 -0000      1.231
-+++ flist.c    18 Jun 2004 17:22:08 -0000
+--- orig/flist.c       2004-07-15 02:21:10
++++ flist.c    2004-07-03 20:13:41
 @@ -33,6 +33,7 @@ extern int verbose;
  extern int do_progress;
  extern int am_root;
@@ -212,16 +212,16 @@ command before "make":
  extern int am_daemon;
  extern int always_checksum;
  extern int module_id;
-@@ -67,6 +68,8 @@ extern int list_only;
- extern int read_batch;
- extern int write_batch;
+@@ -64,6 +65,8 @@ extern int delete_excluded;
+ extern int orig_umask;
+ extern int list_only;
  
 +extern struct chmod_mode_struct *chmod_modes;
 +
  extern struct exclude_list_struct exclude_list;
  extern struct exclude_list_struct server_exclude_list;
  extern struct exclude_list_struct local_exclude_list;
-@@ -868,7 +871,10 @@ skip_excludes:
+@@ -865,7 +868,10 @@ skip_excludes:
        file->flags = flags;
        file->modtime = st.st_mtime;
        file->length = st.st_size;
@@ -233,8 +233,8 @@ command before "make":
        file->uid = st.st_uid;
        file->gid = st.st_gid;
  
---- options.c  7 Jun 2004 22:05:22 -0000       1.156
-+++ options.c  18 Jun 2004 17:22:08 -0000
+--- orig/options.c     2004-07-15 16:51:50
++++ options.c  2004-07-03 20:13:41
 @@ -124,6 +124,7 @@ char *log_format = NULL;
  char *password_file = NULL;
  char *rsync_path = RSYNC_PATH;
@@ -243,16 +243,16 @@ command before "make":
  char backup_dir_buf[MAXPATHLEN];
  int rsync_port = RSYNC_PORT;
  int link_dest = 0;
-@@ -137,6 +138,8 @@ int list_only = 0;
- #define MAX_BATCH_PREFIX_LEN 256      /* Must be less than MAXPATHLEN-13 */
- char *batch_prefix = NULL;
+@@ -136,6 +137,8 @@ int list_only = 0;
+ #define MAX_BATCH_NAME_LEN 256        /* Must be less than MAXPATHLEN-13 */
+ char *batch_name = NULL;
  
 +struct chmod_mode_struct *chmod_modes = NULL;
 +
  static int daemon_opt;   /* sets am_daemon after option error-reporting */
  static int modify_window_set;
  
-@@ -245,6 +248,7 @@ void usage(enum logcode F)
+@@ -244,6 +247,7 @@ void usage(enum logcode F)
    rprintf(F," -g, --group                 preserve group\n");
    rprintf(F," -D, --devices               preserve devices (root only)\n");
    rprintf(F," -t, --times                 preserve times\n");
@@ -260,7 +260,7 @@ command before "make":
    rprintf(F," -S, --sparse                handle sparse files efficiently\n");
    rprintf(F," -n, --dry-run               show what would have been transferred\n");
    rprintf(F," -W, --whole-file            copy whole files, no incremental checks\n");
-@@ -350,6 +354,7 @@ static struct poptOption long_options[] 
+@@ -349,6 +353,7 @@ static struct poptOption long_options[] 
    {"perms",           'p', POPT_ARG_NONE,   &preserve_perms, 0, 0, 0 },
    {"owner",           'o', POPT_ARG_NONE,   &preserve_uid, 0, 0, 0 },
    {"group",           'g', POPT_ARG_NONE,   &preserve_gid, 0, 0, 0 },
@@ -268,7 +268,7 @@ command before "make":
    {"devices",         'D', POPT_ARG_NONE,   &preserve_devices, 0, 0, 0 },
    {"times",           't', POPT_ARG_NONE,   &preserve_times, 0, 0, 0 },
    {"checksum",        'c', POPT_ARG_NONE,   &always_checksum, 0, 0, 0 },
-@@ -730,6 +735,13 @@ int parse_arguments(int *argc, const cha
+@@ -729,6 +734,13 @@ int parse_arguments(int *argc, const cha
                exit_cleanup(RERR_SYNTAX);
        }
  
@@ -282,7 +282,7 @@ command before "make":
        if (do_progress && !verbose)
                verbose = 1;
  
-@@ -977,6 +989,11 @@ void server_options(char **args,int *arg
+@@ -969,6 +981,11 @@ void server_options(char **args,int *arg
                args[ac++] = compare_dest;
        }
  
@@ -294,8 +294,8 @@ command before "make":
        if (files_from && (!am_sender || remote_filesfrom_file)) {
                if (remote_filesfrom_file) {
                        args[ac++] = "--files-from";
---- rsync.yo   5 Jun 2004 16:16:30 -0000       1.171
-+++ rsync.yo   18 Jun 2004 17:22:09 -0000
+--- orig/rsync.yo      2004-07-15 02:21:11
++++ rsync.yo   2004-07-03 20:13:41
 @@ -300,6 +300,7 @@ verb(
   -g, --group                 preserve group
   -D, --devices               preserve devices (root only)
@@ -319,8 +319,8 @@ command before "make":
  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.
  
---- /dev/null  1 Jan 1970 00:00:00 -0000
-+++ testsuite/chmod.test       18 Jun 2004 17:22:09 -0000
+--- orig/testsuite/chmod.test  2004-06-18 17:22:09
++++ testsuite/chmod.test       2004-06-18 17:22:09
 @@ -0,0 +1,43 @@
 +#! /bin/sh
 +