extern int always_checksum;
extern char *compare_dest;
extern int link_dest;
+extern int whole_file;
+extern int local_server;
+extern int read_batch;
+extern int write_batch;
+extern int list_only;
+extern int only_existing;
+extern int orig_umask;
+extern int safe_symlinks;
/* choose whether to skip a particular file */
}
if (link_dest) {
if (preserve_perms
- && (st->st_mode & ~_S_IFMT) != (file->mode & ~_S_IFMT))
+ && (st->st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS))
return 0;
if (am_root && preserve_uid && st->st_uid != file->uid)
* Whew. */
static BOOL disable_deltas_p(void)
{
- extern int whole_file;
- extern int local_server;
- extern int write_batch;
-
if (whole_file > 0)
return True;
- if (whole_file == 0 || write_batch)
+ if (whole_file == 0 || write_batch || read_batch)
return False;
return local_server;
}
int statret;
char *fnamecmp;
char fnamecmpbuf[MAXPATHLEN];
- extern char *compare_dest;
- extern int list_only;
- extern int only_existing;
- extern int orig_umask;
if (list_only)
return;
/* if the file exists already and we aren't perserving
* permissions then act as though the remote end sent
* us the file permissions we already have */
- file->mode = (file->mode & _S_IFMT) | (st.st_mode & ~_S_IFMT);
+ file->mode = (file->mode & ~CHMOD_BITS)
+ | (st.st_mode & CHMOD_BITS);
}
if (S_ISDIR(file->mode)) {
#if SUPPORT_LINKS
char lnk[MAXPATHLEN];
int l;
- extern int safe_symlinks;
if (safe_symlinks && unsafe_symlink(file->u.link, fname)) {
if (verbose) {
if (am_root && preserve_devices && IS_DEVICE(file->mode)) {
if (statret != 0 ||
st.st_mode != file->mode ||
- (DEV64_T)st.st_rdev != file->u.rdev) {
+ st.st_rdev != file->u.rdev) {
delete_file(fname);
if (verbose > 2)
rprintf(FINFO,"mknod(%s,0%o,0x%x)\n",