X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Ffile_glob.c;h=a2e903105c2a5214a183596ba679b224c59b943f;hp=3a5def25ec550896938d6f7ea33ec1831691a006;hb=7fc72f3ae149e416a297ef1f55c09271056e98f1;hpb=b9e9e8e2196e0081d4814c50cdd02c18911bcf29 diff --git a/src/file_glob.c b/src/file_glob.c index 3a5def2..a2e9031 100644 --- a/src/file_glob.c +++ b/src/file_glob.c @@ -1,5 +1,5 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2013 Index Data + * Copyright (C) Index Data * See the file LICENSE for details. */ @@ -31,6 +31,7 @@ struct res_entry { struct glob_res { NMEM nmem; + unsigned flags; size_t number_of_entries; struct res_entry **last_entry; struct res_entry *entries; @@ -68,7 +69,8 @@ static void glob_r(yaz_glob_res_t res, const char *pattern, size_t off, glob_r(res, pattern, i, prefix); prefix[prefix_len] = '\0'; } - else if (!is_pattern && !pattern[i]) + else if ((res->flags & YAZ_FILE_GLOB_FAIL_NOTEXIST) && + !is_pattern && !pattern[i]) { strcpy(prefix + prefix_len, pattern + off); add_entry(res, prefix); @@ -138,11 +140,17 @@ static void sort_them(yaz_glob_res_t res) int yaz_file_glob(const char *pattern, yaz_glob_res_t *res) { + return yaz_file_glob2(pattern, res, 0); +} + +int yaz_file_glob2(const char *pattern, yaz_glob_res_t *res, unsigned flags) +{ char prefix[FILENAME_MAX+1]; NMEM nmem = nmem_create(); *prefix = '\0'; *res = nmem_malloc(nmem, sizeof(**res)); + (*res)->flags = flags; (*res)->number_of_entries = 0; (*res)->nmem = nmem; (*res)->entries = 0;