extern int cvs_exclude;
+extern int recurse;
+
extern int one_file_system;
extern int make_backups;
extern int preserve_links;
-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;
-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;
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);
}
strcmp(di->d_name,"..")==0)
continue;
strcpy(p,di->d_name);
- send_file_name(f,flist,1,fname);
+ send_file_name(f,flist,fname);
}
closedir(d);
-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;
char dbuf[MAXPATHLEN];
struct file_list *flist;
- if (verbose && recurse) {
+ if (verbose && recurse && !am_server) {
fprintf(FINFO,"building file list ... ");
fflush(FINFO);
}
p = strrchr(fname,'/');
if (p) {
*p = 0;
- dir = fname;
+ if (p == fname)
+ dir = "/";
+ else
+ dir = fname;
fname = p+1;
}
if (!*fname)
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));
if (one_file_system)
set_filesystem(fname);
- send_file_name(f,flist,recurse,fname);
+ send_file_name(f,flist,fname);
}
if (f != -1) {
write_flush(f);
}
- if (verbose && recurse)
+ if (verbose && recurse && !am_server)
fprintf(FINFO,"done\n");
clean_flist(flist);
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)
clean_flist(flist);
+ if (verbose && recurse && !am_server) {
+ fprintf(FINFO,"done\n");
+ }
+
return flist;
oom: