summaryrefslogtreecommitdiffabout
path: root/src/preproc.c
Side-by-side diff
Diffstat (limited to 'src/preproc.c') (more/less context) (ignore whitespace changes)
-rw-r--r--src/preproc.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/src/preproc.c b/src/preproc.c
index 8debdcf..4ab3066 100644
--- a/src/preproc.c
+++ b/src/preproc.c
@@ -473,6 +473,6 @@ pop_source()
}
-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 = ".";
@@ -496,14 +496,8 @@ 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;
}
@@ -536,6 +530,11 @@ parse_include(const char *text, int once)
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);
+ }
}
@@ -574,6 +573,7 @@ grecs_preproc_run(const char *config_file, const char *extpp)
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,
@@ -582,8 +582,8 @@ grecs_preproc_run(const char *config_file, const char *extpp)
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'"),

Return to:

Send suggestions and report system problems to the System administrator.