static char *flist_dir;
-void send_file_entry(struct file_struct *file,int f,unsigned base_flags)
+static void send_file_entry(struct file_struct *file,int f,unsigned base_flags)
{
unsigned char flags;
static time_t last_time;
-static void send_file_name(int f,struct file_list *flist,char *fname,
+void send_file_name(int f,struct file_list *flist,char *fname,
int recursive, unsigned base_flags)
{
struct file_struct *file;
}
p = fname + strlen(fname);
+ local_exclude_list = NULL;
+
if (cvs_exclude) {
if (strlen(fname) + strlen(".cvsignore") <= MAXPATHLEN-1) {
strcpy(p,".cvsignore");
send_file_name(f,flist,fname,recurse,0);
}
+ if (local_exclude_list) {
+ add_exclude_list("!", &local_exclude_list, 0);
+ }
+
closedir(d);
}
{
int i,l;
STRUCT_STAT st;
- char *p,*dir;
+ char *p,*dir,*olddir;
char lastpath[MAXPATHLEN]="";
struct file_list *flist;
int64 start_write;
}
dir = NULL;
+ olddir = NULL;
if (!relative_paths) {
p = strrchr(fname,'/');
fname = ".";
if (dir && *dir) {
- char *olddir = push_dir(dir, 1);
+ olddir = push_dir(dir, 1);
if (!olddir) {
io_error=1;
}
flist_dir = dir;
- if (one_file_system)
- set_filesystem(fname);
+ }
+
+ if (one_file_system)
+ set_filesystem(fname);
+
+ if (!recurse || !send_included_file_names(f,flist))
send_file_name(f,flist,fname,recurse,FLAG_DELETE);
+
+ if (olddir != NULL) {
flist_dir = NULL;
if (pop_dir(olddir) != 0) {
rprintf(FERROR,"pop_dir %s : %s\n",
dir,strerror(errno));
exit_cleanup(1);
}
- continue;
}
-
- if (one_file_system)
- set_filesystem(fname);
- send_file_name(f,flist,fname,recurse,FLAG_DELETE);
}
if (f != -1) {