9fc42d6091
The way things are set up, you can now pass a "pathspec" to the "read_directory()" function. If you pass NULL, it acts exactly like it used to do (read everything). If you pass a non-NULL pointer, it will simplify it into a "these are the prefixes without any special characters", and stop any readdir() early if the path in question doesn't match any of the prefixes. NOTE! This does *not* obviate the need for the caller to do the *exact* pathspec match later. It's a first-level filter on "read_directory()", but it does not do the full pathspec thing. Maybe it should. But in the meantime, builtin-add.c really does need to do first read_directory(dir, .., pathspec); if (pathspec) prune_directory(dir, pathspec, baselen); ie the "prune_directory()" part will do the *exact* pathspec pruning, while the "read_directory()" will use the pathspec just to do some quick high-level pruning of the directories it will recurse into. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
63 lines
1.7 KiB
C
63 lines
1.7 KiB
C
#ifndef DIR_H
|
|
#define DIR_H
|
|
|
|
/*
|
|
* We maintain three exclude pattern lists:
|
|
* EXC_CMDL lists patterns explicitly given on the command line.
|
|
* EXC_DIRS lists patterns obtained from per-directory ignore files.
|
|
* EXC_FILE lists patterns from fallback ignore files.
|
|
*/
|
|
#define EXC_CMDL 0
|
|
#define EXC_DIRS 1
|
|
#define EXC_FILE 2
|
|
|
|
|
|
struct dir_entry {
|
|
unsigned int ignored : 1;
|
|
unsigned int ignored_dir : 1;
|
|
unsigned int len : 30;
|
|
char name[FLEX_ARRAY]; /* more */
|
|
};
|
|
|
|
struct exclude_list {
|
|
int nr;
|
|
int alloc;
|
|
struct exclude {
|
|
const char *pattern;
|
|
const char *base;
|
|
int baselen;
|
|
} **excludes;
|
|
};
|
|
|
|
struct dir_struct {
|
|
int nr, alloc;
|
|
unsigned int show_ignored:1,
|
|
show_other_directories:1,
|
|
hide_empty_directories:1;
|
|
struct dir_entry **entries;
|
|
|
|
/* Exclude info */
|
|
const char *exclude_per_dir;
|
|
struct exclude_list exclude_list[3];
|
|
};
|
|
|
|
extern int common_prefix(const char **pathspec);
|
|
|
|
#define MATCHED_RECURSIVELY 1
|
|
#define MATCHED_FNMATCH 2
|
|
#define MATCHED_EXACTLY 3
|
|
extern int match_pathspec(const char **pathspec, const char *name, int namelen, int prefix, char *seen);
|
|
|
|
extern int read_directory(struct dir_struct *, const char *path, const char *base, int baselen, const char **pathspec);
|
|
extern int push_exclude_per_directory(struct dir_struct *, const char *, int);
|
|
extern void pop_exclude_per_directory(struct dir_struct *, int);
|
|
|
|
extern int excluded(struct dir_struct *, const char *);
|
|
extern void add_excludes_from_file(struct dir_struct *, const char *fname);
|
|
extern void add_exclude(const char *string, const char *base,
|
|
int baselen, struct exclude_list *which);
|
|
extern int file_exists(const char *);
|
|
extern struct dir_entry *dir_add_name(struct dir_struct *dir, const char *pathname, int len);
|
|
|
|
#endif
|