From owner-svn-src-all@FreeBSD.ORG  Thu Jun  5 19:38:45 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 72C2D9B5;
 Thu,  5 Jun 2014 19:38:45 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 60AD82120;
 Thu,  5 Jun 2014 19:38:45 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s55Jcj2F042957;
 Thu, 5 Jun 2014 19:38:45 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s55Jcj1h042956;
 Thu, 5 Jun 2014 19:38:45 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <201406051938.s55Jcj1h042956@svn.freebsd.org>
From: Ed Maste <emaste@FreeBSD.org>
Date: Thu, 5 Jun 2014 19:38:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r267126 - head/tools/tools/vt/fontcvt
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Jun 2014 19:38:45 -0000

Author: emaste
Date: Thu Jun  5 19:38:44 2014
New Revision: 267126
URL: http://svnweb.freebsd.org/changeset/base/267126

Log:
  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.

Modified:
  head/tools/tools/vt/fontcvt/fontcvt.c

Modified: head/tools/tools/vt/fontcvt/fontcvt.c
==============================================================================
--- head/tools/tools/vt/fontcvt/fontcvt.c	Thu Jun  5 18:59:21 2014	(r267125)
+++ head/tools/tools/vt/fontcvt/fontcvt.c	Thu Jun  5 19:38:44 2014	(r267126)
@@ -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");