]> git.sur5r.net Git - cc65/blobdiff - src/cc65/incpath.c
Removed (pretty inconsistently used) tab chars from source code base.
[cc65] / src / cc65 / incpath.c
index 767ad2a86e7b4832b81dd4e6b2f74a18536ea3cd..7a4b31e941a012af419f490a8892d7f5b337864d 100644 (file)
@@ -1,15 +1,15 @@
 /*****************************************************************************/
 /*                                                                           */
-/*                                incpath.c                                 */
+/*                                 incpath.c                                 */
 /*                                                                           */
-/*                     Include path handling for cc65                       */
+/*                      Include path handling for cc65                       */
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 2000      Ullrich von Bassewitz                                       */
-/*               Wacholderweg 14                                             */
-/*               D-70597 Stuttgart                                           */
-/* EMail:        uz@musoftware.de                                            */
+/* (C) 2000-2013, Ullrich von Bassewitz                                      */
+/*                Roemerstrasse 52                                           */
+/*                D-70794 Filderstadt                                        */
+/* EMail:         uz@cc65.org                                                */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */
 
 
 
-#include <stdio.h>
-#include <string.h>
-#if defined(_MSC_VER)
-/* Microsoft compiler */
-#  include <io.h>
-#else
-/* Anyone else */
-#  include <unistd.h>
-#endif
-
-/* common */
-#include "xmalloc.h"
-
 /* cc65 */
 #include "incpath.h"
 
 
 
 /*****************************************************************************/
-/*                                  Data                                    */
+/*                                   Data                                    */
 /*****************************************************************************/
 
 
 
-static char* SysIncludePath  = 0;
-static char* UserIncludePath = 0;
+SearchPath*     SysIncSearchPath;       /* System include path */
+SearchPath*     UsrIncSearchPath;       /* User include path */
 
 
 
 /*****************************************************************************/
-/*                                  Code                                    */
+/*                                   Code                                    */
 /*****************************************************************************/
 
 
 
-static char* Add (char* Orig, const char* New)
-/* Create a new path from Orig and New, delete Orig, return the result */
-{
-    unsigned OrigLen, NewLen;
-    char* NewPath;
-
-    /* Get the length of the original string */
-    OrigLen = Orig? strlen (Orig) : 0;
-
-    /* Get the length of the new path */
-    NewLen = strlen (New);
-
-    /* Check for a trailing path separator and remove it */
-    if (NewLen > 0 && (New [NewLen-1] == '\\' || New [NewLen-1] == '/')) {
-       --NewLen;
-    }
-
-    /* Allocate memory for the new string */
-    NewPath = (char*) xmalloc (OrigLen + NewLen + 2);
-
-    /* Copy the strings */
-    memcpy (NewPath, Orig, OrigLen);
-    memcpy (NewPath+OrigLen, New, NewLen);
-    NewPath [OrigLen+NewLen+0] = ';';
-    NewPath [OrigLen+NewLen+1] = '\0';
-
-    /* Delete the original path */
-    xfree (Orig);
-
-    /* Return the new path */
-    return NewPath;
-}
-
-
-
-static char* Find (const char* Path, const char* File)
-/* Search for a file in a list of directories. If found, return the complete
- * name including the path in a malloced data area, if not found, return 0.
- */
+void InitIncludePaths (void)
+/* Initialize the include path search list */
 {
-    const char* P;
-    int Max;
-    char PathName [FILENAME_MAX];
-
-    /* Initialize variables */
-    Max = sizeof (PathName) - strlen (File) - 2;
-    if (Max < 0) {
-       return 0;
-    }
-    P = Path;
-
-    /* Handle a NULL pointer as replacement for an empty string */
-    if (P == 0) {
-       P = "";
-    }
-
-    /* Start the search */
-    while (*P) {
-        /* Copy the next path element into the buffer */
-       int Count = 0;
-       while (*P != '\0' && *P != ';' && Count < Max) {
-           PathName [Count++] = *P++;
-       }
-
-       /* Add a path separator and the filename */
-       if (Count) {
-           PathName [Count++] = '/';
-       }
-       strcpy (PathName + Count, File);
-
-       /* Check if this file exists */
-       if (access (PathName, 0) == 0) {
-           /* The file exists */
-           return xstrdup (PathName);
-       }
-
-       /* Skip a list separator if we have one */
-       if (*P == ';') {
-           ++P;
-       }
-    }
-
-    /* Not found */
-    return 0;
+    /* Create the search path lists */
+    SysIncSearchPath = NewSearchPath ();
+    UsrIncSearchPath = NewSearchPath ();
 }
 
 
 
-void AddIncludePath (const char* NewPath, unsigned Where)
-/* Add a new include path to the existing one */
+void FinishIncludePaths (void)
+/* Finish creating the include path search lists. */
 {
-    /* Allow a NULL path */
-    if (NewPath) {
-       if (Where & INC_SYS) {
-           SysIncludePath = Add (SysIncludePath, NewPath);
-       }
-       if (Where & INC_USER) {
-           UserIncludePath = Add (UserIncludePath, NewPath);
-       }
-    }
-}
+    /* Add specific paths from the environment */
+    AddSearchPathFromEnv (SysIncSearchPath, "CC65_INC");
+    AddSearchPathFromEnv (UsrIncSearchPath, "CC65_INC");
 
+    /* Add paths relative to a main directory defined in an env. var. */
+    AddSubSearchPathFromEnv (SysIncSearchPath, "CC65_HOME", "include");
 
+    /* Add some compiled-in search paths if defined at compile time. */
+#ifdef CC65_INC
+    AddSearchPath (SysIncSearchPath, STRINGIZE (CC65_INC));
+#endif
 
-char* FindInclude (const char* Name, unsigned Where)
-/* Find an include file. Return a pointer to a malloced area that contains
- * the complete path, if found, return 0 otherwise.
- */
-{
-    if (Where & INC_SYS) {
-       /* Search in the system include directories */
-       return Find (SysIncludePath, Name);
-    }
-    if (Where & INC_USER) {
-       /* Search in the user include directories */
-       return Find (UserIncludePath, Name);
-    }
-    return 0;
+    /* Add paths relative to the parent directory of the Windows binary. */
+    AddSubSearchPathFromWinBin (SysIncSearchPath, "include");
 }