extern int remote_version;
extern char *backup_suffix;
+extern char *tmpdir;
+extern int whole_file;
extern int block_size;
extern int update_only;
extern int make_backups;
extern int recurse;
extern int delete_mode;
extern int cvs_exclude;
+extern int am_root;
+extern int relative_paths;
/*
free a sums struct
struct sum_struct *s;
int i;
off_t offset = 0;
- int block_len;
s = (struct sum_struct *)malloc(sizeof(*s));
if (!s) out_of_memory("receive_sums");
fprintf(FERROR,"count=%d n=%d rem=%d\n",
s->count,s->n,s->remainder);
- block_len = s->n;
-
if (s->count == 0)
return(s);
}
-static void set_perms(char *fname,struct file_struct *file,struct stat *st,
- int report)
+static int set_perms(char *fname,struct file_struct *file,struct stat *st,
+ int report)
{
int updated = 0;
struct stat st2;
- if (dry_run) return;
+ if (dry_run) return 0;
if (!st) {
- if (stat(fname,&st2) != 0) {
+ if (link_stat(fname,&st2) != 0) {
fprintf(FERROR,"stat %s : %s\n",fname,strerror(errno));
- return;
+ return 0;
}
st = &st2;
}
if (set_modtime(fname,file->modtime) != 0) {
fprintf(FERROR,"failed to set times on %s : %s\n",
fname,strerror(errno));
- return;
+ return 0;
}
}
if (chmod(fname,file->mode) != 0) {
fprintf(FERROR,"failed to set permissions on %s : %s\n",
fname,strerror(errno));
- return;
+ return 0;
}
}
#endif
- if ((preserve_uid && st->st_uid != file->uid) ||
+ if ((am_root && preserve_uid && st->st_uid != file->uid) ||
(preserve_gid && st->st_gid != file->gid)) {
updated = 1;
- if (chown(fname,
- preserve_uid?file->uid:-1,
- preserve_gid?file->gid:-1) != 0) {
+ if (lchown(fname,
+ (am_root&&preserve_uid)?file->uid:-1,
+ preserve_gid?file->gid:-1) != 0) {
if (verbose>1 || preserve_uid)
fprintf(FERROR,"chown %s : %s\n",fname,strerror(errno));
- return;
+ return updated;
}
}
else
fprintf(FINFO,"%s is uptodate\n",fname);
}
+ return updated;
+}
+
+
+/* choose whether to skip a particular file */
+static int skip_file(char *fname,
+ struct file_struct *file, struct stat *st)
+{
+ if (st->st_size != file->length) {
+ return 0;
+ }
+
+ /* if always checksum is set then we use the checksum instead
+ of the file time to determine whether to sync */
+ if (always_checksum && S_ISREG(st->st_mode)) {
+ char sum[MD4_SUM_LENGTH];
+ file_checksum(fname,sum,st->st_size);
+ return (memcmp(sum,file->sum,csum_length) == 0);
+ }
+
+ if (ignore_times) {
+ return 0;
+ }
+
+ return (st->st_mtime == file->modtime);
}
struct stat st;
struct map_struct *buf;
struct sum_struct *s;
- char sum[SUM_LENGTH];
int statret;
- struct file_struct *file = &flist->files[i];
+ struct file_struct *file = flist->files[i];
if (verbose > 2)
fprintf(FERROR,"recv_generator(%s,%d)\n",fname,i);
- statret = lstat(fname,&st);
+ statret = link_stat(fname,&st);
+
+ if (S_ISDIR(file->mode)) {
+ if (dry_run) return;
+ if (statret == 0 && !S_ISDIR(st.st_mode)) {
+ if (unlink(fname) != 0) {
+ fprintf(FERROR,"unlink %s : %s\n",fname,strerror(errno));
+ return;
+ }
+ statret = -1;
+ }
+ if (statret != 0 && mkdir(fname,file->mode) != 0 && errno != EEXIST) {
+ if (!(relative_paths && errno==ENOENT &&
+ create_directory_path(fname)==0 &&
+ mkdir(fname,file->mode)==0)) {
+ fprintf(FERROR,"mkdir %s : %s (2)\n",
+ fname,strerror(errno));
+ }
+ }
+ if (set_perms(fname,file,NULL,0) && verbose)
+ fprintf(FINFO,"%s/\n",fname);
+ return;
+ }
-#if SUPPORT_LINKS
if (preserve_links && S_ISLNK(file->mode)) {
+#if SUPPORT_LINKS
char lnk[MAXPATHLEN];
int l;
if (statret == 0) {
fprintf(FINFO,"%s -> %s\n",
fname,file->link);
}
+#endif
return;
}
-#endif
#ifdef HAVE_MKNOD
- if (preserve_devices && IS_DEVICE(file->mode)) {
+ if (am_root && preserve_devices && IS_DEVICE(file->mode)) {
if (statret != 0 ||
st.st_mode != file->mode ||
st.st_rdev != file->rdev) {
if (preserve_hard_links && check_hard_link(file)) {
if (verbose > 1)
- fprintf(FINFO,"%s is a hard link\n",file->name);
+ fprintf(FINFO,"%s is a hard link\n",f_name(file));
return;
}
}
if (!S_ISREG(st.st_mode)) {
- fprintf(FERROR,"%s : not a regular file\n",fname);
+ /* its not a regular file on the receiving end, but it is on the
+ sending end. If its a directory then skip it (too dangerous to
+ do a recursive deletion??) otherwise try to unlink it */
+ if (S_ISDIR(st.st_mode)) {
+ fprintf(FERROR,"ERROR: %s is a directory\n",fname);
+ return;
+ }
+ if (unlink(fname) != 0) {
+ fprintf(FERROR,"%s : not a regular file (generator)\n",fname);
+ return;
+ }
+
+ /* now pretend the file didn't exist */
+ write_int(f_out,i);
+ if (!dry_run) send_sums(NULL,f_out);
return;
}
- if (update_only && st.st_mtime >= file->modtime) {
+ if (update_only && st.st_mtime > file->modtime) {
if (verbose > 1)
fprintf(FERROR,"%s is newer\n",fname);
return;
}
- if (always_checksum && S_ISREG(st.st_mode)) {
- file_checksum(fname,sum,st.st_size);
- }
-
- if (st.st_size == file->length &&
- ((!ignore_times && st.st_mtime == file->modtime) ||
- (always_checksum && S_ISREG(st.st_mode) &&
- memcmp(sum,file->sum,csum_length) == 0))) {
+ if (skip_file(fname, file, &st)) {
set_perms(fname,file,&st,1);
return;
}
return;
}
+ if (whole_file) {
+ write_int(f_out,i);
+ send_sums(NULL,f_out);
+ return;
+ }
+
/* open the file */
fd = open(fname,O_RDONLY);
if (fd == -1) {
fprintf(FERROR,"failed to open %s : %s\n",fname,strerror(errno));
+ fprintf(FERROR,"skipping %s\n",fname);
return;
}
write_flush(f_out);
close(fd);
- unmap_file(buf);
+ if (buf) unmap_file(buf);
free_sums(s);
}
off_t offset = 0;
off_t offset2;
char *data;
- static char file_sum1[SUM_LENGTH];
- static char file_sum2[SUM_LENGTH];
+ static char file_sum1[MD4_SUM_LENGTH];
+ static char file_sum2[MD4_SUM_LENGTH];
char *map=NULL;
count = read_int(f_in);
sum_update(data,i);
- if (write_sparse(fd,data,i) != i) {
+ if (fd != -1 && write_sparse(fd,data,i) != i) {
fprintf(FERROR,"write failed on %s : %s\n",fname,strerror(errno));
exit_cleanup(1);
}
map = map_ptr(buf,offset2,len);
+ see_token(map, len);
sum_update(map,len);
- if (write_sparse(fd,map,len) != len) {
+ if (fd != -1 && write_sparse(fd,map,len) != len) {
fprintf(FERROR,"write failed on %s : %s\n",fname,strerror(errno));
exit_cleanup(1);
}
}
}
- if (offset > 0 && sparse_end(fd) != 0) {
+ if (fd != -1 && offset > 0 && sparse_end(fd) != 0) {
fprintf(FERROR,"write failed on %s : %s\n",fname,strerror(errno));
exit_cleanup(1);
}
sum_end(file_sum1);
if (remote_version >= 14) {
- read_buf(f_in,file_sum2,SUM_LENGTH);
+ read_buf(f_in,file_sum2,MD4_SUM_LENGTH);
if (verbose > 2)
fprintf(FERROR,"got file_sum\n");
- if (memcmp(file_sum1,file_sum2,SUM_LENGTH) != 0)
+ if (fd != -1 && memcmp(file_sum1,file_sum2,MD4_SUM_LENGTH) != 0)
return 0;
}
return 1;
static void delete_one(struct file_struct *f)
{
if (!S_ISDIR(f->mode)) {
- if (!dry_run && unlink(f->name) != 0) {
- fprintf(FERROR,"unlink %s : %s\n",f->name,strerror(errno));
+ if (!dry_run && unlink(f_name(f)) != 0) {
+ fprintf(FERROR,"unlink %s : %s\n",f_name(f),strerror(errno));
} else if (verbose) {
- fprintf(FERROR,"deleting %s\n",f->name);
+ fprintf(FERROR,"deleting %s\n",f_name(f));
}
} else {
- if (!dry_run && rmdir(f->name) != 0) {
+ if (!dry_run && rmdir(f_name(f)) != 0) {
if (errno != ENOTEMPTY)
- fprintf(FERROR,"rmdir %s : %s\n",f->name,strerror(errno));
+ fprintf(FERROR,"rmdir %s : %s\n",f_name(f),strerror(errno));
} else if (verbose) {
- fprintf(FERROR,"deleting directory %s\n",f->name);
+ fprintf(FERROR,"deleting directory %s\n",f_name(f));
}
}
}
+/* yuck! This function wouldn't have been necessary if I had the sorting
+ algorithm right. Unfortunately fixing the sorting algorithm would introduce
+ a backward incompatibility as file list indexes are sent over the link.
+
+ The aim is to see if a directory has already had the deletion algorithm applied
+ to it (due to recursion), and if so to skip it. The bisection is to
+ prevent this being an n^2 algorithm */
+static int delete_already_done(struct file_list *flist,int j)
+{
+ int low=0,high=j-1;
+ char *name;
+ char *p;
+
+ if (j == 0) return 0;
+
+ name = strdup(f_name(flist->files[j]));
+
+ if (!name) {
+ fprintf(FERROR,"out of memory in delete_already_done");
+ exit_cleanup(1);
+ }
+
+ p = strrchr(name,'/');
+ if (!p) {
+ free(name);
+ return 0;
+ }
+ *p = 0;
+
+ while (low != high) {
+ int mid = (low+high)/2;
+ int ret = strcmp(f_name(flist->files[flist_up(flist, mid)]),name);
+ if (ret == 0) {
+ free(name);
+ return 1;
+ }
+ if (ret > 0) {
+ high=mid;
+ } else {
+ low=mid+1;
+ }
+ }
+
+ low = flist_up(flist, low);
+
+ if (strcmp(f_name(flist->files[low]),name) == 0) {
+ free(name);
+ return 1;
+ }
+
+ free(name);
+ return 0;
+}
+
+
+/* this deletes any files on the receiving side that are not present
+ on the sending side. For version 1.6.4 I have changed the behaviour
+ to match more closely what most people seem to expect of this option */
static void delete_files(struct file_list *flist)
{
struct file_list *local_file_list;
- char *dot=".";
- int i;
+ int i, j;
if (cvs_exclude)
add_cvs_excludes();
- if (!(local_file_list = send_file_list(-1,recurse,1,&dot)))
- return;
+ for (j=0;j<flist->count;j++) {
+ char *name = f_name(flist->files[j]);
- for (i=local_file_list->count;i>=0;i--) {
- if (!local_file_list->files[i].name) continue;
- if (-1 == flist_find(flist,&local_file_list->files[i])) {
- delete_one(&local_file_list->files[i]);
- }
+ if (!S_ISDIR(flist->files[j]->mode)) continue;
+
+ if (delete_already_done(flist, j)) continue;
+
+ if (!(local_file_list = send_file_list(-1,1,&name)))
+ continue;
+
+ if (verbose > 1)
+ fprintf(FINFO,"deleting in %s\n", name);
+
+ for (i=local_file_list->count-1;i>=0;i--) {
+ if (!local_file_list->files[i]->basename) continue;
+ if (-1 == flist_find(flist,local_file_list->files[i])) {
+ delete_one(local_file_list->files[i]);
+ }
+ }
+ flist_free(local_file_list);
}
}
void exit_cleanup(int code)
{
- if (cleanup_fname)
- unlink(cleanup_fname);
- exit(code);
+ if (cleanup_fname)
+ unlink(cleanup_fname);
+ signal(SIGUSR1, SIG_IGN);
+ if (code) {
+#ifdef GETPGRP_VOID
+ kill(-getpgrp(), SIGUSR1);
+#else
+ kill(-getpgrp(getpid()), SIGUSR1);
+#endif
+ }
+ exit(code);
}
void sig_int(void)
break;
}
- file = &flist->files[i];
- fname = file->name;
+ file = flist->files[i];
+ fname = f_name(file);
if (local_name)
fname = local_name;
if (fd1 != -1 && fstat(fd1,&st) != 0) {
fprintf(FERROR,"fstat %s : %s\n",fname,strerror(errno));
+ receive_data(f_in,NULL,-1,NULL);
close(fd1);
- return -1;
+ continue;
}
if (fd1 != -1 && !S_ISREG(st.st_mode)) {
- fprintf(FERROR,"%s : not a regular file\n",fname);
+ fprintf(FERROR,"%s : not a regular file (recv_files)\n",fname);
+ receive_data(f_in,NULL,-1,NULL);
close(fd1);
- return -1;
+ continue;
}
if (fd1 != -1 && st.st_size > 0) {
}
/* open tmp file */
- sprintf(fnametmp,"%s.XXXXXX",fname);
+ if (strlen(fname) > (MAXPATHLEN-8)) {
+ fprintf(FERROR,"filename too long\n");
+ if (buf) unmap_file(buf);
+ close(fd1);
+ continue;
+ }
+ if (tmpdir) {
+ char *f;
+ f = strrchr(fname,'/');
+ if (f == NULL)
+ f = fname;
+ else
+ f++;
+ sprintf(fnametmp,"%s/%s.XXXXXX",tmpdir,f);
+ } else {
+ sprintf(fnametmp,"%s.XXXXXX",fname);
+ }
if (NULL == mktemp(fnametmp)) {
fprintf(FERROR,"mktemp %s failed\n",fnametmp);
- return -1;
+ receive_data(f_in,buf,-1,NULL);
+ if (buf) unmap_file(buf);
+ close(fd1);
+ continue;
+ }
+ fd2 = open(fnametmp,O_WRONLY|O_CREAT|O_EXCL,file->mode);
+ if (fd2 == -1 && relative_paths && errno == ENOENT &&
+ create_directory_path(fnametmp) == 0) {
+ fd2 = open(fnametmp,O_WRONLY|O_CREAT|O_EXCL,file->mode);
}
- fd2 = open(fnametmp,O_WRONLY|O_CREAT,file->mode);
if (fd2 == -1) {
fprintf(FERROR,"open %s : %s\n",fnametmp,strerror(errno));
- return -1;
+ receive_data(f_in,buf,-1,NULL);
+ if (buf) unmap_file(buf);
+ close(fd1);
+ continue;
}
cleanup_fname = fnametmp;
/* recv file data */
recv_ok = receive_data(f_in,buf,fd2,fname);
+ if (buf) unmap_file(buf);
if (fd1 != -1) {
- unmap_file(buf);
close(fd1);
}
close(fd2);
if (make_backups) {
char fnamebak[MAXPATHLEN];
+ if (strlen(fname) + strlen(backup_suffix) > (MAXPATHLEN-1)) {
+ fprintf(FERROR,"backup filename too long\n");
+ continue;
+ }
sprintf(fnamebak,"%s%s",fname,backup_suffix);
if (rename(fname,fnamebak) != 0 && errno != ENOENT) {
fprintf(FERROR,"rename %s %s : %s\n",fname,fnamebak,strerror(errno));
- exit_cleanup(1);
+ continue;
}
}
/* move tmp file over real file */
if (rename(fnametmp,fname) != 0) {
- fprintf(FERROR,"rename %s -> %s : %s\n",
- fnametmp,fname,strerror(errno));
+ if (errno == EXDEV) {
+ /* rename failed on cross-filesystem link.
+ Copy the file instead. */
+ if (copy_file(fnametmp,fname, file->mode)) {
+ fprintf(FERROR,"copy %s -> %s : %s\n",
+ fnametmp,fname,strerror(errno));
+ } else {
+ set_perms(fname,file,NULL,0);
+ }
+ unlink(fnametmp);
+ } else {
+ fprintf(FERROR,"rename %s -> %s : %s\n",
+ fnametmp,fname,strerror(errno));
+ unlink(fnametmp);
+ }
+ } else {
+ set_perms(fname,file,NULL,0);
}
cleanup_fname = NULL;
- set_perms(fname,file,NULL,0);
if (!recv_ok) {
if (verbose > 1)
fprintf(FERROR,"redoing %s(%d)\n",fname,i);
+ if (csum_length == SUM_LENGTH)
+ fprintf(FERROR,"ERROR: file corruption in %s\n",fname);
write_int(f_gen,i);
}
}
+ if (preserve_hard_links)
+ do_hard_links(flist);
+
+ /* now we need to fix any directory permissions that were
+ modified during the transfer */
+ for (i = 0; i < flist->count; i++) {
+ struct file_struct *file = flist->files[i];
+ if (!file->basename || !S_ISDIR(file->mode)) continue;
+ recv_generator(f_name(file),flist,i,-1);
+ }
+
if (verbose > 2)
fprintf(FERROR,"recv_files finished\n");
break;
}
- file = &flist->files[i];
+ file = flist->files[i];
fname[0] = 0;
- if (file->dir) {
- strcpy(fname,file->dir);
- strcat(fname,"/");
+ if (file->basedir) {
+ strncpy(fname,file->basedir,MAXPATHLEN-1);
+ fname[MAXPATHLEN-1] = 0;
+ if (strlen(fname) == MAXPATHLEN-1) {
+ fprintf(FERROR, "send_files failed on long-named directory %s\n",
+ fname);
+ return -1;
+ }
+ strcat(fname,"/");
}
- strcat(fname,file->name);
+ strncat(fname,f_name(file),MAXPATHLEN-strlen(fname));
if (verbose > 2)
fprintf(FERROR,"send_files(%d,%s)\n",i,fname);
/* map the local file */
if (fstat(fd,&st) != 0) {
fprintf(FERROR,"fstat failed : %s\n",strerror(errno));
+ close(fd);
return -1;
}
match_sums(f_out,s,buf,st.st_size);
write_flush(f_out);
- unmap_file(buf);
+ if (buf) unmap_file(buf);
close(fd);
free_sums(s);
(int)getpid(),flist->count);
for (i = 0; i < flist->count; i++) {
- struct file_struct *file = &flist->files[i];
- if (!file->name) continue;
- if (S_ISDIR(file->mode)) {
- if (dry_run) continue;
- if (mkdir(file->name,file->mode) != 0 &&
- errno != EEXIST) {
- fprintf(FERROR,"mkdir %s : %s\n",
- file->name,strerror(errno));
- }
- continue;
+ struct file_struct *file = flist->files[i];
+ mode_t saved_mode = file->mode;
+ if (!file->basename) continue;
+
+ /* we need to ensure that any directories we create have writeable
+ permissions initially so that we can create the files within
+ them. This is then fixed after the files are transferred */
+ if (!am_root && S_ISDIR(file->mode)) {
+ file->mode |= S_IWUSR; /* user write */
}
- recv_generator(local_name?local_name:file->name,
+
+ recv_generator(local_name?local_name:f_name(file),
flist,i,f);
+
+ file->mode = saved_mode;
}
phase++;
write_flush(f);
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 */
for (i=read_int(f_recv); i != -1; i=read_int(f_recv)) {
- struct file_struct *file = &flist->files[i];
- recv_generator(local_name?local_name:file->name,
+ struct file_struct *file = flist->files[i];
+ recv_generator(local_name?local_name:f_name(file),
flist,i,f);
}
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff