/* */
/* */
/* */
-/* (C) 2000-2010, Ullrich von Bassewitz */
+/* (C) 2000-2013, Ullrich von Bassewitz */
/* Roemerstrasse 52 */
/* D-70794 Filderstadt */
/* EMail: uz@cc65.org */
#include <stdlib.h>
#include <string.h>
+#if defined(_WIN32)
+# include <windows.h>
+#endif
#if defined(_MSC_VER)
/* Microsoft compiler */
# include <io.h>
-# pragma warning(disable : 4996)
#else
/* Anyone else */
# include <unistd.h>
/*****************************************************************************/
-/* Code */
+/* Code */
/*****************************************************************************/
/* Check for a trailing path separator and remove it */
if (Len > 0 && (Path[Len-1] == '\\' || Path[Len-1] == '/')) {
- --Len;
+ --Len;
}
/* Allocate memory for the new string */
-static void Add (SearchPath* P, const char* New)
+static void Add (SearchPaths* P, const char* New)
/* Cleanup a new search path and add it to the list */
{
/* Add a clean copy of the path to the collection */
-SearchPath* NewSearchPath (void)
+SearchPaths* NewSearchPath (void)
/* Create a new, empty search path list */
{
return NewCollection ();
-void AddSearchPath (SearchPath* P, const char* NewPath)
+void AddSearchPath (SearchPaths* P, const char* NewPath)
/* Add a new search path to the end of an existing list */
{
/* Allow a NULL path */
-void AddSearchPathFromEnv (SearchPath* P, const char* EnvVar)
+void AddSearchPathFromEnv (SearchPaths* P, const char* EnvVar)
/* Add a search path from an environment variable to the end of an existing
- * list.
- */
+** list.
+*/
{
AddSearchPath (P, getenv (EnvVar));
}
-void AddSubSearchPathFromEnv (SearchPath* P, const char* EnvVar, const char* SubDir)
+void AddSubSearchPathFromEnv (SearchPaths* P, const char* EnvVar, const char* SubDir)
/* Add a search path from an environment variable, adding a subdirectory to
- * the environment variable value.
- */
+** the environment variable value.
+*/
{
StrBuf Dir = AUTO_STRBUF_INITIALIZER;
const char* EnvVal = getenv (EnvVar);
if (EnvVal == 0) {
- /* Not found */
- return;
+ /* Not found */
+ return;
}
/* Copy the environment variable to the buffer */
/* Add a path separator if necessary */
if (SB_NotEmpty (&Dir)) {
- if (SB_LookAtLast (&Dir) != '\\' && SB_LookAtLast (&Dir) != '/') {
- SB_AppendChar (&Dir, '/');
- }
+ if (SB_LookAtLast (&Dir) != '\\' && SB_LookAtLast (&Dir) != '/') {
+ SB_AppendChar (&Dir, '/');
+ }
}
/* Add the subdirectory and terminate the string */
-int PushSearchPath (SearchPath* P, const char* NewPath)
+void AddSubSearchPathFromWinBin (SearchPaths* P, const char* SubDir)
+{
+/* Windows only:
+** Add a search path from the running binary, adding a subdirectory to
+** the parent directory of the directory containing the binary.
+*/
+#if defined(_WIN32)
+
+ char Dir[_MAX_PATH];
+ char* Ptr;
+
+ if (GetModuleFileName (NULL, Dir, _MAX_PATH) == 0) {
+ return;
+ }
+
+ /* Remove binary name */
+ Ptr = strrchr (Dir, '\\');
+ if (Ptr == 0) {
+ return;
+ }
+ *Ptr = '\0';
+
+ /* Check for 'bin' directory */
+ Ptr = strrchr (Dir, '\\');
+ if (Ptr == 0) {
+ return;
+ }
+ if (strcmp (Ptr++, "\\bin") != 0) {
+ return;
+ }
+
+ /* Append SubDir */
+ strcpy (Ptr, SubDir);
+
+ /* Add the search path */
+ AddSearchPath (P, Dir);
+
+#else
+
+ (void) P;
+ (void) SubDir;
+
+#endif
+}
+
+
+int PushSearchPath (SearchPaths* P, const char* NewPath)
/* Add a new search path to the head of an existing search path list, provided
- * that it's not already there. If the path is already at the first position,
- * return zero, otherwise return a non zero value.
- */
+** that it's not already there. If the path is already at the first position,
+** return zero, otherwise return a non zero value.
+*/
{
/* Generate a clean copy of NewPath */
char* Path = CleanupPath (NewPath);
-void PopSearchPath (SearchPath* P)
+void PopSearchPath (SearchPaths* P)
/* Remove a search path from the head of an existing search path list */
{
/* Remove the path at position 0 */
-void ForgetSearchPath (SearchPath* P)
-/* Forget all search paths in the given list */
+char* GetSearchPath (SearchPaths* P, unsigned Index)
+/* Return the search path at the given index, if the index is valid, return an
+** empty string otherwise.
+*/
{
- unsigned I;
- for (I = 0; I < CollCount (P); ++I) {
- xfree (CollAt (P, I));
- }
- CollDeleteAll (P);
+ if (Index < CollCount (P))
+ return CollAtUnchecked (P, Index);
+ return "";
}
-char* SearchFile (const SearchPath* P, const char* File)
+char* SearchFile (const SearchPaths* P, const char* File)
/* Search for a file in a list of directories. Return a pointer to a malloced
- * area that contains the complete path, if found, return 0 otherwise.
- */
+** area that contains the complete path, if found, return 0 otherwise.
+*/
{
char* Name = 0;
StrBuf PathName = AUTO_STRBUF_INITIALIZER;
/* Copy the next path element into the buffer */
SB_CopyStr (&PathName, CollConstAt (P, I));
- /* Add a path separator and the filename */
- if (SB_NotEmpty (&PathName)) {
- SB_AppendChar (&PathName, '/');
- }
- SB_AppendStr (&PathName, File);
- SB_Terminate (&PathName);
-
- /* Check if this file exists */
- if (access (SB_GetBuf (&PathName), 0) == 0) {
- /* The file exists, we're done */
- Name = xstrdup (SB_GetBuf (&PathName));
+ /* Add a path separator and the filename */
+ if (SB_NotEmpty (&PathName)) {
+ SB_AppendChar (&PathName, '/');
+ }
+ SB_AppendStr (&PathName, File);
+ SB_Terminate (&PathName);
+
+ /* Check if this file exists */
+ if (access (SB_GetBuf (&PathName), 0) == 0) {
+ /* The file exists, we're done */
+ Name = xstrdup (SB_GetBuf (&PathName));
break;
- }
+ }
}
/* Cleanup and return the result of the search */
SB_Done (&PathName);
return Name;
}
-
-
-
projects / cc65 / blobdiff