Archives/pixz
2
0
Fork 0
mirror of https://github.com/vasi/pixz synced 2024-11-18 15:26:46 +00:00
Code Issues Projects Releases Wiki Activity

Extrac spec-matching into function

Browse Source
This commit is contained in:
Dave Vasilevsky 2010-10-13 12:53:05 -04:00
parent 6f83d58d51
commit 557cae0350
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pread.c
View File

@ -26,6 +26,7 @@ struct wanted_t {
static wanted_t *gWantedFiles = NULL;
static bool spec_match(char *spec, char *name);
static void wanted_files(size_t count, char **specs);
static void wanted_free(wanted_t *w);
@ -166,6 +167,18 @@ static void wanted_free(wanted_t *w) {
}
}
static bool spec_match(char *spec, char *name) {
bool match = true;
for (; *spec; ++spec, ++name) {
if (!*name || *spec != *name) { // spec must be equal or prefix
match = false;
break;
}
}
// If spec's a prefix of the file name, it must be a dir name
return match && (!*name || *name == '/');
}
static void wanted_files(size_t count, char **specs) {
if (count == 0) {
gWantedFiles = NULL;
@ -188,17 +201,7 @@ static void wanted_files(size_t count, char **specs) {
// Check each file in order, to see if we want it
for (file_index_t *f = gFileIndex; f->name; f = f->next) {
for (char **spec = specs; spec < specs + count; ++spec) {
char *sc, *nc;
bool match = true;
for (sc = *spec, nc = f->name; *sc; ++sc, ++nc) {
if (!*nc || *sc != *nc) { // spec must be equal or prefix
match = false;
break;
}
}
// If spec's a prefix of the file name, it must be a dir name
if (match && (!*nc || *nc == '/')) {
// Ok, add the file
if (spec_match(*spec, f->name)) {
wanted_t *w = malloc(sizeof(wanted_t));
*w = (wanted_t){ .name = f->name, .start = f->offset,
.end = f->next->offset, .next = NULL };