From owner-p4-projects@FreeBSD.ORG  Wed Aug 27 07:44:59 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1D97C106566C; Wed, 27 Aug 2008 07:44:59 +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 D6DD0106564A
	for <perforce@FreeBSD.org>; Wed, 27 Aug 2008 07:44:58 +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 AC0D58FC24
	for <perforce@FreeBSD.org>; Wed, 27 Aug 2008 07:44:58 +0000 (UTC)
	(envelope-from konrad@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7R7iwRj022444
	for <perforce@FreeBSD.org>; Wed, 27 Aug 2008 07:44:58 GMT
	(envelope-from konrad@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7R7iw1N022442
	for perforce@freebsd.org; Wed, 27 Aug 2008 07:44:58 GMT
	(envelope-from konrad@FreeBSD.org)
Date: Wed, 27 Aug 2008 07:44:58 GMT
Message-Id: <200808270744.m7R7iw1N022442@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 148588 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: Wed, 27 Aug 2008 07:44:59 -0000

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

Change 148588 by konrad@vspredator on 2008/08/27 07:44:00

	Now print the names of all the characters.

Affected files ...

.. //depot/projects/soc2008/konrad_collation/test/analyze/analyze.c#2 edit

Differences ...

==== //depot/projects/soc2008/konrad_collation/test/analyze/analyze.c#2 (text+ko) ====

@@ -30,12 +30,32 @@
 }
 
 void
+grep_name(char *str, int len)
+{
+	char grepbuf[30] = { 0 }, cmd[120], tmp[10];
+	int i;
+
+	for (i = 0; i < len; i++) {
+		snprintf(tmp, sizeof(tmp), "\\\\x%2X", (unsigned char)str[i]);
+		strlcat(grepbuf, tmp, sizeof(grepbuf));
+	}
+	fflush(stdout);
+	snprintf(cmd, sizeof(cmd), "grep ' %s$' /usr/home/versus/p4/posix/UTF-8.cm"
+	    " | head -n 1 | awk ' { print $1 } '"
+	    " | tr -d '\n'", grepbuf);
+#if 0
+	printf("cmd: %s\n", cmd);
+#else
+	system(cmd);
+#endif
+}
+
+void
 show(char *line)
 {
 	char *p;
 	int delta, i, len, chars, max = 0;
 	wchar_t wc;
-	char grepbuf[20], tmpbuf[5], cmd[50];
 
 	for (p = line, i = 1; *p; p += delta, i++) {
 		delta = mbtowc(&wc, p, -1);
@@ -58,13 +78,8 @@
 	putchar('\n');
 	for (p = line; *p; p += delta) {
 		delta = mbtowc(&wc, p, -1);
-		grepbuf[0] = '\0';
-		for (i = 0; i < delta; i++) {
+		for (i = 0; i < delta; i++)
 			printf("%X", (unsigned char)p[i]);
-			snprintf(tmpbuf, sizeof(tmpbuf),
-			    ".x%X", (unsigned char)p[i]);
-			strcat(grepbuf, tmpbuf);
-		}
 		adjust(max, delta << 1);
 	}
 	putchar('\n');
@@ -74,9 +89,11 @@
 		adjust(max, len);
 	}
 	putchar('\n');
-	/* printf("grepbuf: %s\n", grepbuf); */
-	snprintf(cmd, sizeof(cmd), "grep %s /usr/home/versus/p4/posix/UTF-8.cm", grepbuf);
-	system(cmd);
+	for (p = line; *p; p += delta) {
+		delta = mbtowc(&wc, p, -1);
+		grep_name(p, delta);
+	}
+	putchar('\n');
 }
 
 int