From owner-p4-projects@FreeBSD.ORG  Tue Jul 15 08:06:24 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 763761065676; Tue, 15 Jul 2008 08:06:24 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3A1FC106566C
	for <perforce@FreeBSD.org>; Tue, 15 Jul 2008 08:06:24 +0000 (UTC)
	(envelope-from konrad@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 23ED08FC20
	for <perforce@FreeBSD.org>; Tue, 15 Jul 2008 08:06:24 +0000 (UTC)
	(envelope-from konrad@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m6F86OYe090769
	for <perforce@FreeBSD.org>; Tue, 15 Jul 2008 08:06:24 GMT
	(envelope-from konrad@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m6F86OD3090767
	for perforce@freebsd.org; Tue, 15 Jul 2008 08:06:24 GMT
	(envelope-from konrad@FreeBSD.org)
Date: Tue, 15 Jul 2008 08:06:24 GMT
Message-Id: <200807150806.m6F86OD3090767@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	konrad@FreeBSD.org using -f
From: Konrad Jankowski <konrad@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 145271 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 15 Jul 2008 08:06:24 -0000

http://perforce.freebsd.org/chv.cgi?CH=145271

Change 145271 by konrad@vspredator on 2008/07/15 08:06:10

	Make it also work on the older charmap encoding format.

Affected files ...

.. //depot/projects/soc2008/konrad_collation/colldef.apple/scan.l#3 edit

Differences ...

==== //depot/projects/soc2008/konrad_collation/colldef.apple/scan.l#3 (text+ko) ====

@@ -42,6 +42,8 @@
 #include "common.h"
 #include "y.tab.h"
 
+void yyerror(char *, ...);
+
 int line_no = 1, save_no, fromsubs;
 wchar_t buf0[BUFSIZE], *ptr;
 wchar_t *buf = buf0;
@@ -154,7 +156,14 @@
 	yylval.ch = v;
 	return CHAR;
 }
-<INITIAL,nchar,subs>(\\x([0-9a-fA-F]{2})){1,3}   {
+<INITIAL,nchar,subs>\\x([0-9a-fA-F]{2})   {
+	u_int v;
+ 
+	sscanf(&yytext[2], "%x", &v);
+	yylval.ch = v;
+	return CHAR;
+}
+<INITIAL,nchar,subs>(\\x([0-9a-fA-F]{2})){2,3}   {
 	u_int v;
 	char synthesis[4], *p;
 	int i;
@@ -167,7 +176,8 @@
 	}
 	synthesis[i] = 0;
 	if ((int)(v = mbtowc(&ret, synthesis, i)) != i && synthesis[0])
-		errx(EX_UNAVAILABLE, "charmap symbol value decoding error (%d != %d)", v, i);
+		yyerror("charmap symbol value decoding error (%d != %d), "
+		    "text was: %s", v, i, yytext);
 	yylval.ch = ret;
 
 	return CHAR;