#include "find.h"
-int32_t name_max; /* filename max length */
-int32_t path_max; /* path name max length */
+int32_t name_max; /* filename max length */
+int32_t path_max; /* path name max length */
/* ****FIXME**** debug until stable */
#undef bmalloc
#define bmalloc(x) sm_malloc(__FILE__, __LINE__, x)
-static void set_options(FF_PKT *ff, const char *opts);
static int our_callback(FF_PKT *ff, void *hpkt);
static bool accept_file(FF_PKT *ff);
*/
FF_PKT *init_find_files()
{
- FF_PKT *ff;
+ FF_PKT *ff;
ff = (FF_PKT *)bmalloc(sizeof(FF_PKT));
memset(ff, 0, sizeof(FF_PKT));
ff->sys_fname = get_pool_memory(PM_FNAME);
- init_include_exclude_files(ff); /* init lists */
+ init_include_exclude_files(ff); /* init lists */
/* Get system path and filename maximum lengths */
path_max = pathconf(".", _PC_PATH_MAX);
if (name_max < 1024) {
name_max = 1024;
}
- path_max++; /* add for EOS */
- name_max++; /* add for EOS */
+ path_max++; /* add for EOS */
+ name_max++; /* add for EOS */
Dmsg1(100, "init_find_files ff=%p\n", ff);
return ff;
findFILESET *fileset = ff->fileset;
if (fileset) {
int i, j;
+ ff->flags = 0;
+ ff->VerifyOpts[0] = 0;
for (i=0; i<fileset->include_list.size(); i++) {
- findINCEXE *incexe = (findINCEXE *)fileset->include_list.get(i);
- fileset->incexe = incexe;
- /*
- * By setting all options, we in effect or the global options
- * which is what we want.
- */
- for (j=0; j<incexe->opts_list.size(); j++) {
- findFOPTS *fo = (findFOPTS *)incexe->opts_list.get(j);
- Dmsg1(400, "Find global options O %s\n", fo->opts);
- set_options(ff, fo->opts);
- }
- for (j=0; j<incexe->name_list.size(); j++) {
+ findINCEXE *incexe = (findINCEXE *)fileset->include_list.get(i);
+ fileset->incexe = incexe;
+ /*
+ * By setting all options, we in effect or the global options
+ * which is what we want.
+ */
+ for (j=0; j<incexe->opts_list.size(); j++) {
+ findFOPTS *fo = (findFOPTS *)incexe->opts_list.get(j);
+ ff->flags |= fo->flags;
+ ff->GZIP_level = fo->GZIP_level;
+ bstrncpy(ff->VerifyOpts, fo->VerifyOpts, sizeof(ff->VerifyOpts));
+ }
+ for (j=0; j<incexe->name_list.size(); j++) {
Dmsg1(400, "F %s\n", (char *)incexe->name_list.get(j));
- char *fname = (char *)incexe->name_list.get(j);
- if (!find_one_file(jcr, ff, our_callback, his_pkt, fname, (dev_t)-1, 1)) {
- return 0; /* error return */
- }
- }
+ char *fname = (char *)incexe->name_list.get(j);
+ if (!find_one_file(jcr, ff, our_callback, his_pkt, fname, (dev_t)-1, 1)) {
+ return 0; /* error return */
+ }
+ }
}
} else {
struct s_included_file *inc = NULL;
/* This is the old deprecated way */
while (!job_canceled(jcr) && (inc = get_next_included_file(ff, inc))) {
- /* Copy options for this file */
- bstrncpy(ff->VerifyOpts, inc->VerifyOpts, sizeof(ff->VerifyOpts));
+ /* Copy options for this file */
+ bstrncpy(ff->VerifyOpts, inc->VerifyOpts, sizeof(ff->VerifyOpts));
Dmsg1(50, "find_files: file=%s\n", inc->fname);
- if (!file_is_excluded(ff, inc->fname)) {
- if (!find_one_file(jcr, ff, callback, his_pkt, inc->fname, (dev_t)-1, 1)) {
- return 0; /* error return */
- }
- }
+ if (!file_is_excluded(ff, inc->fname)) {
+ if (!find_one_file(jcr, ff, callback, his_pkt, inc->fname, (dev_t)-1, 1)) {
+ return 0; /* error return */
+ }
+ }
}
}
return 1;
for (j=0; j<incexe->opts_list.size(); j++) {
findFOPTS *fo = (findFOPTS *)incexe->opts_list.get(j);
for (k=0; k<fo->wild.size(); k++) {
-
+ if (fnmatch((char *)fo->wild.get(k), ff->fname, 0) == 0) {
+ ff->flags = fo->flags;
+ ff->GZIP_level = fo->GZIP_level;
+ if (ff->flags & FO_EXCLUDE) {
+ return false; /* reject file */
+ }
+ return true; /* accept file */
+ }
}
}
for (i=0; i<fileset->exclude_list.size(); i++) {
findINCEXE *incexe = (findINCEXE *)fileset->exclude_list.get(i);
for (j=0; j<incexe->opts_list.size(); j++) {
- findFOPTS *fo = (findFOPTS *)incexe->opts_list.get(j);
- for (k=0; k<fo->wild.size(); k++) {
- Dmsg1(400, "W %s\n", (char *)fo->wild.get(k));
- if (fnmatch((char *)fo->wild.get(k), ff->fname, FNM_PATHNAME) == 0) {
- Dmsg1(000, "Reject wild: %s\n", ff->fname);
- return false; /* reject file */
- }
- }
+ findFOPTS *fo = (findFOPTS *)incexe->opts_list.get(j);
+ for (k=0; k<fo->wild.size(); k++) {
+ if (fnmatch((char *)fo->wild.get(k), ff->fname, 0) == 0) {
+ Dmsg1(400, "Reject wild1: %s\n", ff->fname);
+ return false; /* reject file */
+ }
+ }
}
for (j=0; j<incexe->name_list.size(); j++) {
- Dmsg1(400, "F %s\n", (char *)incexe->name_list.get(j));
- if (fnmatch((char *)incexe->name_list.get(j), ff->fname, FNM_PATHNAME) == 0) {
- Dmsg1(000, "Reject: %s\n", ff->fname);
- return false; /* reject file */
- }
+ if (fnmatch((char *)incexe->name_list.get(j), ff->fname, 0) == 0) {
+ Dmsg1(400, "Reject wild2: %s\n", ff->fname);
+ return false; /* reject file */
+ }
}
}
- Dmsg1(000, "Accept: %s\n", ff->fname);
return true;
}
case FT_NORECURSE:
case FT_NOFSCHG:
case FT_NOOPEN:
- Dmsg1(000, "File=%s\n", ff->fname);
return ff->callback(ff, hpkt);
/* These items can be filtered */
case FT_DIREND:
case FT_SPEC:
if (accept_file(ff)) {
- return ff->callback(ff, hpkt);
+ return ff->callback(ff, hpkt);
} else {
- return 0;
+ return 0;
}
- }
+ }
return 0;
}
-/*
- * As an optimization, we should do this during
- * "compile" time in filed/job.c, and keep only a bit mask
- * and the Verify options.
- */
-static void set_options(FF_PKT *ff, const char *opts)
-{
- int j;
- const char *p;
-
- for (p=opts; *p; p++) {
- switch (*p) {
- case 'a': /* alway replace */
- case '0': /* no option */
- break;
- case 'e':
- ff->flags |= FO_EXCLUDE;
- break;
- case 'f':
- ff->flags |= FO_MULTIFS;
- break;
- case 'h': /* no recursion */
- ff->flags |= FO_NO_RECURSION;
- break;
- case 'M': /* MD5 */
- ff->flags |= FO_MD5;
- break;
- case 'n':
- ff->flags |= FO_NOREPLACE;
- break;
- case 'p': /* use portable data format */
- ff->flags |= FO_PORTABLE;
- break;
- case 'r': /* read fifo */
- ff->flags |= FO_READFIFO;
- break;
- case 'S':
- ff->flags |= FO_SHA1;
- break;
- case 's':
- ff->flags |= FO_SPARSE;
- break;
- case 'm':
- ff->flags |= FO_MTIMEONLY;
- break;
- case 'k':
- ff->flags |= FO_KEEPATIME;
- break;
- case 'V': /* verify options */
- /* Copy Verify Options */
- for (j=0; *p && *p != ':'; p++) {
- ff->VerifyOpts[j] = *p;
- if (j < (int)sizeof(ff->VerifyOpts) - 1) {
- j++;
- }
- }
- ff->VerifyOpts[j] = 0;
- break;
- case 'w':
- ff->flags |= FO_IF_NEWER;
- break;
- case 'Z': /* gzip compression */
- ff->flags |= FO_GZIP;
- ff->GZIP_level = *++p - '0';
- Dmsg1(200, "Compression level=%d\n", ff->GZIP_level);
- break;
- default:
- Emsg1(M_ERROR, 0, "Unknown include/exclude option: %c\n", *p);
- break;
- }
- }
-}
-
-
/*
* Terminate find_files() and release
* all allocated memory
projects / bacula / bacula / blobdiff