From a7557ddc466cfbebc166e666d21b0e2c23d0ac26 Mon Sep 17 00:00:00 2001 From: Tom Gilbert Date: Fri, 8 Sep 2000 17:23:07 +0000 Subject: [PATCH] final fix for _list_fonts() SVN revision: 3357 --- src/font.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/font.c b/src/font.c index fb629bd..23414d3 100644 --- a/src/font.c +++ b/src/font.c @@ -799,6 +799,7 @@ __imlib_list_fonts(int *num_ret) int i, j, d, l = 0; char **list = NULL, **dir, *path; TT_Error error; + char *p; /* if we dont have a truetype font engine yet - make one */ if (!have_engine) @@ -817,6 +818,9 @@ __imlib_list_fonts(int *num_ret) { path = malloc(strlen(fpath[i]) + strlen(dir[j]) + 2); sprintf(path, "%s/%s", fpath[i], dir[j]); + /* trim .ttf if it is there */ + if((p = strrchr(dir[j], '.'))) + *p = '\0'; if(!__imlib_ItemInList(list, l, dir[j])) { if (__imlib_FileIsFile(path)) @@ -831,7 +835,7 @@ __imlib_list_fonts(int *num_ret) if (list) list = realloc(list, sizeof(char *) * l); else - list = malloc(sizeof(char *)); + list = malloc(sizeof(char *)); list[l - 1] = strdup(dir[j]); } free(dir[j]);