mirrors/tdfiglet
1
Fork 0
mirror of https://github.com/tat3r/tdfiglet.git synced 2024-09-29 13:50:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

added better fontname handling

Browse Source
This commit is contained in:
tater 2018-07-14 16:57:54 -04:00
parent b0860ceca3
commit 54abc1114b
1 changed files with 36 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
tdfiglet.c
View File

@ -40,6 +40,14 @@
#define ENC_UNICODE 0 #define ENC_UNICODE 0
#define ENC_ANSI 1 #define ENC_ANSI 1
#ifndef FONT_DIR
#define FONT_DIR "fonts"
#endif /* FONT_DIR */
#ifndef FONT_EXT
#define FONT_EXT "tdf"
#endif /* FONT_EXT */
typedef struct opt_s { typedef struct opt_s {
uint8_t justify; uint8_t justify;
uint8_t width; uint8_t width;
@ -194,7 +202,7 @@ main(int argc, char *argv[])
} }
font_t font_t
*loadfont(char *fn) { *loadfont(char *fn_arg) {
font_t *font; font_t *font;
uint8_t *map = NULL; uint8_t *map = NULL;
@ -202,27 +210,49 @@ font_t
struct stat st; struct stat st;
size_t len; size_t len;
uint8_t *p; uint8_t *p;
char *fn = NULL;
const char *magic = "\x13TheDraw FONTS file\x1a"; const char *magic = "\x13TheDraw FONTS file\x1a";
if (!strchr(fn_arg, '/')) {
if (strchr(fn_arg, '.')) {
fn = malloc(strlen(FONT_DIR) + strlen(fn_arg) + 1);
sprintf(fn, "%s/%s", FONT_DIR, fn_arg);
} else {
fn = malloc(strlen(FONT_DIR) + strlen(fn_arg) + \
strlen(FONT_EXT) + 1);
sprintf(fn, "%s/%s.%s", FONT_DIR, fn_arg, FONT_EXT);
}
} else {
fn = malloc(strlen(fn_arg) + 1);
sprintf(fn, "%s", fn_arg);
}
if (fn == NULL) {
perror(NULL);
exit(EX_OSERR);
}
fd = open(fn, O_RDONLY); fd = open(fn, O_RDONLY);
if (fd < 0) {
perror(NULL);
exit(EX_NOINPUT);
}
if (opt.info) { if (opt.info) {
printf("file: %s\n", fn); printf("file: %s\n", fn);
} }
font = malloc(sizeof(font_t)); font = malloc(sizeof(font_t));
if (fd < 0) {
perror(NULL);
exit(EX_NOINPUT);
}
if (stat(fn, &st)) { if (stat(fn, &st)) {
perror(NULL); perror(NULL);
exit(EX_OSERR); exit(EX_OSERR);
} }
free(fn);
len = st.st_size; len = st.st_size;
map = mmap(0, len, PROT_READ, MAP_PRIVATE, fd, 0); map = mmap(0, len, PROT_READ, MAP_PRIVATE, fd, 0);