diff options
| author | emaste <emaste@FreeBSD.org> | 2014-06-05 19:38:44 +0000 |
|---|---|---|
| committer | emaste <emaste@FreeBSD.org> | 2014-06-05 19:38:44 +0000 |
| commit | abe8dedcc84ee464fe37cbfce6e981d7a6b7044a (patch) | |
| tree | c2ae9d03d5cbd337b1ef4274520834dceab4613a /tools | |
| parent | 910ce4ede4b9889c97ab8f051b5e00f1397ef6d2 (diff) | |
| download | FreeBSD-src-abe8dedcc84ee464fe37cbfce6e981d7a6b7044a.zip FreeBSD-src-abe8dedcc84ee464fe37cbfce6e981d7a6b7044a.tar.gz | |
vt fontcvt: Accept space after BITMAP in .bdf parser
The Unifont BDF generator incorrectly adds a space after BITMAP, and
and that error has been widely propagated.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/tools/vt/fontcvt/fontcvt.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/tools/vt/fontcvt/fontcvt.c b/tools/tools/vt/fontcvt/fontcvt.c index f4f5499..e2c3083 100644 --- a/tools/tools/vt/fontcvt/fontcvt.c +++ b/tools/tools/vt/fontcvt/fontcvt.c @@ -260,7 +260,8 @@ parse_bdf(FILE *fp, unsigned int map_idx) dwidth = atoi(ln + 7); } - if (strcmp(ln, "BITMAP") == 0) { + if (strncmp(ln, "BITMAP", 6) == 0 && + (ln[6] == ' ' || ln[6] == '\0')) { for (i = 0; i < height; i++) { if ((ln = fgetln(fp, &length)) == NULL) { fprintf(stderr, "Unexpected EOF!\n"); |
