if (statret >= 0) {
if (S_ISREG(file->mode) && file->length != st->st_size)
iflags |= ITEM_REPORT_SIZE;
+ if (!(sflags & SID_NO_DEST_AND_NO_UPDATE)) {
+ int keep_time = !preserve_times ? 0
+ : S_ISDIR(file->mode) ? !omit_dir_times
+ : !S_ISLNK(file->mode);
+
+ if ((iflags & ITEM_UPDATING && !keep_time)
+ || (keep_time && file->modtime != st->st_mtime))
+ iflags |= ITEM_REPORT_TIME;
+ if (preserve_perms && file->mode != st->st_mode)
+ iflags |= ITEM_REPORT_PERMS;
+ if (preserve_uid && am_root && file->uid != st->st_uid)
+ iflags |= ITEM_REPORT_OWNER;
+ if (preserve_gid && file->gid != GID_NONE
+ && st->st_gid != file->gid)
+ iflags |= ITEM_REPORT_GROUP;
+ }
} else
- iflags |= ITEM_IS_NEW;
- if (statret >= 0 && !(sflags & SID_NO_DEST_AND_NO_UPDATE)) {
- int keep_time = !preserve_times ? 0
- : S_ISDIR(file->mode) ? !omit_dir_times : !S_ISLNK(file->mode);
-
- if ((iflags & ITEM_UPDATING && !keep_time)
- || (keep_time && file->modtime != st->st_mtime))
- iflags |= ITEM_REPORT_TIME;
- if (preserve_perms && file->mode != st->st_mode)
- iflags |= ITEM_REPORT_PERMS;
- if (preserve_uid && am_root && file->uid != st->st_uid)
- iflags |= ITEM_REPORT_OWNER;
- if (preserve_gid && file->gid != GID_NONE && st->st_gid != file->gid)
- iflags |= ITEM_REPORT_GROUP;
- }
-
- if (iflags && !read_batch) {
+ iflags |= ITEM_IS_NEW | ITEM_UPDATING;
+
+ if ((iflags || verbose > 1) && !read_batch) {
if (ndx >= 0)
write_int(f_out, ndx);
- write_byte(f_out, iflags);
+ write_shortint(f_out, iflags);
}
}
char *fnamecmp, *partialptr, *backupptr = NULL;
char fnamecmpbuf[MAXPATHLEN];
uchar fnamecmp_type;
+ int maybe_DEL_TERSE = itemize_changes ? 0 : DEL_TERSE;
+ int maybe_PERMS_REPORT = itemize_changes ? 0 : PERMS_REPORT;
if (list_only)
return;
* we need to delete it. If it doesn't exist, then
* (perhaps recursively) create it. */
if (statret == 0 && !S_ISDIR(st.st_mode)) {
- delete_file(fname, DEL_TERSE);
+ delete_file(fname, st.st_mode, maybe_DEL_TERSE);
statret = -1;
}
if (dry_run && statret != 0 && missing_below < 0) {
missing_below = file->dir.depth;
dry_run++;
}
- if (itemize_changes && f_out != -1)
+ if (protocol_version >= 29 && f_out != -1)
itemize(file, statret, &st, 0, f_out, ndx);
if (statret != 0 && do_mkdir(fname,file->mode) != 0 && errno != EEXIST) {
if (!relative_paths || errno != ENOENT
}
}
if (set_perms(fname, file, statret ? NULL : &st, 0)
- && verbose && f_out != -1 && !itemize_changes)
+ && verbose && protocol_version < 29 && f_out != -1)
rprintf(FINFO, "%s/\n", safe_fname(fname));
if (delete_during && f_out != -1 && csum_length != SUM_LENGTH
&& (file->flags & FLAG_DEL_HERE))
return;
}
if (statret == 0) {
- int dflag = S_ISDIR(st.st_mode) ? DEL_DIR : 0;
char lnk[MAXPATHLEN];
int len;
- if (!dflag
+ if (!S_ISDIR(st.st_mode)
&& (len = readlink(fname, lnk, MAXPATHLEN-1)) > 0) {
lnk[len] = 0;
/* A link already pointing to the
* right place -- no further action
* required. */
if (strcmp(lnk, file->u.link) == 0) {
- if (itemize_changes) {
+ if (protocol_version >= 29) {
itemize(file, 0, &st, 0,
f_out, ndx);
}
set_perms(fname, file, &st,
- PERMS_REPORT);
+ maybe_PERMS_REPORT);
return;
}
}
/* Not the right symlink (or not a symlink), so
* delete it. */
- delete_file(fname, dflag | DEL_TERSE);
+ if (S_ISLNK(st.st_mode))
+ delete_file(fname, st.st_mode, DEL_TERSE);
+ else {
+ delete_file(fname, st.st_mode, maybe_DEL_TERSE);
+ statret = -1;
+ }
}
if (do_symlink(file->u.link,fname) != 0) {
rsyserr(FERROR, errno, "symlink %s -> \"%s\" failed",
full_fname(fname), safe_fname(file->u.link));
} else {
set_perms(fname,file,NULL,0);
- if (itemize_changes) {
+ if (protocol_version >= 29) {
itemize(file, statret, &st, SID_UPDATING,
f_out, ndx);
} else if (verbose) {
if (statret != 0 ||
st.st_mode != file->mode ||
st.st_rdev != file->u.rdev) {
- int dflag = S_ISDIR(st.st_mode) ? DEL_DIR : 0;
- if (itemize_changes) {
- itemize(file, statret, &st, SID_UPDATING,
- f_out, ndx);
+ if (IS_DEVICE(st.st_mode))
+ delete_file(fname, st.st_mode, DEL_TERSE);
+ else {
+ delete_file(fname, st.st_mode, maybe_DEL_TERSE);
+ statret = -1;
}
- delete_file(fname, dflag | DEL_TERSE);
if (verbose > 2) {
rprintf(FINFO,"mknod(%s,0%o,0x%x)\n",
safe_fname(fname),
full_fname(fname));
} else {
set_perms(fname,file,NULL,0);
- if (verbose && !itemize_changes) {
+ if (protocol_version >= 29) {
+ itemize(file, statret, &st, SID_UPDATING,
+ f_out, ndx);
+ } else if (verbose) {
rprintf(FINFO, "%s\n",
safe_fname(fname));
}
}
} else {
- if (itemize_changes) {
+ if (protocol_version >= 29) {
itemize(file, statret, &st, 0,
f_out, ndx);
}
- set_perms(fname, file, &st, PERMS_REPORT);
+ set_perms(fname, file, &st, maybe_PERMS_REPORT);
}
return;
}
}
if (statret == 0 && !S_ISREG(st.st_mode)) {
- int dflag = S_ISDIR(st.st_mode) ? DEL_DIR : 0;
- if (delete_file(fname, dflag | DEL_TERSE) != 0)
+ if (delete_file(fname, st.st_mode, maybe_DEL_TERSE) != 0)
return;
statret = -1;
stat_errno = ENOENT;
else if (fnamecmp_type == FNAMECMP_FUZZY)
;
else if (unchanged_file(fnamecmp, file, &st)) {
- if (itemize_changes) {
+ if (protocol_version >= 29) {
itemize(file, statret, &st,
fnamecmp_type == FNAMECMP_FNAME
? 0 : SID_NO_DEST_AND_NO_UPDATE,
f_out, ndx);
}
if (fnamecmp_type == FNAMECMP_FNAME)
- set_perms(fname, file, &st, PERMS_REPORT);
+ set_perms(fname, file, &st, maybe_PERMS_REPORT);
return;
}
notify_others:
write_int(f_out, ndx);
- if (protocol_version >= 29 && inplace && !read_batch)
- write_byte(f_out, fnamecmp_type);
+ if (protocol_version >= 29) {
+ itemize(file, statret, &st, SID_UPDATING
+ | (always_checksum ? SID_REPORT_CHECKSUM : 0),
+ f_out, -1);
+ if (inplace && !read_batch)
+ write_byte(f_out, fnamecmp_type);
+ }
if (f_out_name >= 0) {
write_byte(f_out_name, fnamecmp_type);
if (fnamecmp_type == FNAMECMP_FUZZY) {
write_buf(f_out_name, fuzzy_file->basename, len);
}
}
- if (itemize_changes) {
- itemize(file, statret, &st, SID_UPDATING
- | (always_checksum ? SID_REPORT_CHECKSUM : 0),
- f_out, -1);
- }
if (dry_run || read_batch)
return;