X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/dc5ddbccace1f4f37d57ce5d961117effc28a356..3b3a2fbcf058b90d9116f48ba26ad9528d450134:/flist.c diff --git a/flist.c b/flist.c index 38569aa1..40158fae 100644 --- a/flist.c +++ b/flist.c @@ -30,6 +30,8 @@ extern off_t total_size; extern int cvs_exclude; +extern int recurse; + extern int one_file_system; extern int make_backups; extern int preserve_links; @@ -39,12 +41,27 @@ extern int preserve_devices; extern int preserve_uid; extern int preserve_gid; extern int preserve_times; +extern int relative_paths; +extern int copy_links; 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 @@ -65,7 +82,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; } @@ -110,7 +127,7 @@ void send_file_entry_v11(struct file_struct *file,int f) if (l1 > 0) flags |= SAME_NAME; if (l2 > 255) flags |= LONG_NAME; - + write_byte(f,flags); if (flags & SAME_NAME) write_byte(f,l1); @@ -156,8 +173,8 @@ void send_file_entry_v11(struct file_struct *file,int f) last_gid = file->gid; last_time = file->modtime; - strcpy(lastname,file->name); - lastname[255] = 0; + strncpy(lastname,file->name,MAXPATHLEN-1); + lastname[MAXPATHLEN-1] = 0; } @@ -165,7 +182,7 @@ void send_file_entry_v11(struct file_struct *file,int f) void receive_file_entry_v11(struct file_struct *file, unsigned char flags,int f) { - static mode_t last_time=0; + static time_t last_time=0; static mode_t last_mode=0; static dev_t last_rdev=0; static uid_t last_uid=0; @@ -184,7 +201,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); @@ -200,15 +217,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)) { @@ -226,13 +241,13 @@ void receive_file_entry_v11(struct file_struct *file, last_gid = file->gid; last_time = file->modtime; - strcpy(lastname,file->name); - lastname[255] = 0; + strncpy(lastname,file->name,MAXPATHLEN-1); + lastname[MAXPATHLEN-1] = 0; } -static struct file_struct *make_file(int recurse,char *fname) +static struct file_struct *make_file(char *fname) { static struct file_struct file; struct stat st; @@ -240,7 +255,7 @@ static struct file_struct *make_file(int recurse,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; @@ -304,25 +319,27 @@ static struct file_struct *make_file(int recurse,char *fname) -static void send_file_name(int f,struct file_list *flist, - int recurse,char *fname) +static void send_file_name(int f,struct file_list *flist,char *fname) { struct file_struct *file; - file = make_file(recurse,fname); + file = make_file(fname); if (!file) return; if (flist->count >= flist->malloced) { - flist->malloced += 100; - flist->files = (struct file_struct *)realloc(flist->files, - sizeof(flist->files[0])* - flist->malloced); - if (!flist->files) - out_of_memory("send_file_name"); + if (flist->malloced < 100) + flist->malloced += 100; + else + flist->malloced *= 1.8; + flist->files = (struct file_struct *)realloc(flist->files, + sizeof(flist->files[0])* + flist->malloced); + if (!flist->files) + out_of_memory("send_file_name"); } - if (strcmp(file->name,".") && strcmp(file->name,"/")) { + if (strcmp(file->name,"/")) { flist->files[flist->count++] = *file; send_file_entry(file,f); } @@ -352,23 +369,35 @@ static void send_directory(int f,struct file_list *flist,char *dir) return; } - strcpy(fname,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; - strcpy(p,di->d_name); - send_file_name(f,flist,1,fname); + strncpy(p,di->d_name,MAXPATHLEN-(l+1)); + send_file_name(f,flist,fname); } closedir(d); @@ -376,7 +405,7 @@ static void send_directory(int f,struct file_list *flist,char *dir) -struct file_list *send_file_list(int f,int recurse,int argc,char *argv[]) +struct file_list *send_file_list(int f,int argc,char *argv[]) { int i,l; struct stat st; @@ -384,7 +413,7 @@ struct file_list *send_file_list(int f,int recurse,int argc,char *argv[]) char dbuf[MAXPATHLEN]; struct file_list *flist; - if (verbose && recurse) { + if (verbose && recurse && !am_server && f != -1) { fprintf(FINFO,"building file list ... "); fflush(FINFO); } @@ -402,14 +431,15 @@ struct file_list *send_file_list(int f,int recurse,int argc,char *argv[]) char fname2[MAXPATHLEN]; char *fname = fname2; - strcpy(fname,argv[i]); + strncpy(fname,argv[i],MAXPATHLEN-1); + fname[MAXPATHLEN-1] = 0; l = strlen(fname); if (l != 1 && fname[l-1] == '/') { strcat(fname,"."); } - if (lstat(fname,&st) != 0) { + if (link_stat(fname,&st) != 0) { fprintf(FERROR,"%s : %s\n",fname,strerror(errno)); continue; } @@ -420,12 +450,19 @@ struct file_list *send_file_list(int f,int recurse,int argc,char *argv[]) } dir = NULL; - p = strrchr(fname,'/'); - if (p) { - *p = 0; - dir = fname; - fname = p+1; + + if (!relative_paths) { + p = strrchr(fname,'/'); + if (p) { + *p = 0; + if (p == fname) + dir = "/"; + else + dir = fname; + fname = p+1; + } } + if (!*fname) fname = "."; @@ -441,7 +478,7 @@ struct file_list *send_file_list(int f,int recurse,int argc,char *argv[]) flist_dir = dir; if (one_file_system) set_filesystem(fname); - send_file_name(f,flist,recurse,fname); + send_file_name(f,flist,fname); flist_dir = NULL; if (chdir(dbuf) != 0) { fprintf(FERROR,"chdir %s : %s\n",dbuf,strerror(errno)); @@ -452,7 +489,7 @@ struct file_list *send_file_list(int f,int recurse,int argc,char *argv[]) if (one_file_system) set_filesystem(fname); - send_file_name(f,flist,recurse,fname); + send_file_name(f,flist,fname); } if (f != -1) { @@ -460,7 +497,7 @@ struct file_list *send_file_list(int f,int recurse,int argc,char *argv[]) write_flush(f); } - if (verbose && recurse) + if (verbose && recurse && !am_server && f != -1) fprintf(FINFO,"done\n"); clean_flist(flist); @@ -474,8 +511,10 @@ struct file_list *recv_file_list(int f) struct file_list *flist; unsigned char flags; - if (verbose > 2) - fprintf(FERROR,"recv_file_list starting\n"); + if (verbose && recurse && !am_server) { + fprintf(FINFO,"receiving file list ... "); + fflush(FINFO); + } flist = (struct file_list *)malloc(sizeof(flist[0])); if (!flist) @@ -493,12 +532,15 @@ struct file_list *recv_file_list(int f) int i = flist->count; if (i >= flist->malloced) { - flist->malloced += 100; - flist->files =(struct file_struct *)realloc(flist->files, - sizeof(flist->files[0])* - flist->malloced); - if (!flist->files) - goto oom; + if (flist->malloced < 100) + flist->malloced += 100; + else + flist->malloced *= 1.8; + flist->files =(struct file_struct *)realloc(flist->files, + sizeof(flist->files[0])* + flist->malloced); + if (!flist->files) + goto oom; } receive_file_entry(&flist->files[i],flags,f); @@ -518,6 +560,10 @@ struct file_list *recv_file_list(int f) clean_flist(flist); + if (verbose && recurse && !am_server) { + fprintf(FINFO,"done\n"); + } + return flist; oom: @@ -537,20 +583,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; - - 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; } @@ -583,10 +633,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);