X-Git-Url: https://git.tokkee.org/?p=collectd.git;a=blobdiff_plain;f=src%2Fconfigfile.c;h=154c041cee2d8b6d01ff4021c723810993c91dac;hp=be777c52a02cbb0074c405fa7909ab0a3968c3b9;hb=38e2d0eff79464e4b9686e135a184411d9307db7;hpb=178db08806318e0b01de2e7a9261f18d6f7ca72d diff --git a/src/configfile.c b/src/configfile.c index be777c52..154c041c 100644 --- a/src/configfile.c +++ b/src/configfile.c @@ -35,6 +35,14 @@ # include #endif /* HAVE_WORDEXP_H */ +#if HAVE_FNMATCH_H +# include +#endif /* HAVE_FNMATCH_H */ + +#if HAVE_LIBGEN_H +# include +#endif /* HAVE_LIBGEN_H */ + #define ESCAPE_NULL(str) ((str) == NULL ? "(null)" : (str)) /* @@ -90,7 +98,7 @@ static cf_value_map_t cf_value_map[] = {"PluginDir", dispatch_value_plugindir}, {"LoadPlugin", dispatch_loadplugin} }; -static int cf_value_map_num = STATIC_ARRAY_LEN (cf_value_map); +static int cf_value_map_num = STATIC_ARRAY_SIZE (cf_value_map); static cf_global_option_t cf_global_options[] = { @@ -100,11 +108,12 @@ static cf_global_option_t cf_global_options[] = {"FQDNLookup", NULL, "true"}, {"Interval", NULL, NULL}, {"ReadThreads", NULL, "5"}, + {"WriteThreads", NULL, "5"}, {"Timeout", NULL, "2"}, {"PreCacheChain", NULL, "PreCache"}, {"PostCacheChain", NULL, "PostCache"} }; -static int cf_global_options_num = STATIC_ARRAY_LEN (cf_global_options); +static int cf_global_options_num = STATIC_ARRAY_SIZE (cf_global_options); static int cf_default_typesdb = 1; @@ -535,7 +544,8 @@ static int cf_ci_append_children (oconfig_item_t *dst, oconfig_item_t *src) } /* int cf_ci_append_children */ #define CF_MAX_DEPTH 8 -static oconfig_item_t *cf_read_generic (const char *path, int depth); +static oconfig_item_t *cf_read_generic (const char *path, + const char *pattern, int depth); static int cf_include_all (oconfig_item_t *root, int depth) { @@ -546,9 +556,9 @@ static int cf_include_all (oconfig_item_t *root, int depth) oconfig_item_t *new; oconfig_item_t *old; - /* Ignore all blocks, including `Include' blocks. */ - if (root->children[i].children_num != 0) - continue; + char *pattern = NULL; + + int j; if (strcasecmp (root->children[i].key, "Include") != 0) continue; @@ -562,7 +572,20 @@ static int cf_include_all (oconfig_item_t *root, int depth) continue; } - new = cf_read_generic (old->values[0].value.string, depth + 1); + for (j = 0; j < old->children_num; ++j) + { + oconfig_item_t *child = old->children + j; + + if (strcasecmp (child->key, "Filter") == 0) + cf_util_get_string (child, &pattern); + else + ERROR ("configfile: Option `%s' not allowed in block.", + child->key); + } + + new = cf_read_generic (old->values[0].value.string, pattern, depth + 1); + sfree (pattern); + if (new == NULL) return (-1); @@ -579,13 +602,35 @@ static int cf_include_all (oconfig_item_t *root, int depth) return (0); } /* int cf_include_all */ -static oconfig_item_t *cf_read_file (const char *file, int depth) +static oconfig_item_t *cf_read_file (const char *file, + const char *pattern, int depth) { oconfig_item_t *root; int status; assert (depth < CF_MAX_DEPTH); + if (pattern != NULL) { +#if HAVE_FNMATCH_H && HAVE_LIBGEN_H + char *tmp = sstrdup (file); + char *filename = basename (tmp); + + if ((filename != NULL) && (fnmatch (pattern, filename, 0) != 0)) { + DEBUG ("configfile: Not including `%s' because it " + "does not match pattern `%s'.", + filename, pattern); + free (tmp); + return (NULL); + } + + free (tmp); +#else + ERROR ("configfile: Cannot apply pattern filter '%s' " + "to file '%s': functions basename() and / or " + "fnmatch() not available.", pattern, file); +#endif /* HAVE_FNMATCH_H && HAVE_LIBGEN_H */ + } + root = oconfig_parse_file (file); if (root == NULL) { @@ -608,7 +653,8 @@ static int cf_compare_string (const void *p1, const void *p2) return strcmp (*(const char **) p1, *(const char **) p2); } -static oconfig_item_t *cf_read_dir (const char *dir, int depth) +static oconfig_item_t *cf_read_dir (const char *dir, + const char *pattern, int depth) { oconfig_item_t *root = NULL; DIR *dh; @@ -683,7 +729,7 @@ static oconfig_item_t *cf_read_dir (const char *dir, int depth) oconfig_item_t *temp; char *name = filenames[i]; - temp = cf_read_generic (name, depth); + temp = cf_read_generic (name, pattern, depth); if (temp == NULL) { /* An error should already have been reported. */ @@ -714,7 +760,8 @@ static oconfig_item_t *cf_read_dir (const char *dir, int depth) * simpler function is used which does not do any such expansion. */ #if HAVE_WORDEXP_H -static oconfig_item_t *cf_read_generic (const char *path, int depth) +static oconfig_item_t *cf_read_generic (const char *path, + const char *pattern, int depth) { oconfig_item_t *root = NULL; int status; @@ -767,9 +814,9 @@ static oconfig_item_t *cf_read_generic (const char *path, int depth) } if (S_ISREG (statbuf.st_mode)) - temp = cf_read_file (path_ptr, depth); + temp = cf_read_file (path_ptr, pattern, depth); else if (S_ISDIR (statbuf.st_mode)) - temp = cf_read_dir (path_ptr, depth); + temp = cf_read_dir (path_ptr, pattern, depth); else { WARNING ("configfile: %s is neither a file nor a " @@ -794,7 +841,8 @@ static oconfig_item_t *cf_read_generic (const char *path, int depth) /* #endif HAVE_WORDEXP_H */ #else /* if !HAVE_WORDEXP_H */ -static oconfig_item_t *cf_read_generic (const char *path, int depth) +static oconfig_item_t *cf_read_generic (const char *path, + const char *pattern, int depth) { struct stat statbuf; int status; @@ -817,9 +865,9 @@ static oconfig_item_t *cf_read_generic (const char *path, int depth) } if (S_ISREG (statbuf.st_mode)) - return (cf_read_file (path, depth)); + return (cf_read_file (path, pattern, depth)); else if (S_ISDIR (statbuf.st_mode)) - return (cf_read_dir (path, depth)); + return (cf_read_dir (path, pattern, depth)); ERROR ("configfile: %s is neither a file nor a directory.", path); return (NULL); @@ -993,7 +1041,7 @@ int cf_read (char *filename) oconfig_item_t *conf; int i; - conf = cf_read_generic (filename, 0 /* depth */); + conf = cf_read_generic (filename, /* pattern = */ NULL, /* depth = */ 0); if (conf == NULL) { ERROR ("Unable to read config file %s.", filename);