extern int implied_dirs;
extern int copy_links;
extern int copy_unsafe_links;
-extern int remote_version;
+extern int protocol_version;
extern int io_error;
extern int sanitize_paths;
#if SUPPORT_HARD_LINKS
if (preserve_hard_links && S_ISREG(file->mode)) {
- if (remote_version < 26) {
+ if (protocol_version < 26) {
/* 32-bit dev_t and ino_t */
write_int(f, (int) file->dev);
write_int(f, (int) file->inode);
#endif
if (always_checksum) {
- if (remote_version < 21) {
+ if (protocol_version < 21) {
write_buf(f, file->sum, 2);
} else {
write_buf(f, file->sum, MD4_SUM_LENGTH);
}
#if SUPPORT_HARD_LINKS
if (preserve_hard_links && S_ISREG(file->mode)) {
- if (remote_version < 26) {
+ if (protocol_version < 26) {
file->dev = read_int(f);
file->inode = read_int(f);
} else {
file->sum = (char *) malloc(MD4_SUM_LENGTH);
if (!file->sum)
out_of_memory("md4 sum");
- if (remote_version < 21) {
+ if (protocol_version < 21) {
read_buf(f, file->sum, 2);
} else {
read_buf(f, file->sum, MD4_SUM_LENGTH);
}
}
io_error = 1;
- rprintf(FERROR, "readlink %s: %s\n",
- fname, strerror(save_errno));
+ rprintf(FERROR, "readlink %s failed: %s\n",
+ full_fname(fname), strerror(save_errno));
return NULL;
}
d = opendir(dir);
if (!d) {
io_error = 1;
- rprintf(FERROR, "opendir(%s): %s\n", dir, strerror(errno));
+ rprintf(FERROR, "opendir %s failed: %s\n",
+ full_fname(dir), strerror(errno));
return;
}
if (fname[l - 1] != '/') {
if (l == MAXPATHLEN - 1) {
io_error = 1;
- rprintf(FERROR,
- "skipping long-named directory %s\n",
- fname);
+ rprintf(FERROR, "skipping long-named directory: %s\n",
+ full_fname(fname));
closedir(d);
return;
}
io_error = 1;
rprintf(FINFO,
"cannot cvs-exclude in long-named directory %s\n",
- fname);
+ full_fname(fname));
}
}
io_start_buffering(f);
if (filesfrom_fd >= 0) {
if (argv[0] && !push_dir(argv[0], 0)) {
- rprintf(FERROR, "push_dir %s : %s\n",
- argv[0], strerror(errno));
+ rprintf(FERROR, "push_dir %s failed: %s\n",
+ full_fname(argv[0]), strerror(errno));
exit_cleanup(RERR_FILESELECT);
}
use_ff_fd = 1;
if (link_stat(fname, &st) != 0) {
if (f != -1) {
io_error = 1;
- rprintf(FERROR, "link_stat %s : %s\n",
- fname, strerror(errno));
+ rprintf(FERROR, "link_stat %s failed: %s\n",
+ full_fname(fname), strerror(errno));
}
continue;
}
if (!olddir) {
io_error = 1;
- rprintf(FERROR, "push_dir %s : %s\n",
- dir, strerror(errno));
+ rprintf(FERROR, "push_dir %s failed: %s\n",
+ full_fname(dir), strerror(errno));
continue;
}
if (olddir != NULL) {
flist_dir = NULL;
if (pop_dir(olddir) != 0) {
- rprintf(FERROR, "pop_dir %s : %s\n",
- dir, strerror(errno));
+ rprintf(FERROR, "pop_dir %s failed: %s\n",
+ full_fname(dir), strerror(errno));
exit_cleanup(RERR_FILESELECT);
}
}