./configure
make
+TODO: fix --delete-delay to work with --flags option.
+
--- old/configure.in
+++ new/configure.in
-@@ -527,7 +527,7 @@ AC_CHECK_FUNCS(waitpid wait4 getcwd strd
+@@ -549,7 +549,7 @@ AC_CHECK_FUNCS(waitpid wait4 getcwd strd
memmove lchown vsnprintf snprintf vasprintf asprintf setsid glob strpbrk \
strlcat strlcpy strtol mallinfo getgroups setgroups geteuid getegid \
setlocale setmode open64 lseek64 mkstemp64 mtrace va_copy __va_copy \
extern int preserve_uid;
extern int preserve_gid;
extern int relative_paths;
-@@ -303,6 +304,9 @@ static void send_file_entry(struct file_
+@@ -305,6 +306,9 @@ static void send_file_entry(struct file_
unsigned short flags;
static time_t modtime;
static mode_t mode;
static int64 dev;
static dev_t rdev;
static uint32 rdev_major;
-@@ -333,6 +337,12 @@ static void send_file_entry(struct file_
+@@ -335,6 +339,12 @@ static void send_file_entry(struct file_
flags |= XMIT_SAME_MODE;
else
mode = file->mode;
if ((preserve_devices && IS_DEVICE(mode))
|| (preserve_specials && IS_SPECIAL(mode))) {
if (protocol_version < 28) {
-@@ -416,6 +426,10 @@ static void send_file_entry(struct file_
+@@ -418,6 +428,10 @@ static void send_file_entry(struct file_
write_int(f, modtime);
if (!(flags & XMIT_SAME_MODE))
write_int(f, to_wire_mode(mode));
if (preserve_uid && !(flags & XMIT_SAME_UID)) {
if (!numeric_ids)
add_uid(uid);
-@@ -483,6 +497,9 @@ static struct file_struct *receive_file_
+@@ -485,6 +499,9 @@ static struct file_struct *receive_file_
{
static time_t modtime;
static mode_t mode;
static int64 dev;
static dev_t rdev;
static uint32 rdev_major;
-@@ -556,9 +573,12 @@ static struct file_struct *receive_file_
+@@ -558,9 +575,12 @@ static struct file_struct *receive_file_
modtime = (time_t)read_int(f);
if (!(flags & XMIT_SAME_MODE))
mode = from_wire_mode(read_int(f));
if (preserve_uid && !(flags & XMIT_SAME_UID))
uid = (uid_t)read_int(f);
-@@ -609,6 +629,9 @@ static struct file_struct *receive_file_
+@@ -611,6 +631,9 @@ static struct file_struct *receive_file_
file->modtime = modtime;
file->length = file_length;
file->mode = mode;
file->uid = uid;
file->gid = gid;
-@@ -862,6 +885,9 @@ struct file_struct *make_file(char *fnam
+@@ -871,6 +894,9 @@ struct file_struct *make_file(char *fnam
file->modtime = st.st_mtime;
file->length = st.st_size;
file->mode = st.st_mode;
--- old/generator.c
+++ new/generator.c
-@@ -95,6 +95,12 @@ extern struct filter_list_struct server_
-
+@@ -99,6 +99,12 @@ int non_perishable_cnt = 0;
static int deletion_count = 0; /* used to implement --max-delete */
+ static FILE *delete_delay_fp = NULL;
+#ifdef SUPPORT_FLAGS
+#define FILEFLAGS(ff) ff
+#define FILEFLAGS(ff) 0
+#endif
+
- /* For calling delete_item() */
+ /* For calling delete_item() and delete_dir_contents(). */
#define DEL_RECURSE (1<<1) /* recurse */
-
-@@ -109,7 +115,6 @@ enum delret {
+ #define DEL_DIR_IS_EMPTY (1<<2) /* internal delete_FUNCTIONS use only */
+@@ -114,7 +120,6 @@ enum delret {
/* Forward declaration for delete_item(). */
static enum delret delete_dir_contents(char *fname, int flags);
static int is_backup_file(char *fn)
{
int k = strlen(fn) - backup_suffix_len;
-@@ -122,17 +127,20 @@ static int is_backup_file(char *fn)
- * Note that fname must point to a MAXPATHLEN buffer if the mode indicates it's
+@@ -127,17 +132,20 @@ static int is_backup_file(char *fn)
+ * Note that fbuf must point to a MAXPATHLEN buffer if the mode indicates it's
* a directory! (The buffer is used for recursion, but returned unchanged.)
*/
--static enum delret delete_item(char *fname, int mode, char *replace, int flags)
-+static enum delret delete_item(char *fname, int mode, uint32 fileflags, char *replace, int flags)
+-static enum delret delete_item(char *fbuf, int mode, char *replace, int flags)
++static enum delret delete_item(char *fbuf, int mode, uint32 fileflags, char *replace, int flags)
{
enum delret ret;
char *what;
if (verbose > 2) {
- rprintf(FINFO, "delete_item(%s) mode=%o flags=%d\n",
-- fname, mode, flags);
+- fbuf, mode, flags);
+ rprintf(FINFO, "delete_item(%s) mode=%o fileflags=%o flags=%d\n",
-+ fname, mode, fileflags, flags);
++ fbuf, mode, fileflags, flags);
}
+#ifdef SUPPORT_FLAGS
-+ make_mutable(fname, mode, fileflags);
++ make_mutable(fbuf, mode, fileflags);
+#endif
- if (S_ISDIR(mode) && flags & DEL_RECURSE) {
- ret = delete_dir_contents(fname, flags);
- if (ret == DR_PINNED || ret == DR_NOT_EMPTY
-@@ -221,7 +229,7 @@ static enum delret delete_dir_contents(c
- }
-
- strlcpy(p, fp->basename, remainder);
-- result = delete_item(fname, fp->mode, NULL, flags);
-+ result = delete_item(fname, fp->mode, FILEFLAGS(fp->fileflags), NULL, flags);
- if (result != DR_SUCCESS && ret == DR_SUCCESS)
- ret = result == DR_PINNED ? result : DR_NOT_EMPTY;
+ if (S_ISDIR(mode) && !(flags & DEL_DIR_IS_EMPTY)) {
+ ignore_perishable = 1;
+ /* If DEL_RECURSE is not set, this just reports emptiness. */
+@@ -249,7 +257,7 @@ static enum delret delete_dir_contents(c
+ if (S_ISDIR(fp->mode)
+ && delete_dir_contents(fname, flags | DEL_RECURSE) != DR_SUCCESS)
+ ret = DR_NOT_EMPTY;
+- if (delete_item(fname, fp->mode, NULL, flags) != DR_SUCCESS)
++ if (delete_item(fname, fp->mode, FILEFLAGS(fp->fileflags), NULL, flags) != DR_SUCCESS)
+ ret = DR_NOT_EMPTY;
}
-@@ -307,7 +315,7 @@ static void delete_in_dir(struct file_li
+
+@@ -401,10 +409,10 @@ static void delete_in_dir(struct file_li
}
if (flist_find(flist, fp) < 0) {
f_name(fp, delbuf);
-- delete_item(delbuf, fp->mode, NULL, DEL_RECURSE);
-+ delete_item(delbuf, fp->mode, FILEFLAGS(fp->fileflags), NULL, DEL_RECURSE);
+- if (delete_delay_fp)
++ if (delete_delay_fp) /* XXX need to output fileflags value here too */
+ fprintf(delete_delay_fp, "%o %s%c", (short)fp->mode, delbuf, '\0');
+ else
+- delete_item(delbuf, fp->mode, NULL, DEL_RECURSE);
++ delete_item(delbuf, fp->mode, FILEFLAGS(fp->fileflags), NULL, DEL_RECURSE);
}
}
-@@ -1005,7 +1013,7 @@ static void recv_generator(char *fname,
+@@ -1103,7 +1111,7 @@ static void recv_generator(char *fname,
* we need to delete it. If it doesn't exist, then
* (perhaps recursively) create it. */
if (statret == 0 && !S_ISDIR(st.st_mode)) {
return;
statret = -1;
}
-@@ -1099,7 +1107,7 @@ static void recv_generator(char *fname,
+@@ -1197,7 +1205,7 @@ static void recv_generator(char *fname,
}
/* Not the right symlink (or not a symlink), so
* delete it. */
return;
} else if (basis_dir[0] != NULL) {
int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &st,
-@@ -1170,7 +1178,7 @@ static void recv_generator(char *fname,
+@@ -1268,7 +1276,7 @@ static void recv_generator(char *fname,
goto return_with_success;
return;
}
return;
} else if (basis_dir[0] != NULL) {
int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &st,
-@@ -1256,7 +1264,7 @@ static void recv_generator(char *fname,
+@@ -1354,7 +1362,7 @@ static void recv_generator(char *fname,
fnamecmp_type = FNAMECMP_FNAME;
if (statret == 0 && !S_ISREG(st.st_mode)) {
rprintf(F," -E, --executability preserve the file's executability\n");
rprintf(F," --chmod=CHMOD affect file and/or directory permissions\n");
rprintf(F," -o, --owner preserve owner (super-user only)\n");
-@@ -424,6 +431,8 @@ static struct poptOption long_options[]
+@@ -425,6 +432,8 @@ static struct poptOption long_options[]
{"perms", 'p', POPT_ARG_VAL, &preserve_perms, 1, 0, 0 },
{"no-perms", 0, POPT_ARG_VAL, &preserve_perms, 0, 0, 0 },
{"no-p", 0, POPT_ARG_VAL, &preserve_perms, 0, 0, 0 },
{"executability", 'E', POPT_ARG_NONE, &preserve_executability, 0, 0, 0 },
{"times", 't', POPT_ARG_VAL, &preserve_times, 1, 0, 0 },
{"no-times", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
-@@ -1128,6 +1137,15 @@ int parse_arguments(int *argc, const cha
+@@ -1130,6 +1139,15 @@ int parse_arguments(int *argc, const cha
}
#endif
if (write_batch && read_batch) {
snprintf(err_buf, sizeof err_buf,
"--write-batch and --read-batch can not be used together\n");
-@@ -1581,6 +1599,9 @@ void server_options(char **args,int *arg
+@@ -1584,6 +1602,9 @@ void server_options(char **args,int *arg
if (xfer_dirs && !recurse && delete_mode && am_sender)
args[ac++] = "--no-r";
-E, --executability preserve executability
--chmod=CHMOD affect file and/or directory permissions
-o, --owner preserve owner (super-user only)
-@@ -509,7 +510,9 @@ specified, in which case bf(-r) is not i
+@@ -510,7 +511,9 @@ specified, in which case bf(-r) is not i
Note that bf(-a) bf(does not preserve hardlinks), because
finding multiply-linked files is expensive. You must separately
dit(--no-OPTION) You may turn off one or more implied options by prefixing
the option name with "no-". Not all options may be prefixed with a "no-":
-@@ -804,6 +807,13 @@ quote(itemization(
+@@ -805,6 +808,13 @@ quote(itemization(
If bf(--perms) is enabled, this option is ignored.
transfer. The resulting value is treated as though it was the permissions
--- old/syscall.c
+++ new/syscall.c
-@@ -152,6 +152,15 @@ int do_chmod(const char *path, mode_t mo
+@@ -153,6 +153,15 @@ int do_chmod(const char *path, mode_t mo
}
#endif