6502/cc65
1
0
Fork 0
mirror of https://github.com/cc65/cc65.git synced 2025-03-11 17:36:33 +00:00
Code Issues Projects Releases Wiki Activity

Use the new searchpath common module

Browse Source 
git-svn-id: svn://svn.cc65.org/cc65/trunk@2175 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
cuz 2003-05-29 09:10:18 +00:00
parent fda9a3b49a
commit fc78f797ee
3 changed files with 18 additions and 241 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

119
src/ca65/incpath.c
View File

@ -6,10 +6,10 @@
/* */ /* */
/* */ /* */
/* */ /* */
/* (C) 2000 Ullrich von Bassewitz */ /* (C) 2000-2003 Ullrich von Bassewitz */
/* Wacholderweg 14 */ /* Römerstrasse 52 */
/* D-70597 Stuttgart */ /* D-70794 Filderstadt */
/* EMail: uz@musoftware.de */ /* EMail: uz@cc65.org */
/* */ /* */
/* */ /* */
/* This software is provided 'as-is', without any expressed or implied */ /* This software is provided 'as-is', without any expressed or implied */
@ -33,18 +33,10 @@
#include <stdio.h> /* common */
#include <string.h> #include "searchpath.h"
#if defined(_MSC_VER)
/* Microsoft compiler */
# include <io.h>
#else
/* Anyone else */
# include <unistd.h>
#endif
#include "../common/xmalloc.h"
/* ca65 */
#include "incpath.h" #include "incpath.h"
@ -55,7 +47,7 @@
static char* IncludePath = 0; #define INC_STD 0x0001U
@ -65,101 +57,10 @@ static char* IncludePath = 0;
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 = 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.
*/
{
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;
}
void AddIncludePath (const char* NewPath) void AddIncludePath (const char* NewPath)
/* Add a new include path to the existing one */ /* Add a new include path to the existing one */
{ {
/* Allow a NULL path */ AddSearchPath (NewPath, INC_STD);
if (NewPath) {
IncludePath = Add (IncludePath, NewPath);
}
} }
@ -170,7 +71,7 @@ char* FindInclude (const char* Name)
*/ */
{ {
/* Search in the include directories */ /* Search in the include directories */
return Find (IncludePath, Name); return SearchFile (Name, INC_STD);
} }

8
src/ca65/incpath.h
View File

@ -6,10 +6,10 @@
/* */ /* */
/* */ /* */
/* */ /* */
/* (C) 2000 Ullrich von Bassewitz */ /* (C) 2000-2003 Ullrich von Bassewitz */
/* Wacholderweg 14 */ /* Römerstrasse 52 */
/* D-70597 Stuttgart */ /* D-70794 Filderstadt */
/* EMail: uz@musoftware.de */ /* EMail: uz@cc65.org */
/* */ /* */
/* */ /* */
/* This software is provided 'as-is', without any expressed or implied */ /* This software is provided 'as-is', without any expressed or implied */

130
src/cc65/incpath.c
View File

@ -33,142 +33,26 @@
#include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#if defined(_MSC_VER)
/* Microsoft compiler */
# include <io.h>
#else
/* Anyone else */
# include <unistd.h>
#endif
/* common */ /* common */
#include "xmalloc.h" #include "searchpath.h"
/* cc65 */ /* cc65 */
#include "incpath.h" #include "incpath.h"
/*****************************************************************************/
/* Data */
/*****************************************************************************/
static char* SysIncludePath = 0;
static char* UserIncludePath = 0;
/*****************************************************************************/ /*****************************************************************************/
/* 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.
*/
{
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;
}
void AddIncludePath (const char* NewPath, unsigned Where) void AddIncludePath (const char* NewPath, unsigned Where)
/* Add a new include path to the existing one */ /* Add a new include path to the existing one */
{ {
/* Allow a NULL path */ AddSearchPath (NewPath, Where);
if (NewPath) {
if (Where & INC_SYS) {
SysIncludePath = Add (SysIncludePath, NewPath);
}
if (Where & INC_USER) {
UserIncludePath = Add (UserIncludePath, NewPath);
}
}
} }
@ -178,15 +62,7 @@ char* FindInclude (const char* Name, unsigned Where)
* the complete path, if found, return 0 otherwise. * the complete path, if found, return 0 otherwise.
*/ */
{ {
if (Where & INC_SYS) { return SearchFile (Name, Where);
/* 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;
} }