Other suggested changes.

This commit is contained in:
Alan Mishchenko 2022-11-21 14:40:55 -08:00
parent b0518173b1
commit 3bcc4fc386
2 changed files with 20 additions and 9 deletions

View File

@ -61,7 +61,7 @@ void open_libs() {
DIR* dirp;
struct dirent* dp;
char *env, *init_p, *p;
int done;
//int done;
env = getenv ("ABC_LIB_PATH");
if (env == NULL) {
@ -74,12 +74,14 @@ void open_libs() {
}
// Extract directories and read libraries
done = 0;
//done = 0;
p = init_p;
while (!done) {
//while (!done) {
for (;;) {
char *endp = strchr (p,':');
if (endp == NULL) done = 1; // last directory in the list
else *endp = 0; // end of string
//if (endp == NULL) done = 1; // last directory in the list
//else *endp = 0; // end of string
if (endp != NULL) *endp = 0; // end of string
dirp = opendir(p);
if (dirp == NULL) {
@ -119,7 +121,12 @@ void open_libs() {
}
}
closedir(dirp);
p = endp+1;
//p = endp+1;
if (endp == NULL) {
break; // last directory in the list
} else {
p = endp+1;
}
}
ABC_FREE(init_p);

View File

@ -280,7 +280,7 @@ char * Extra_UtilFileSearch(char *file, char *path, char *mode)
save_path = path = Extra_UtilStrsav(path);
quit = 0;
do {
for (;;) {
cp = strchr(path, ':');
if (cp != 0) {
*cp = '\0';
@ -304,8 +304,12 @@ char * Extra_UtilFileSearch(char *file, char *path, char *mode)
return filename;
}
ABC_FREE(filename);
path = ++cp;
} while (! quit);
if (quit) {
break;
} else {
path = ++cp;
}
}
ABC_FREE(save_path);
return 0;