From owner-svn-src-head@FreeBSD.ORG  Wed Jul  4 17:31:53 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BB12E106564A;
	Wed,  4 Jul 2012 17:31:53 +0000 (UTC) (envelope-from pjd@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A44D48FC17;
	Wed,  4 Jul 2012 17:31:53 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q64HVrGl023249;
	Wed, 4 Jul 2012 17:31:53 GMT (envelope-from pjd@svn.freebsd.org)
Received: (from pjd@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q64HVrPH023247;
	Wed, 4 Jul 2012 17:31:53 GMT (envelope-from pjd@svn.freebsd.org)
Message-Id: <201207041731.q64HVrPH023247@svn.freebsd.org>
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Wed, 4 Jul 2012 17:31:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r238110 - head/tools/regression/pjdfstest
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 04 Jul 2012 17:31:53 -0000

Author: pjd
Date: Wed Jul  4 17:31:53 2012
New Revision: 238110
URL: http://svn.freebsd.org/changeset/base/238110

Log:
  Recognize 'none' or '0' as no flags.

Modified:
  head/tools/regression/pjdfstest/pjdfstest.c

Modified: head/tools/regression/pjdfstest/pjdfstest.c
==============================================================================
--- head/tools/regression/pjdfstest/pjdfstest.c	Wed Jul  4 16:47:39 2012	(r238109)
+++ head/tools/regression/pjdfstest/pjdfstest.c	Wed Jul  4 17:31:53 2012	(r238110)
@@ -350,10 +350,10 @@ str2flags(struct flag *tflags, char *sfl
 	unsigned int i;
 	char *f;
 
-	for (f = strtok(sflags, ","); f != NULL; f = strtok(NULL, ",")) {
-		/* Support magic 'none' flag which just reset all flags. */
-		if (strcmp(f, "none") == 0)
-			return (0);
+	/* 'none' or '0' means no flags */
+	if (strcmp(sflags, "none") == 0 || strcmp(sflags, "0") == 0)
+		return (0);
+	for (f = strtok(sflags, ",|"); f != NULL; f = strtok(NULL, ",|")) {
 		for (i = 0; tflags[i].f_str != NULL; i++) {
 			if (strcmp(tflags[i].f_str, f) == 0)
 				break;