fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2025-12-30 21:20:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Simplify /etc/X11/font-dirs parsing

Browse source
This commit is contained in:
Alexander Gottwald 2004-10-23 12:02:00 +00:00
parent c98e1cc973
commit beb46a639c
2 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
hw/xwin/ChangeLog
View file

@ -1,3 +1,8 @@
2004-10-23 Alexander Gottwald <ago at freedesktop dot org>
* winconfig (winConfigFiles):
Simplify /etc/X11/font-dirs parsing
2004-10-20 Alexander Gottwald <ago at freedesktop dot org>
* XWin.rc, winresource.h, winwndproc.c:

39
hw/xwin/winconfig.c
View file

@ -770,22 +770,10 @@ winConfigFiles ()
str = fgets(buffer, sizeof(buffer), fontdirs);
if (str == NULL) /* stop on error or eof */
break;
if (strchr(str, '\n') != NULL)
has_eol = TRUE;
/* strip whitespaces from beginning */
while (*str == ' ' || *str == '\t')
str++;
/* get size, strip whitespaces from end */
blen = strlen(str);
while (blen > 0 && (str[blen-1] == ' ' ||
str[blen-1] == '\t' || str[blen-1] == '\n'))
{
if (str[blen-1] == '\n') /* flag that we've read a */
has_eol = TRUE; /* complete line */
str[--blen] = 0;
}
/* check if block is continued comment */
if (comment_block)
{
@ -804,14 +792,20 @@ winConfigFiles ()
*hashchar = 0;
if (!has_eol) /* mark next block as continued comment */
comment_block = TRUE;
/* get size, strip whitespaces from end (again) */
blen = strlen(str);
while (blen > 0 && (str[blen-1] == ' ' ||
str[blen-1] == '\t'))
str[--blen] = 0;
}
}
/* strip whitespaces from beginning */
while (*str == ' ' || *str == '\t')
str++;
/* get size, strip whitespaces from end */
blen = strlen(str);
while (blen > 0 && (str[blen-1] == ' ' ||
str[blen-1] == '\t' || str[blen-1] == '\n'))
{
str[--blen] = 0;
}
/* still something left to add? */
if (blen > 0)
@ -849,7 +843,8 @@ winConfigFiles ()
/* cleanup */
fclose(fontdirs);
from = X_CONFIG;
defaultFontPath = fontpath;
defaultFontPath = xstrdup(fontpath);
free(fontpath);
}
}
winMsg (from, "FontPath set to \"%s\"\n", defaultFontPath);