X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/ebb0a6f61826aeaba0aeb1866df41dee8b7c7269..cbbe4892087b74fb8ed2aac6078ee933ac02e920:/rsync.c diff --git a/rsync.c b/rsync.c index 79e0b748..8d0f3207 100644 --- a/rsync.c +++ b/rsync.c @@ -45,6 +45,8 @@ extern int ignore_times; extern int recurse; extern int delete_mode; extern int cvs_exclude; +extern int am_root; +extern int relative_paths; /* free a sums struct @@ -145,7 +147,6 @@ static struct sum_struct *receive_sums(int f) 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"); @@ -159,8 +160,6 @@ static struct sum_struct *receive_sums(int f) 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); @@ -192,18 +191,18 @@ static struct sum_struct *receive_sums(int f) } -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 (lstat(fname,&st2) != 0) { fprintf(FERROR,"stat %s : %s\n",fname,strerror(errno)); - return; + return 0; } st = &st2; } @@ -214,7 +213,7 @@ static void set_perms(char *fname,struct file_struct *file,struct stat *st, if (set_modtime(fname,file->modtime) != 0) { fprintf(FERROR,"failed to set times on %s : %s\n", fname,strerror(errno)); - return; + return 0; } } @@ -225,20 +224,20 @@ static void set_perms(char *fname,struct file_struct *file,struct stat *st, 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; } } @@ -248,6 +247,7 @@ static void set_perms(char *fname,struct file_struct *file,struct stat *st, else fprintf(FINFO,"%s is uptodate\n",fname); } + return updated; } @@ -266,8 +266,30 @@ void recv_generator(char *fname,struct file_list *flist,int i,int f_out) statret = lstat(fname,&st); -#if SUPPORT_LINKS + 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 (preserve_links && S_ISLNK(file->mode)) { +#if SUPPORT_LINKS char lnk[MAXPATHLEN]; int l; if (statret == 0) { @@ -290,12 +312,12 @@ void recv_generator(char *fname,struct file_list *flist,int i,int f_out) 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) { @@ -341,7 +363,21 @@ void recv_generator(char *fname,struct file_list *flist,int i,int f_out) } 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; } @@ -425,7 +461,7 @@ static int receive_data(int f_in,struct map_struct *buf,int fd,char *fname) 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); } @@ -446,7 +482,7 @@ static int receive_data(int f_in,struct map_struct *buf,int fd,char *fname) 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); } @@ -454,7 +490,7 @@ static int receive_data(int f_in,struct map_struct *buf,int fd,char *fname) } } - 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); } @@ -465,7 +501,7 @@ static int receive_data(int f_in,struct map_struct *buf,int fd,char *fname) read_buf(f_in,file_sum2,MD4_SUM_LENGTH); if (verbose > 2) fprintf(FERROR,"got file_sum\n"); - if (memcmp(file_sum1,file_sum2,MD4_SUM_LENGTH) != 0) + if (fd != -1 && memcmp(file_sum1,file_sum2,MD4_SUM_LENGTH) != 0) return 0; } return 1; @@ -491,23 +527,38 @@ static void delete_one(struct file_struct *f) } +/* 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; + char *last_name=NULL; if (cvs_exclude) add_cvs_excludes(); - if (!(local_file_list = send_file_list(-1,recurse,1,&dot))) - return; - - 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]); - } + for (j=0;jcount;j++) { + if (!S_ISDIR(flist->files[j].mode)) continue; + if (strcmp(flist->files[j].name,".")==0) continue; + if (last_name && + flist->files[j].name[strlen(last_name)] == '/' && + strncmp(flist->files[j].name,last_name, strlen(last_name))==0) + continue; + last_name = flist->files[j].name; + if (!(local_file_list = send_file_list(-1,1,&last_name))) + continue; + if (verbose > 1) + fprintf(FINFO,"deleting in %s\n", last_name); + + for (i=local_file_list->count-1;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]); + } + } } } @@ -582,14 +633,16 @@ int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen) 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) { @@ -601,15 +654,30 @@ int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen) } /* open tmp file */ + if (strlen(fname) > (MAXPATHLEN-8)) { + fprintf(FERROR,"filename too long\n"); + close(fd1); + continue; + } 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,file->mode); + if (fd2 == -1 && relative_paths && errno == ENOENT && + create_directory_path(fnametmp) == 0) { + 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; @@ -631,10 +699,14 @@ int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen) 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; } } @@ -642,6 +714,7 @@ int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen) if (rename(fnametmp,fname) != 0) { fprintf(FERROR,"rename %s -> %s : %s\n", fnametmp,fname,strerror(errno)); + unlink(fnametmp); } cleanup_fname = NULL; @@ -651,10 +724,23 @@ int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen) 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->name || !S_ISDIR(file->mode)) continue; + recv_generator(file->name,flist,i,-1); + } + if (verbose > 2) fprintf(FERROR,"recv_files finished\n"); @@ -700,10 +786,11 @@ off_t send_files(struct file_list *flist,int f_out,int f_in) fname[0] = 0; if (file->dir) { - strcpy(fname,file->dir); + strncpy(fname,file->dir,MAXPATHLEN-1); + fname[MAXPATHLEN-1] = 0; strcat(fname,"/"); } - strcat(fname,file->name); + strncat(fname,file->name,MAXPATHLEN-strlen(fname)); if (verbose > 2) fprintf(FERROR,"send_files(%d,%s)\n",i,fname); @@ -731,6 +818,7 @@ off_t send_files(struct file_list *flist,int f_out,int f_in) /* map the local file */ if (fstat(fd,&st) != 0) { fprintf(FERROR,"fstat failed : %s\n",strerror(errno)); + close(fd); return -1; } @@ -794,18 +882,20 @@ void generate_files(int f,struct file_list *flist,char *local_name,int f_recv) for (i = 0; i < flist->count; i++) { struct file_struct *file = &flist->files[i]; + mode_t saved_mode = file->mode; 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; + + /* 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, flist,i,f); + + file->mode = saved_mode; } phase++; @@ -819,6 +909,8 @@ void generate_files(int f,struct file_list *flist,char *local_name,int f_recv) 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,