/*
* Main routine for finding files on a file system.
- * The heart of the work is done in find_one.c
+ * The heart of the work to find the files on the
+ * system is done in find_one.c. Here we have the
+ * higher level control as well as the matching
+ * routines for the new syntax Options resource.
*
* Kern E. Sibbald, MM
*/
static int our_callback(FF_PKT *ff, void *hpkt);
static bool accept_file(FF_PKT *ff);
+/* Fold case in fnmatch() on Win32 */
+#ifdef WIN32
+static const int fnmode = FNM_CASEFOLD;
+#else
+static const int fnmode = 0;
+#endif
+
/*
* Initialize the find files "global" variables
if (fileset) {
int i, j;
ff->flags = 0;
- ff->VerifyOpts[0] = 0;
+ ff->VerifyOpts[0] = 'V';
+ ff->VerifyOpts[1] = 0;
for (i=0; i<fileset->include_list.size(); i++) {
findINCEXE *incexe = (findINCEXE *)fileset->include_list.get(i);
fileset->incexe = incexe;
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));
+ bstrncat(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));
/* 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));
+ bstrncat(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) ==0) {
ff->reader = fo->reader;
ff->writer = fo->writer;
for (k=0; k<fo->wild.size(); k++) {
- if (fnmatch((char *)fo->wild.get(k), ff->fname, 0) == 0) {
+ if (fnmatch((char *)fo->wild.get(k), ff->fname, fnmode) == 0) {
if (ff->flags & FO_EXCLUDE) {
return false; /* reject file */
}
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) {
+ if (fnmatch((char *)fo->wild.get(k), ff->fname, fnmode) == 0) {
Dmsg1(400, "Reject wild1: %s\n", ff->fname);
return false; /* reject file */
}
}
}
for (j=0; j<incexe->name_list.size(); j++) {
- if (fnmatch((char *)incexe->name_list.get(j), ff->fname, 0) == 0) {
+ if (fnmatch((char *)incexe->name_list.get(j), ff->fname, fnmode) == 0) {
Dmsg1(400, "Reject wild2: %s\n", ff->fname);
return false; /* reject file */
}
case FT_NORECURSE:
case FT_NOFSCHG:
case FT_NOOPEN:
- return ff->callback(ff, hpkt);
+// return ff->callback(ff, hpkt);
/* These items can be filtered */
case FT_LNKSAVED: