1 files changed, 14 insertions, 14 deletions

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)
@@ -574,7 +573,8 @@ 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,
                                            "%s %s -", extpp, setup_file))