static void clean_flist(struct file_list *flist, int strip_root);
-struct string_area *string_area_new(int size)
+static struct string_area *string_area_new(int size)
{
struct string_area *a;
a->current = a->base = malloc(size);
if (!a->current) out_of_memory("string_area_new buffer");
a->end = a->base + size;
- a->next = 0;
+ a->next = NULL;
return a;
}
-void string_area_free(struct string_area *a)
+static void string_area_free(struct string_area *a)
{
struct string_area *next;
}
}
-char *string_area_malloc(struct string_area **ap, int size)
+static char *string_area_malloc(struct string_area **ap, int size)
{
char *p;
struct string_area *a;
return p;
}
-char *string_area_strdup(struct string_area **ap, const char *src)
+static char *string_area_strdup(struct string_area **ap, const char *src)
{
char* dest = string_area_malloc(ap, strlen(src) + 1);
return strcpy(dest, src);
static int match_file_name(char *fname,STRUCT_STAT *st)
{
if (check_exclude(fname,local_exclude_list,st)) {
- if (verbose > 2)
- rprintf(FINFO,"excluding file %s\n",fname);
return 0;
}
return 1;
#define MALLOC(ap, i) (ap ? string_area_malloc(ap, i) : malloc(i))
/* create a file_struct for a named file */
-struct file_struct *make_file(int f, char *fname, struct string_area **ap)
+struct file_struct *make_file(int f, char *fname, struct string_area **ap,
+ int noexcludes)
{
struct file_struct *file;
STRUCT_STAT st;
char cleaned_name[MAXPATHLEN];
char linkbuf[MAXPATHLEN];
extern int delete_excluded;
+ extern int module_id;
strlcpy(cleaned_name, fname, MAXPATHLEN);
cleaned_name[MAXPATHLEN-1] = 0;
return NULL;
}
+ /* we use noexcludes from backup.c */
+ if (noexcludes) goto skip_excludes;
+
if (S_ISDIR(st.st_mode) && !recurse) {
rprintf(FINFO,"skipping directory %s\n",fname);
return NULL;
/* f is set to -1 when calculating deletion file list */
if (((f != -1) || !delete_excluded) && !match_file_name(fname,&st))
return NULL;
-
+
+
+ if (lp_ignore_nonreadable(module_id) && access(fname, R_OK) != 0)
+ return NULL;
+
+ skip_excludes:
+
if (verbose > 2)
rprintf(FINFO,"make_file(%d,%s)\n",f,fname);
if (lastdir && strcmp(fname, lastdir)==0) {
file->dirname = lastdir;
} else {
- file->dirname = STRDUP(ap, fname);
+ file->dirname = strdup(fname);
lastdir = file->dirname;
}
file->basename = STRDUP(ap, p+1);
if (lastdir && strcmp(lastdir, flist_dir)==0) {
file->basedir = lastdir;
} else {
- file->basedir = STRDUP(ap, flist_dir);
+ file->basedir = strdup(flist_dir);
lastdir = file->basedir;
}
} else {
{
struct file_struct *file;
- file = make_file(f,fname, &flist->string_area);
+ file = make_file(f,fname, &flist->string_area, 0);
if (!file) return;
if (verbose && recurse && !am_server && f != -1) {
rprintf(FINFO,"building file list ... ");
+ if (verbose > 1)
+ rprintf(FINFO, "\n");
rflush(FINFO);
}
#if ARENA_SIZE > 0
flist->string_area = string_area_new(0);
#else
- flist->string_area = 0;
+ flist->string_area = NULL;
#endif
return flist;
}