+}
+
+#endif /* SUPPORT_ACLS */
---- orig/backup.c 2005-01-25 12:14:14
+--- orig/backup.c 2005-02-07 20:41:56
+++ backup.c 2004-10-06 00:13:09
-@@ -119,6 +119,7 @@ static int make_bak_dir(char *fullpath)
+@@ -121,6 +121,7 @@ static int make_bak_dir(char *fullpath)
} else {
do_lchown(fullpath, st.st_uid, st.st_gid);
do_chmod(fullpath, st.st_mode);
}
}
*p = '/';
-@@ -171,6 +172,8 @@ static int keep_backup(char *fname)
+@@ -173,6 +174,8 @@ static int keep_backup(char *fname)
if (!(buf = get_backup_name(fname)))
return 0;
/* Check to see if this is a device file, or link */
if (IS_DEVICE(file->mode)) {
if (am_root && preserve_devices) {
-@@ -244,6 +247,7 @@ static int keep_backup(char *fname)
+@@ -246,6 +249,7 @@ static int keep_backup(char *fname)
}
}
set_perms(buf, file, NULL, 0);
+ CLEANUP_KEEP_BACKUP_ACL();
free(file);
- if (verbose > 1)
+ if (verbose > 1) {
--- orig/configure.in 2005-01-28 23:01:08
+++ configure.in 2004-08-19 19:53:27
@@ -467,6 +467,11 @@ if test x"$ac_cv_func_strcasecmp" = x"no
AC_CONFIG_FILES([Makefile lib/dummy zlib/dummy popt/dummy shconfig])
AC_OUTPUT
---- orig/flist.c 2005-02-03 02:04:20
+--- orig/flist.c 2005-02-09 02:37:15
+++ flist.c 2004-07-03 20:11:58
-@@ -983,6 +983,8 @@ void send_file_name(int f, struct file_l
+@@ -982,6 +982,8 @@ void send_file_name(int f, struct file_l
if (!file)
return;
maybe_emit_filelist_progress(flist);
-@@ -991,6 +993,10 @@ void send_file_name(int f, struct file_l
+@@ -990,6 +992,10 @@ void send_file_name(int f, struct file_l
if (file->basename[0]) {
flist->files[flist->count++] = file;
send_file_entry(file, f, base_flags);
if (f != -1) {
/* Now send the uid/gid list. This was introduced in
* protocol version 15 */
---- orig/generator.c 2005-02-03 02:04:20
+--- orig/generator.c 2005-02-11 20:25:07
+++ generator.c 2005-01-30 10:09:44
-@@ -313,6 +313,10 @@ static void recv_generator(char *fname,
+@@ -315,6 +315,10 @@ static void recv_generator(char *fname,
if (set_perms(fname, file, statret ? NULL : &st, 0)
&& verbose && f_out != -1)
rprintf(FINFO, "%s/\n", safe_fname(fname));
next;
}
---- orig/options.c 2005-02-01 10:39:22
+--- orig/options.c 2005-02-11 18:21:45
+++ options.c 2004-08-19 17:38:57
@@ -44,6 +44,7 @@ int keep_dirlinks = 0;
int copy_links = 0;
int preserve_perms = 0;
int preserve_devices = 0;
int preserve_uid = 0;
-@@ -164,6 +165,7 @@ static void print_rsync_version(enum log
+@@ -166,6 +167,7 @@ static void print_rsync_version(enum log
char const *got_socketpair = "no ";
char const *have_inplace = "no ";
char const *hardlinks = "no ";
char const *links = "no ";
char const *ipv6 = "no ";
STRUCT_STAT *dumstat;
-@@ -180,6 +182,10 @@ static void print_rsync_version(enum log
+@@ -182,6 +184,10 @@ static void print_rsync_version(enum log
hardlinks = "";
#endif
#if SUPPORT_LINKS
links = "";
#endif
-@@ -194,9 +200,9 @@ static void print_rsync_version(enum log
+@@ -196,9 +202,9 @@ static void print_rsync_version(enum log
"Copyright (C) 1996-2005 by Andrew Tridgell and others\n");
rprintf(f, "<http://rsync.samba.org/>\n");
rprintf(f, "Capabilities: %d-bit files, %ssocketpairs, "
/* Note that this field may not have type ino_t. It depends
* on the complicated interaction between largefile feature
-@@ -266,6 +272,7 @@ void usage(enum logcode F)
+@@ -268,6 +274,7 @@ void usage(enum logcode F)
rprintf(F," -H, --hard-links preserve hard links\n");
rprintf(F," -K, --keep-dirlinks treat symlinked dir on receiver as dir\n");
rprintf(F," -p, --perms preserve permissions\n");
rprintf(F," -o, --owner preserve owner (root only)\n");
rprintf(F," -g, --group preserve group\n");
rprintf(F," -D, --devices preserve devices (root only)\n");
-@@ -384,6 +391,7 @@ static struct poptOption long_options[]
+@@ -387,6 +394,7 @@ static struct poptOption long_options[]
{"no-whole-file", 0, POPT_ARG_VAL, &whole_file, 0, 0, 0 },
{"copy-unsafe-links", 0, POPT_ARG_NONE, ©_unsafe_links, 0, 0, 0 },
{"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 },
{"devices", 'D', POPT_ARG_NONE, &preserve_devices, 0, 0, 0 },
-@@ -802,6 +810,24 @@ int parse_arguments(int *argc, const cha
+@@ -831,6 +839,24 @@ int parse_arguments(int *argc, const cha
basis_dir[basis_dir_cnt++] = (char *)arg;
break;
+
default:
/* A large opt value means that set_refuse_options()
- * turned this option off (opt-BASE is its index). */
-@@ -1144,6 +1170,8 @@ void server_options(char **args,int *arg
+ * turned this option off. */
+@@ -1203,6 +1229,8 @@ void server_options(char **args,int *arg
if (preserve_hard_links)
argstr[x++] = 'H';
if (preserve_uid)
argstr[x++] = 'o';
if (preserve_gid)
---- orig/rsync.c 2005-02-01 10:39:22
+--- orig/rsync.c 2005-02-07 20:41:57
+++ rsync.c 2004-07-03 20:11:58
-@@ -235,6 +235,14 @@ int set_perms(char *fname,struct file_st
+@@ -238,6 +238,14 @@ int set_perms(char *fname,struct file_st
}
#endif
+
if (verbose > 1 && flags & PERMS_REPORT) {
if (updated)
- rprintf(FINFO,"%s\n",fname);
---- orig/rsync.h 2005-02-03 02:04:20
+ rprintf(FINFO, "%s\n", safe_fname(fname));
+--- orig/rsync.h 2005-02-07 20:41:57
+++ rsync.h 2004-07-03 20:11:58
-@@ -605,6 +605,40 @@ struct stats {
+@@ -607,6 +607,40 @@ struct stats {
#include "lib/permstring.h"
#include "lib/addrinfo.h"
#include "proto.h"
/* We have replacement versions of these if they're missing. */
---- orig/rsync.yo 2005-02-01 10:39:23
+--- orig/rsync.yo 2005-02-11 23:14:49
+++ rsync.yo 2004-07-03 20:11:58
@@ -317,6 +317,7 @@ to the detailed description below for a
-H, --hard-links preserve hard links
-o, --owner preserve owner (root only)
-g, --group preserve group
-D, --devices preserve devices (root only)
-@@ -612,6 +613,11 @@ source file's permissions and the umask
+@@ -613,6 +614,11 @@ source file's permissions and the umask
other files (including updated files) retain their existing permissions
(which is the same behavior as other file-copy utilities, such as cp).
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff