From owner-p4-projects@FreeBSD.ORG  Tue Jul 22 14:43:52 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1433E1065670; Tue, 22 Jul 2008 14:43:52 +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 CBE79106564A
	for <perforce@FreeBSD.org>; Tue, 22 Jul 2008 14:43:51 +0000 (UTC)
	(envelope-from gk@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id BBA5D8FC19
	for <perforce@FreeBSD.org>; Tue, 22 Jul 2008 14:43:51 +0000 (UTC)
	(envelope-from gk@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 m6MEhpVo055154
	for <perforce@FreeBSD.org>; Tue, 22 Jul 2008 14:43:51 GMT
	(envelope-from gk@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m6MEhpuf055152
	for perforce@freebsd.org; Tue, 22 Jul 2008 14:43:51 GMT
	(envelope-from gk@FreeBSD.org)
Date: Tue, 22 Jul 2008 14:43:51 GMT
Message-Id: <200807221443.m6MEhpuf055152@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gk@FreeBSD.org using -f
From: Gleb Kurtsou <gk@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 145613 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, 22 Jul 2008 14:43:52 -0000

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

Change 145613 by gk@gk_h1 on 2008/07/22 14:43:20

	more strictly parse table file entries (according to man page).
	enforce one entry per line. allow spaces on lines (for ether addresses)

Affected files ...

.. //depot/projects/soc2008/gk_l2filter/sbin-pfctl/pfctl_radix.c#2 edit

Differences ...

==== //depot/projects/soc2008/gk_l2filter/sbin-pfctl/pfctl_radix.c#2 (text+ko) ====

@@ -607,12 +607,20 @@
 	do {
 		if (i < BUF_SIZE)
 			buf[i++] = next_ch;
-		next_ch = fgetc(fp);
-	} while (!feof(fp) && !isspace(next_ch));
+		/* leave only 1 space */
+		if (isspace(next_ch)) {
+			while (isspace(next_ch) && next_ch != '\n' && !feof(fp))
+				next_ch = fgetc(fp);
+		} else {
+			next_ch = fgetc(fp);
+		}
+	} while (!feof(fp) && next_ch != '\n');
 	if (i >= BUF_SIZE) {
 		errno = EINVAL;
 		return (-1);
 	}
+	if (i > 0 && isspace(buf[i-1]))
+		i--;
 	buf[i] = '\0';
 	return (1);
 }