Better error messages when opening include files

git-svn-id: svn://svn.cc65.org/cc65/trunk@83 b7a2c559-68d2-44c3-8de9-860c34a00d81

diff --git a/src/ca65/incpath.c b/src/ca65/incpath.c
index 9021f44a63c3da06d90b5f27efbe41d3b417ccf8..80db9ed63eb568b174c6f1ad9eca0aae0042ea44 100644 (file)
--- a/src/ca65/incpath.c
+++ b/src/ca65/incpath.c
@@ -38,7 +38,6 @@
 #if defined(_MSC_VER)
 /* Microsoft compiler */
 #  include <io.h>
-#  define R_OK 4
 #else
 /* Anyone else */
 #  include <unistd.h>
@@ -137,10 +136,10 @@ static char* Find (const char* Path, const char* File)
        strcpy (PathName + Count, File);
 
        /* Check if this file exists */
-       if (access (PathName, R_OK) == 0) {
+       if (access (PathName, 0) == 0) {
            /* The file exists */
            return xstrdup (PathName);
-       }                  
+       }
 
        /* Skip a list separator if we have one */
        if (*P == ';') {

diff --git a/src/cc65/error.c b/src/cc65/error.c
index 6a2ab2aaf9c2d81b3c814c1dafd7d5bef578c2b9..dd2d17c57248dd8b31722c4ef106d2f3d4c09412 100644 (file)
--- a/src/cc65/error.c
+++ b/src/cc65/error.c
@@ -101,7 +101,7 @@ static char* ErrMsg [ERR_COUNT-1] = {
     "`\"' or `<' expected",
     "Missing terminator or name too long",
     "Include file `%s' not found",
-    "Open failure on include file `%s'",
+    "Cannot open include file `%s': %s",
     "Invalid #error directive",
     "#error: %s",
     "Unexpected `#endif'",

diff --git a/src/cc65/incpath.c b/src/cc65/incpath.c
index 2776099b867c7ab1fdcafe1ed0620cc2ba9ccb4d..d0ba1f073cd04664703d3902a4eca64bfe7c0a90 100644 (file)
--- a/src/cc65/incpath.c
+++ b/src/cc65/incpath.c
@@ -38,7 +38,6 @@
 #if defined(_MSC_VER)
 /* Microsoft compiler */
 #  include <io.h>
-#  define R_OK 4
 #else
 /* Anyone else */
 #  include <unistd.h>
@@ -138,7 +137,7 @@ static char* Find (const char* Path, const char* File)
        strcpy (PathName + Count, File);
 
        /* Check if this file exists */
-       if (access (PathName, R_OK) == 0) {
+       if (access (PathName, 0) == 0) {
            /* The file exists */
            return xstrdup (PathName);
        }

diff --git a/src/cc65/input.c b/src/cc65/input.c
index a6845e281767f37c2ab94416f94bd4cd4b6eeccf..72e157bdbeea57310831ae82b409e95b92010743 100644 (file)
--- a/src/cc65/input.c
+++ b/src/cc65/input.c
@@ -156,7 +156,7 @@ void OpenIncludeFile (const char* Name, unsigned DirSpec)
     F = fopen (N, "r");
     if (F == 0) {
        /* Error opening the file */
-       PPError (ERR_INCLUDE_OPEN_FAILURE, N);
+       PPError (ERR_INCLUDE_OPEN_FAILURE, N, strerror (errno));
        xfree (N);
        return;
     }