if (compare_dest != NULL) {
if (access(fname, 0) != 0) {
- slprintf(fnamecmpdest,MAXPATHLEN,"%s/%s",
+ snprintf(fnamecmpdest,MAXPATHLEN,"%s/%s",
compare_dest,fname);
fname = fnamecmpdest;
}
}
if (S_ISDIR(file->mode)) {
+ /* The file to be received is a directory, so we need
+ * to prepare appropriately. If there is already a
+ * file of that name and it is *not* a directory, then
+ * we need to delete it. If it doesn't exist, then
+ * recursively create it. */
+
if (dry_run) return;
if (statret == 0 && !S_ISDIR(st.st_mode)) {
if (robust_unlink(fname) != 0) {
- rprintf(FERROR,"recv_generator: unlink %s: %s\n",fname,strerror(errno));
+ rprintf(FERROR,"recv_generator: unlink %s: %s\n",
+ fname,strerror(errno));
return;
}
statret = -1;
if ((statret == -1) && (compare_dest != NULL)) {
/* try the file at compare_dest instead */
int saveerrno = errno;
- slprintf(fnamecmpbuf,MAXPATHLEN,"%s/%s",compare_dest,fname);
+ snprintf(fnamecmpbuf,MAXPATHLEN,"%s/%s",compare_dest,fname);
statret = link_stat(fnamecmpbuf,&st);
if (!S_ISREG(st.st_mode))
statret = -1;
rprintf(FINFO,"generator starting pid=%d count=%d\n",
(int)getpid(),flist->count);
+ /* we expect to just sit around now, so don't exit on a
+ timeout. If we really get a timeout then the other process should
+ exit */
+ io_timeout = 0;
+
for (i = 0; i < flist->count; i++) {
struct file_struct *file = flist->files[i];
mode_t saved_mode = file->mode;
them. This is then fixed after the files are transferred */
if (!am_root && S_ISDIR(file->mode)) {
file->mode |= S_IWUSR; /* user write */
+ /* XXX: Could this be causing a problem on SCO? Perhaps their
+ * handling of permissions is strange? */
}
recv_generator(local_name?local_name:f_name(file),
write_int(f,-1);
- /* we expect to just sit around now, so don't exit on a
- timeout. If we really get a timeout then the other process should
- exit */
- io_timeout = 0;
-
if (remote_version >= 13) {
/* in newer versions of the protocol the files can cycle through
the system more than once to catch initial checksum errors */