-/*
- Copyright (C) Andrew Tridgell 1996
+/* -*- c-file-style: "linux" -*-
+
+ Copyright (C) 1996-2000 by Andrew Tridgell
Copyright (C) Paul Mackerras 1996
This program is free software; you can redistribute it and/or modify
extern int io_timeout;
extern int remote_version;
extern int always_checksum;
+extern int modify_window;
+extern char *compare_dest;
/* choose whether to skip a particular file */
of the file time to determine whether to sync */
if (always_checksum && S_ISREG(st->st_mode)) {
char sum[MD4_SUM_LENGTH];
+ char fnamecmpdest[MAXPATHLEN];
+
+ if (compare_dest != NULL) {
+ if (access(fname, 0) != 0) {
+ snprintf(fnamecmpdest,MAXPATHLEN,"%s/%s",
+ compare_dest,fname);
+ fname = fnamecmpdest;
+ }
+ }
file_checksum(fname,sum,st->st_size);
if (remote_version < 21) {
return (memcmp(sum,file->sum,2) == 0);
return 0;
}
- return (st->st_mtime == file->modtime);
+ return (cmp_modtime(st->st_mtime,file->modtime) == 0);
}
}
+
+/*
+ * Acts on file number I from FLIST, whose name is fname.
+ *
+ * First fixes up permissions, then generates checksums for the file.
+ *
+ * (This comment was added later by mbp who was trying to work it out;
+ * it might be wrong.)
+ */
void recv_generator(char *fname,struct file_list *flist,int i,int f_out)
{
int fd;
}
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,"unlink %s : %s\n",fname,strerror(errno));
+ rprintf(FERROR,"recv_generator: unlink %s: %s\n",
+ fname,strerror(errno));
return;
}
statret = -1;
if (!(relative_paths && errno==ENOENT &&
create_directory_path(fname)==0 &&
do_mkdir(fname,file->mode)==0)) {
- rprintf(FERROR,"mkdir %s : %s (2)\n",
+ rprintf(FERROR,"recv_generator: mkdir %s: %s (2)\n",
fname,strerror(errno));
}
}
- if (set_perms(fname,file,NULL,0) && verbose)
+ /* f_out is set to -1 when doing final directory
+ permission and modification time repair */
+ if (set_perms(fname,file,NULL,0) && verbose && (f_out != -1))
rprintf(FINFO,"%s/\n",fname);
return;
}
return;
}
}
+ delete_file(fname);
}
- delete_file(fname);
if (do_symlink(file->link,fname) != 0) {
- rprintf(FERROR,"link %s -> %s : %s\n",
+ rprintf(FERROR,"symlink %s -> %s : %s\n",
fname,file->link,strerror(errno));
} else {
set_perms(fname,file,NULL,0);
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;
return;
}
- if (update_only && st.st_mtime > file->modtime && fnamecmp == fname) {
+ if (update_only && cmp_modtime(st.st_mtime,file->modtime)>0 && fnamecmp == fname) {
if (verbose > 1)
rprintf(FINFO,"%s is newer\n",fname);
return;
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 */