summaryrefslogtreecommitdiffabout
path: root/src/preproc.c
authorSergey Poznyakoff <gray@gnu.org.ua>2014-12-25 18:15:22 (GMT)
committer Sergey Poznyakoff <gray@gnu.org.ua>2014-12-25 23:17:52 (GMT)
commitadd57c075c6f747a81c142ab48d59106de822664 (patch) (side-by-side diff)
treec15f94acdf135954e2f63ac7657c57cdd134ed75 /src/preproc.c
parentd51e1365118ce87016a39bd94437e31b35b8d307 (diff)
downloadgrecs-add57c075c6f747a81c142ab48d59106de822664.tar.gz
grecs-add57c075c6f747a81c142ab48d59106de822664.tar.bz2
Add globbing pattern support to #include and #include_once
* doc/grecs-syntax.texi: Document changes to the #include statement. * doc/grecs_config.5: Likewise. * src/preproc.c (include_glob, include_pos) (include_once): New statics. (pp_list_find): Return 0 if list is NULL. (incl_copy): New statics. (source_lookup): Use incl_copy as the copy function. (pop_source): If more glob expansions are available, push next one onto input stack. (isglob): New static. (parse_include): Support globbing patterns. * tests/Makefile.am: Add new testes. * tests/testsuite.at: Likewise. * tests/incl00.at: New test case. * tests/incl01.at: New test case. * tests/incl02.at: New test case. * tests/incl03.at: New test case.
Diffstat (limited to 'src/preproc.c') (more/less context) (show whitespace changes)
-rw-r--r--src/preproc.c59
1 files changed, 54 insertions, 5 deletions
diff --git a/src/preproc.c b/src/preproc.c
index ce32a29..56dcc22 100644
--- a/src/preproc.c
+++ b/src/preproc.c
@@ -1,5 +1,5 @@
/* grecs - Gray's Extensible Configuration System
- Copyright (C) 2007-2012 Sergey Poznyakoff
+ Copyright (C) 2007-2014 Sergey Poznyakoff
Grecs is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
@@ -28,6 +28,7 @@
#include <string.h>
#include <errno.h>
#include <signal.h>
+#include <glob.h>
#include <wordsplit.h>
@@ -62,6 +63,9 @@ static size_t bufsize;
static char *putback_buffer;
static size_t putback_size;
static size_t putback_max;
+static glob_t include_glob;
+static size_t include_pos;
+static int include_once;
static int push_source (const char *name, int once);
static int pop_source (void);
@@ -288,6 +292,8 @@ pp_list_find(struct grecs_list *list, struct file_data *dptr)
{
struct grecs_list_entry *ep;
+ if (!list)
+ return 0;
for (ep = list->head; !dptr->found && ep; ep = ep->next) {
const char *dir = ep->data;
size_t size = strlen (dir) + 1 + dptr->namelen + 1;
@@ -395,6 +401,13 @@ incl_compare(void const *data1, void const *data2)
}
static int
+incl_copy(void *dst, void *src)
+{
+ memcpy(dst, src, sizeof(struct input_file_ident));
+ return 0;
+}
+
+static int
source_lookup(struct stat *st)
{
struct input_file_ident key;
@@ -405,7 +418,7 @@ source_lookup(struct stat *st)
sizeof(struct input_file_ident),
incl_hasher,
incl_compare,
- NULL,
+ incl_copy,
NULL,/*FIXME: alloc*/
NULL);
if (!incl_sources)
@@ -505,6 +518,14 @@ pop_source()
grecs_free(context_stack);
context_stack = ctx;
+ if (include_pos < include_glob.gl_pathc) {
+ push_source(include_glob.gl_pathv[include_pos++], include_once);
+ return 0;
+ } else if (include_glob.gl_pathc) {
+ globfree(&include_glob);
+ include_pos = include_glob.gl_pathc = 0;
+ }
+
if (!context_stack) {
if (grecs_grecs__flex_debug)
fprintf(stderr, "End of input\n");
@@ -552,6 +573,16 @@ grecs_find_include_file(const char *name, int allow_cwd)
}
static int
+isglob(const char *s)
+{
+ for (; *s; s++) {
+ if (strchr("*?[", *s))
+ return 1;
+ }
+ return 0;
+}
+
+static int
parse_include(const char *text, int once)
{
struct wordsplit ws;
@@ -579,17 +610,35 @@ parse_include(const char *text, int once)
else
allow_cwd = 1;
- if (p[0] != '/') {
- p = grecs_find_include_file(p, allow_cwd);
+ if (isglob(p)) {
+ switch (glob(p, 0, NULL, &include_glob)) {
+ case 0:
+ include_pos = 0;
+ include_once = once;
+ break;
+ case GLOB_NOSPACE:
+ grecs_alloc_die();
+ case GLOB_NOMATCH:
+ break;
+ default:
+ grecs_error(&LOCUS, 0, _("read error"));
+ }
+ p = NULL;
+ } else if (p[0] != '/') {
+ char *q = p;
+ p = grecs_find_include_file(q, allow_cwd);
if (!p)
grecs_error(&LOCUS, 0,
_("%s: No such file or directory"),
- p);
+ q);
}
}
if (p)
rc = push_source(p, once);
+ else if (include_pos < include_glob.gl_pathc)
+ rc = push_source(include_glob.gl_pathv[include_pos++], once);
+
grecs_free(tmp);
wordsplit_free(&ws);
return rc;

Return to:

Send suggestions and report system problems to the System administrator.