- DIR *d;
- struct dirent *di;
- char fname[MAXPATHLEN];
- int l;
- char *p;
-
- d = opendir(dir);
- if (!d) {
- fprintf(FERROR,"%s: %s\n",
- dir,strerror(errno));
- return;
- }
-
- strncpy(fname,dir,MAXPATHLEN-1);
- fname[MAXPATHLEN-1]=0;
- l = strlen(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) {
- 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+1));
- send_file_name(f,flist,fname);
- }
-
- closedir(d);
-}
-
-
-
-struct file_list *send_file_list(int f,int argc,char *argv[])
-{
- int i,l;
- struct stat st;
- char *p,*dir;
- char dbuf[MAXPATHLEN];
- struct file_list *flist;
-
- if (verbose && recurse && !am_server && f != -1) {
- fprintf(FINFO,"building file list ... ");
- fflush(FINFO);
- }
-
- flist = (struct file_list *)malloc(sizeof(flist[0]));
- if (!flist) out_of_memory("send_file_list");
-
- flist->count=0;
- flist->malloced = 100;
- flist->files = (struct file_struct *)malloc(sizeof(flist->files[0])*
- flist->malloced);
- if (!flist->files) out_of_memory("send_file_list");
-
- for (i=0;i<argc;i++) {
- char fname2[MAXPATHLEN];
- char *fname = fname2;
-
- strncpy(fname,argv[i],MAXPATHLEN-1);
- fname[MAXPATHLEN-1] = 0;
-
- l = strlen(fname);
- if (l != 1 && fname[l-1] == '/') {
- strcat(fname,".");
- }
-
- if (link_stat(fname,&st) != 0) {
- fprintf(FERROR,"%s : %s\n",fname,strerror(errno));
- continue;
- }
-
- if (S_ISDIR(st.st_mode) && !recurse) {
- fprintf(FERROR,"skipping directory %s\n",fname);
- continue;
- }
-
- dir = NULL;
-
- if (!relative_paths) {
- p = strrchr(fname,'/');
- if (p) {
- *p = 0;
- if (p == fname)
- dir = "/";
- else
- dir = fname;
- fname = p+1;
- }
- }
-
- if (!*fname)
- fname = ".";
-
- if (dir && *dir) {
- if (getcwd(dbuf,MAXPATHLEN-1) == NULL) {
- fprintf(FERROR,"getwd : %s\n",strerror(errno));
- exit_cleanup(1);
- }
- if (chdir(dir) != 0) {
- fprintf(FERROR,"chdir %s : %s\n",dir,strerror(errno));
- continue;
- }
- flist_dir = dir;
- if (one_file_system)
- set_filesystem(fname);
- send_file_name(f,flist,fname);
- flist_dir = NULL;
- if (chdir(dbuf) != 0) {
- fprintf(FERROR,"chdir %s : %s\n",dbuf,strerror(errno));
- exit_cleanup(1);
- }
- continue;
- }
-
- if (one_file_system)
- set_filesystem(fname);
- send_file_name(f,flist,fname);
- }
-
- if (f != -1) {
- send_file_entry(NULL,f);
- write_flush(f);
- }
-
- if (verbose && recurse && !am_server && f != -1)
- fprintf(FINFO,"done\n");
+ int l;
+ STRUCT_STAT st;
+ char *p, *dir, olddir[sizeof curr_dir];
+ char lastpath[MAXPATHLEN] = "";
+ struct file_list *flist;
+ int64 start_write;
+ int use_ff_fd = 0;
+
+ if (show_filelist_p() && f != -1)
+ start_filelist_progress("building file list");
+
+ start_write = stats.total_written;
+
+ flist = flist_new();
+
+ if (f != -1) {
+ io_start_buffering_out(f);
+ if (filesfrom_fd >= 0) {
+ if (argv[0] && !push_dir(argv[0])) {
+ rprintf(FERROR, "push_dir %s failed: %s\n",
+ full_fname(argv[0]), strerror(errno));
+ exit_cleanup(RERR_FILESELECT);
+ }
+ use_ff_fd = 1;
+ }
+ }
+
+ while (1) {
+ char fname2[MAXPATHLEN];
+ char *fname = fname2;
+
+ if (use_ff_fd) {
+ if (read_filesfrom_line(filesfrom_fd, fname) == 0)
+ break;
+ sanitize_path(fname, NULL);
+ } else {
+ if (argc-- == 0)
+ break;
+ strlcpy(fname, *argv++, MAXPATHLEN);
+ if (sanitize_paths)
+ sanitize_path(fname, NULL);
+ }
+
+ l = strlen(fname);
+ if (fname[l - 1] == '/') {
+ if (l == 2 && fname[0] == '.') {
+ /* Turn "./" into just "." rather than "./." */
+ fname[1] = '\0';
+ } else if (l < MAXPATHLEN) {
+ fname[l++] = '.';
+ fname[l] = '\0';
+ }
+ }
+
+ if (link_stat(fname, &st) != 0) {
+ if (f != -1) {
+ io_error |= IOERR_GENERAL;
+ rprintf(FERROR, "link_stat %s failed: %s\n",
+ full_fname(fname), strerror(errno));
+ }
+ continue;
+ }
+
+ if (S_ISDIR(st.st_mode) && !recurse && !files_from) {
+ rprintf(FINFO, "skipping directory %s\n", fname);
+ continue;
+ }