extern int preserve_devices;
extern int preserve_hard_links;
extern int update_only;
-extern int whole_file;
+extern int opt_ignore_existing;
extern int block_size;
extern int csum_length;
extern int ignore_times;
}
}
+
+/**
+ * Perhaps we want to just send an empty checksum set for this file,
+ * which will force the whole thing to be literally transferred.
+ *
+ * When do we do this? If the user's explicitly said they
+ * want the whole thing, or if { they haven't explicitly
+ * requested a delta, and it's local but not batch mode.}
+ *
+ * Whew. */
+static BOOL disable_deltas_p(void)
+{
+ extern int whole_file, no_whole_file;
+ extern int local_server;
+ extern int write_batch;
+
+ assert(whole_file == 0 || whole_file == 1);
+
+ /* whole_file and no_whole_file are never both on at the same time */
+
+ if (whole_file)
+ return True;
+ else if (no_whole_file)
+ return False;
+ else if (write_batch)
+ return False;
+ else
+ return local_server;
+}
+
+
/*
generate a stream of signatures/checksums that describe a buffer
if (only_existing && statret == -1 && errno == ENOENT) {
/* we only want to update existing files */
- if (verbose > 1) rprintf(FINFO, RSYNC_NAME
- ": not creating new file \"%s\"\n",fname);
+ if (verbose > 1) rprintf(FINFO, "not creating new file \"%s\"\n",fname);
return;
}
if (safe_symlinks && unsafe_symlink(file->link, fname)) {
if (verbose) {
- rprintf(FINFO,RSYNC_NAME ": ignoring unsafe symlink \"%s\" -> \"%s\"\n",
+ rprintf(FINFO,"ignoring unsafe symlink \"%s\" -> \"%s\"\n",
fname,file->link);
}
return;
} else {
set_perms(fname,file,NULL,0);
if (verbose) {
- rprintf(FINFO,RSYNC_NAME": %s -> %s\n",
- fname,file->link);
+ rprintf(FINFO,"%s -> %s\n", fname,file->link);
}
}
#endif
if (preserve_hard_links && check_hard_link(file)) {
if (verbose > 1)
- rprintf(FINFO, RSYNC_NAME
- ": \"%s\" is a hard link\n",f_name(file));
+ rprintf(FINFO, "recv_generator: \"%s\" is a hard link\n",f_name(file));
return;
}
if (!S_ISREG(file->mode)) {
- rprintf(FINFO, RSYNC_NAME
- ": skipping non-regular file \"%s\"\n",fname);
+ rprintf(FINFO, "skipping non-regular file \"%s\"\n",fname);
return;
}
return;
}
+ if (opt_ignore_existing && fnamecmp == fname) {
+ if (verbose > 1)
+ rprintf(FINFO,"%s exists\n",fname);
+ return;
+ }
+
if (update_only && cmp_modtime(st.st_mtime,file->modtime)>0 && fnamecmp == fname) {
if (verbose > 1)
rprintf(FINFO,"%s is newer\n",fname);
return;
}
- if (whole_file) {
+ if (disable_deltas_p()) {
write_int(f_out,i);
send_sums(NULL,f_out);
return;