diff options
Diffstat (limited to 'src/libdraw/subfontname.c')
| -rw-r--r-- | src/libdraw/subfontname.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/src/libdraw/subfontname.c b/src/libdraw/subfontname.c index bf397cb5..1374ef31 100644 --- a/src/libdraw/subfontname.c +++ b/src/libdraw/subfontname.c @@ -9,20 +9,22 @@ char* subfontname(char *cfname, char *fname, int maxdepth) { - char *t, *u, tmp1[64], tmp2[64]; + char *t, *u, *tmp1, *tmp2; int i; + t = strdup(cfname); /* t is the return string */ if(strcmp(cfname, "*default*") == 0) - return strdup(cfname); - t = cfname; + return t; if(t[0] != '/'){ - snprint(tmp2, sizeof tmp2, "%s", fname); + tmp2 = strdup(fname); u = utfrrune(tmp2, '/'); if(u) u[0] = 0; else strcpy(tmp2, "."); - snprint(tmp1, sizeof tmp1, "%s/%s", tmp2, t); + tmp1 = smprint("%s/%s", tmp2, t); + free(tmp2); + free(t); t = tmp1; } @@ -33,14 +35,16 @@ subfontname(char *cfname, char *fname, int maxdepth) if((1<<i) > maxdepth) continue; /* try i-bit grey */ - snprint(tmp2, sizeof tmp2, "%s.%d", t, i); - if(access(tmp2, AREAD) == 0) - return strdup(tmp2); + tmp2 = smprint("%s.%d", t, i); + if(access(tmp2, AREAD) == 0) { + free(t); + return tmp2; + } } /* try default */ if(access(t, AREAD) == 0) - return strdup(t); + return t; return nil; } |