empathicqubit/cc65
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

New functions PushSearchPath and PopSearchPath.

Browse source 
git-svn-id: svn://svn.cc65.org/cc65/trunk@4671 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
uz 2010-05-28 11:22:44 +00:00
parent 64b597017a
commit ebd679dd57
2 changed files with 45 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
src/common/searchpath.c
View file

@ -57,29 +57,36 @@
static void Add (SearchPath* P, const char* New) static char* CleanupPath (const char* Path)
/* Cleanup a new search path and add it to the list */ /* Prepare and return a clean copy of Path */
{ {
unsigned NewLen; unsigned Len;
char* NewPath; char* NewPath;
/* Get the length of the new path */ /* Get the length of the path */
NewLen = strlen (New); Len = strlen (Path);
/* Check for a trailing path separator and remove it */ /* Check for a trailing path separator and remove it */
if (NewLen > 0 && (New[NewLen-1] == '\\' || New[NewLen-1] == '/')) { if (Len > 0 && (Path[Len-1] == '\\' || Path[Len-1] == '/')) {
--NewLen; --Len;
} }
/* Allocate memory for the new string */ /* Allocate memory for the new string */
NewPath = (char*) xmalloc (NewLen + 1); NewPath = (char*) xmalloc (Len + 1);
/* Copy the path and terminate it */ /* Copy the path and terminate it, then return the copy */
memcpy (NewPath, New, NewLen); memcpy (NewPath, Path, Len);
NewPath [NewLen] = '\0'; NewPath [Len] = '\0';
return NewPath;
}
/* Add the path to the collection */
CollAppend (P, NewPath);
static void Add (SearchPath* 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 */
CollAppend (P, CleanupPath (New));
} }
@ -149,6 +156,25 @@ void AddSubSearchPathFromEnv (SearchPath* P, const char* EnvVar, const char* Sub
void PushSearchPath (SearchPath* P, const char* NewPath)
/* Add a new search path to the head of an existing search path list */
{
/* Insert a clean copy of the path at position 0 */
CollInsert (P, CleanupPath (NewPath), 0);
}
void PopSearchPath (SearchPath* P)
/* Remove a search path from the head of an existing search path list */
{
/* Remove the path at position 0 */
xfree (CollAt (P, 0));
CollDelete (P, 0);
}
void ForgetSearchPath (SearchPath* P) void ForgetSearchPath (SearchPath* P)
/* Forget all search paths in the given list */ /* Forget all search paths in the given list */
{ {

6
src/common/searchpath.h
View file

@ -75,6 +75,12 @@ void AddSubSearchPathFromEnv (SearchPath* P, const char* EnvVar, const char* Sub
* the environment variable value. * the environment variable value.
*/ */
void PushSearchPath (SearchPath* P, const char* NewPath);
/* Add a new search path to the head of an existing search path list */
void PopSearchPath (SearchPath* P);
/* Remove a search path from the head of an existing search path list */
void ForgetSearchPath (SearchPath* P); void ForgetSearchPath (SearchPath* P);
/* Forget all search paths in the given list */ /* Forget all search paths in the given list */