frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug #2142: Make font path logging more readable. (Eduard Fuchs)

This commit is contained in:
Adam Jackson 2006-04-03 22:00:06 +00:00
parent 373f9f9256
commit 14af50371c
2 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2006-04-03 Adam Jackson <ajax@freedesktop.org>
* hw/xfree86/common/xf86Config.c:
Bug #2142: Make font path logging more readable. (Eduard Fuchs)
2006-04-03 Adam Jackson <ajax@freedesktop.org> 2006-04-03 Adam Jackson <ajax@freedesktop.org>
* Xprint/Makefile.am: * Xprint/Makefile.am:

33
hw/xfree86/common/xf86Config.c
View File

@ -1,4 +1,4 @@
/* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86Config.c,v 1.22.8.2 2006/02/28 23:55:03 krh Exp $ */ /* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86Config.c,v 1.23 2006/03/12 00:11:33 krh Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v 3.276 2003/10/08 14:58:26 dawes Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v 3.276 2003/10/08 14:58:26 dawes Exp $ */
@ -666,7 +666,36 @@ configFiles(XF86ConfFilesPtr fileconf)
if (! *defaultFontPath) if (! *defaultFontPath)
FatalError("No valid FontPath could be found."); FatalError("No valid FontPath could be found.");
xf86Msg(pathFrom, "FontPath set to \"%s\"\n", defaultFontPath); /* make fontpath more readable in the logfiles */
int countDirs = 1;
char *temp_path = defaultFontPath;
while((temp_path = index(temp_path, ',')) != NULL) {
countDirs++;
temp_path++;
}
char *log_buf = xnfalloc(strlen(defaultFontPath) + (2 * countDirs) + 1);
if(!log_buf) /* fallback to old method */
xf86Msg(pathFrom, "FontPath set to \"%s\"\n", defaultFontPath);
else {
char *start, *end;
int size;
temp_path = log_buf;
start = defaultFontPath;
while((end = index(start, ',')) != NULL) {
size = (end - start) + 1;
*(temp_path++) = '\t';
strncpy(temp_path, start, size);
temp_path += size;
*(temp_path++) = '\n';
start += size;
}
/* copy last entry */
*(temp_path++) = '\t';
strcpy(temp_path, start);
xf86Msg(pathFrom, "FontPath set to:\n%s\n", log_buf);
xfree(log_buf);
}
/* RgbPath */ /* RgbPath */