From c8865a0d524f3d545836bd4581329089a357661e Mon Sep 17 00:00:00 2001
From: Sergey Poznyakoff <gray@gnu.org.ua>
Date: Mon, 16 May 2011 19:31:53 +0300
Subject: Add bind testsuite.

* README.submodule: Update URL.
* src/bind-lex.l (grecs_bind_new_source): Scan include path.
* src/grecs.h (grecs_find_include_file): new proto.
* src/preproc.c (try_file): Rename to grecs_find_include_file. Change
signature and return type. All uses updated.
* tests/Makefile.am (EXTRA_DIST): Add new configs.
(TESTSUITE_AT): Add parser-bind.at.
* tests/gcffmt.c: Add -I (-include) option.
* tests/testsuite.at: Include parser-bind.at.

* tests/bind.conf: New file.
* tests/bind.dlz: New file.
* tests/bind.ext.conf: New file.
* tests/bind.int.conf: New file.
* tests/bind.keys: New file.
* tests/parser-bind.at: New file.
---
 src/preproc.c | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'src/preproc.c')

diff --git a/src/preproc.c b/src/preproc.c
index 8debdcf..4ab3066 100644
--- a/src/preproc.c
+++ b/src/preproc.c
@@ -472,8 +472,8 @@ pop_source()
 	return 0;
 }
 
-static int
-try_file(const char *name, int allow_cwd, int err_not_found, char **newp)
+char *
+grecs_find_include_file(const char *name, int allow_cwd)
 {
 	static char *cwd = ".";
 	struct file_data fd;
@@ -495,16 +495,10 @@ try_file(const char *name, int allow_cwd, int err_not_found, char **newp)
 
 	if (!fd.found) {
 		pp_list_find(std_include_path, &fd);
-
-		if (!fd.found && err_not_found) {
-			grecs_error(&LOCUS, 0,
-				    _("%s: No such file or directory"), name);
-			*newp = NULL;
-		}
+		if (!fd.found)
+			return NULL;
 	}
-	if (fd.found)
-		*newp = fd.buf;
-	return fd.found;
+	return fd.buf;
 }
 
 static int
@@ -535,8 +529,13 @@ parse_include(const char *text, int once)
 		else
 			allow_cwd = 1;
 		
-		if (p[0] != '/' && try_file(p, allow_cwd, 1, &tmp))
-			p = tmp;
+		if (p[0] != '/') {
+			p = grecs_find_include_file(p, allow_cwd);
+			if (!p)
+				grecs_error(&LOCUS, 0,
+					    _("%s: No such file or directory"),
+					    p);
+		}
 	}
   
 	if (p)
@@ -573,18 +572,19 @@ grecs_preproc_run(const char *config_file, const char *extpp)
 		FILE *outfile;
 		char *setup_file;
 		char *cmd = NULL;
-		
-		if (try_file("pp-setup", 1, 0, &setup_file)) {
+
+		setup_file = grecs_find_include_file("pp-setup", 1);
+		if (setup_file) {
 			size_t size = 0;
 			if (grecs_asprintf(&cmd, &size,
 					   "%s %s -", extpp, setup_file))
 				grecs_alloc_die();
 			grecs_free(setup_file);
 		} else
-			cmd = grecs_strdup (extpp);
+			cmd = grecs_strdup(extpp);
 		/*FIXME_DEBUG_F1 (2, "Running preprocessor: `%s'", cmd);*/
 		outfile = popen(cmd, "w");
-		if (!outfile){
+		if (!outfile) {
 			grecs_error(NULL, errno,
 				    _("Unable to start external preprocessor `%s'"),
 				    cmd);
-- 
cgit v1.2.1