picnoir/glibc
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

(parse_conf): Ignore leading whitespace. Use feof_unlocked instead of feof. (add_dir): Ignire trailing whitespace.

Browse source
This commit is contained in:
Ulrich Drepper 2003-04-08 04:20:29 +00:00
parent 0a7cfefb94
commit 69acbe9f1d
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
elf/ldconfig.c
View file

@ -342,13 +342,15 @@ add_dir (const char *line)
entry->flag = FLAG_ANY;
}
/* Canonify path: for now only remove trailing slashes. */
/* Canonify path: for now only remove leading and trailing
whitespace and the trailing slashes slashes. */
i = strlen (entry->path) - 1;
while (isspace (entry->path[i]) && i > 0)
entry->path[i--] = '\0';
while (entry->path[i] == '/' && i > 0)
{
entry->path[i] = '\0';
--i;
}
entry->path[i--] = '\0';
if (stat64 (entry->path, &stat_buf))
{
@ -963,12 +965,18 @@ parse_conf (const char *filename)
make it terminating the line. */
*strchrnul (line, '#') = '\0';
/* Remove leading whitespace. NUL is no whitespace character. */
char *cp = line;
while (isspace (*cp))
++cp;
/* If the line is blank it is ignored. */
if (line[0] == '\0')
if (cp[0] == '\0')
continue;
add_dir (line);
} while (!feof (file));
add_dir (cp);
}
while (!feof_unlocked (file));
/* Free buffer and close file. */
free (line);