diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2014-06-03 17:54:18 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2014-06-03 17:54:18 +0000 |
| commit | 28304b68bb8d178309eef2fe395746a7b49b7d9f (patch) | |
| tree | 7e4c9199c67a02daf9edfc00444a47c6345dfeb5 /tools | |
| parent | d7feb799e69cd8334b0e36c4dab2d0f97e47dcf5 (diff) | |
| download | src-28304b68bb8d178309eef2fe395746a7b49b7d9f.tar.gz src-28304b68bb8d178309eef2fe395746a7b49b7d9f.zip | |
vt fontcvt: Make the bold font optional
Sponsored by: The FreeBSD Foundation
Notes
Notes:
svn path=/head/; revision=267012
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/tools/vt/fontcvt/fontcvt.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/tools/tools/vt/fontcvt/fontcvt.c b/tools/tools/vt/fontcvt/fontcvt.c index c65ea9f61982..990c5af27fe8 100644 --- a/tools/tools/vt/fontcvt/fontcvt.c +++ b/tools/tools/vt/fontcvt/fontcvt.c @@ -84,7 +84,7 @@ usage(void) { fprintf(stderr, -"usage: fontcvt [-w width] [-h height] normal.bdf bold.bdf out.fnt\n"); +"usage: fontcvt [-w width] [-h height] normal.bdf [bold.bdf] out.fnt\n"); exit(1); } @@ -406,21 +406,27 @@ main(int argc, char *argv[]) argc -= optind; argv += optind; - if (argc != 3) + if (argc < 2 || argc > 3) usage(); wbytes = howmany(width, 8); if (parse_bdf(argv[0], VFNT_MAP_NORMAL) != 0) return (1); - if (parse_bdf(argv[1], VFNT_MAP_BOLD) != 0) - return (1); + argc--; + argv++; + if (argc == 2) { + if (parse_bdf(argv[0], VFNT_MAP_BOLD) != 0) + return (1); + argc--; + argv++; + } number_glyphs(); fold_mappings(0); fold_mappings(1); fold_mappings(2); fold_mappings(3); - if (write_fnt(argv[2]) != 0) + if (write_fnt(argv[0]) != 0) return (1); printf( |