X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/13a1f7929ed05c652dc1b3eb4489ced01c8616f1..ec0e5ac001843c24d58073447842c2b89b38bf96:/flist.c diff --git a/flist.c b/flist.c index d298db1d..d438400a 100644 --- a/flist.c +++ b/flist.c @@ -42,12 +42,27 @@ extern int preserve_uid; extern int preserve_gid; extern int preserve_times; extern int relative_paths; +extern int copy_links; +extern int remote_version; static char **local_exclude_list = NULL; static void clean_fname(char *name); +int link_stat(const char *Path, struct stat *Buffer) +{ +#if SUPPORT_LINKS + if (copy_links) { + return stat(Path, Buffer); + } else { + return lstat(Path, Buffer); + } +#else + return stat(Path, Buffer); +#endif +} + /* This function is used to check if a file should be included/excluded from the list of files based on its name and type etc @@ -68,7 +83,7 @@ static dev_t filesystem_dev; static void set_filesystem(char *fname) { struct stat st; - if (lstat(fname,&st) != 0) return; + if (link_stat(fname,&st) != 0) return; filesystem_dev = st.st_dev; } @@ -128,10 +143,14 @@ void send_file_entry_v11(struct file_struct *file,int f) write_int(f,(int)file->modtime); if (!(flags & SAME_MODE)) write_int(f,(int)file->mode); - if (preserve_uid && !(flags & SAME_UID)) - write_int(f,(int)file->uid); - if (preserve_gid && !(flags & SAME_GID)) - write_int(f,(int)file->gid); + if (preserve_uid && !(flags & SAME_UID)) { + add_uid(file->uid); + write_int(f,(int)file->uid); + } + if (preserve_gid && !(flags & SAME_GID)) { + add_gid(file->gid); + write_int(f,(int)file->gid); + } if (preserve_devices && IS_DEVICE(file->mode) && !(flags & SAME_RDEV)) write_int(f,(int)file->rdev); @@ -187,7 +206,7 @@ void receive_file_entry_v11(struct file_struct *file, bzero((char *)file,sizeof(*file)); file->name = (char *)malloc(l1+l2+1); - if (!file->name) out_of_memory("receive_file_entry"); + if (!file->name) out_of_memory("receive_file_entry 1"); strncpy(file->name,lastname,l1); read_buf(f,file->name+l1,l2); @@ -203,15 +222,13 @@ void receive_file_entry_v11(struct file_struct *file, if (preserve_devices && IS_DEVICE(file->mode)) file->rdev = (flags & SAME_RDEV) ? last_rdev : (dev_t)read_int(f); -#if SUPPORT_LINKS if (preserve_links && S_ISLNK(file->mode)) { int l = read_int(f); file->link = (char *)malloc(l+1); - if (!file->link) out_of_memory("receive_file_entry"); + if (!file->link) out_of_memory("receive_file_entry 2"); read_buf(f,file->link,l); file->link[l] = 0; } -#endif #if SUPPORT_HARD_LINKS if (preserve_hard_links && S_ISREG(file->mode)) { @@ -243,7 +260,7 @@ static struct file_struct *make_file(char *fname) bzero(sum,SUM_LENGTH); - if (lstat(fname,&st) != 0) { + if (link_stat(fname,&st) != 0) { fprintf(FERROR,"%s: %s\n", fname,strerror(errno)); return NULL; @@ -360,20 +377,31 @@ static void send_directory(int f,struct file_list *flist,char *dir) strncpy(fname,dir,MAXPATHLEN-1); fname[MAXPATHLEN-1]=0; l = strlen(fname); - if (fname[l-1] != '/') - strcat(fname,"/"); + if (fname[l-1] != '/') { + if (l == MAXPATHLEN-1) { + fprintf(FERROR,"skipping long-named directory %s\n",fname); + closedir(d); + return; + } + strcat(fname,"/"); + l++; + } p = fname + strlen(fname); if (cvs_exclude) { - strcpy(p,".cvsignore"); - local_exclude_list = make_exclude_list(fname,NULL,0); + if (strlen(fname) + strlen(".cvsignore") <= MAXPATHLEN-1) { + strcpy(p,".cvsignore"); + local_exclude_list = make_exclude_list(fname,NULL,0); + } else { + fprintf(FERROR,"cannot cvs-exclude in long-named directory %s\n",fname); + } } for (di=readdir(d); di; di=readdir(d)) { if (strcmp(di->d_name,".")==0 || strcmp(di->d_name,"..")==0) continue; - strncpy(p,di->d_name,MAXPATHLEN-l); + strncpy(p,di->d_name,MAXPATHLEN-(l+1)); send_file_name(f,flist,fname); } @@ -390,7 +418,7 @@ struct file_list *send_file_list(int f,int argc,char *argv[]) char dbuf[MAXPATHLEN]; struct file_list *flist; - if (verbose && recurse && !am_server) { + if (verbose && recurse && !am_server && f != -1) { fprintf(FINFO,"building file list ... "); fflush(FINFO); } @@ -416,7 +444,7 @@ struct file_list *send_file_list(int f,int argc,char *argv[]) strcat(fname,"."); } - if (lstat(fname,&st) != 0) { + if (link_stat(fname,&st) != 0) { fprintf(FERROR,"%s : %s\n",fname,strerror(errno)); continue; } @@ -474,11 +502,16 @@ struct file_list *send_file_list(int f,int argc,char *argv[]) write_flush(f); } - if (verbose && recurse && !am_server) + if (verbose && recurse && !am_server && f != -1) fprintf(FINFO,"done\n"); clean_flist(flist); + /* now send the uid/gid list. This was introduced in protocol version 15 */ + if (f != -1 && remote_version >= 15) { + send_uid_list(f); + } + return flist; } @@ -541,6 +574,11 @@ struct file_list *recv_file_list(int f) fprintf(FINFO,"done\n"); } + /* now recv the uid/gid list. This was introduced in protocol version 15 */ + if (f != -1 && remote_version >= 15) { + recv_uid_list(f, flist); + } + return flist; oom: @@ -560,20 +598,24 @@ int file_compare(struct file_struct *f1,struct file_struct *f2) int flist_find(struct file_list *flist,struct file_struct *f) { - int low=0,high=flist->count-1; - - while (low != high) { - int mid = (low+high)/2; - int ret = file_compare(&flist->files[mid],f); - if (ret == 0) return mid; - if (ret > 0) - high=mid; - else - low=mid+1; - } - if (file_compare(&flist->files[low],f) == 0) - return low; - return -1; + int low=0,high=flist->count-1; + + if (flist->count <= 0) return -1; + + while (low != high) { + int mid = (low+high)/2; + int ret = file_compare(&flist->files[flist_up(flist, mid)],f); + if (ret == 0) return flist_up(flist, mid); + if (ret > 0) { + high=mid; + } else { + low=mid+1; + } + } + + if (file_compare(&flist->files[flist_up(flist,low)],f) == 0) + return flist_up(flist,low); + return -1; } @@ -606,10 +648,9 @@ static void clean_fname(char *name) if (strncmp(p=name,"./",2) == 0) { modified = 1; - while (*p) { + do { p[0] = p[2]; - p++; - } + } while (*p++); } l = strlen(p=name);