From owner-svn-src-head@FreeBSD.ORG  Mon Feb  3 16:54:53 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@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 EAC63E08;
 Mon,  3 Feb 2014 16:54:53 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id D727E1B89;
 Mon,  3 Feb 2014 16:54:53 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s13GsrXe067459;
 Mon, 3 Feb 2014 16:54:53 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s13Gsr6w067457;
 Mon, 3 Feb 2014 16:54:53 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201402031654.s13Gsr6w067457@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Mon, 3 Feb 2014 16:54:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r261438 - head/usr.sbin/config
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.17
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/options/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: Mon, 03 Feb 2014 16:54:54 -0000

Author: imp
Date: Mon Feb  3 16:54:53 2014
New Revision: 261438
URL: http://svnweb.freebsd.org/changeset/base/261438

Log:
  Move the check for standard keyword + optional inclusion specifier to
  its proper location. Otherwise you could have 'file.c standard pci'
  without an error. This construct isn't in our tree, and has no well
  defined meaning.

Modified:
  head/usr.sbin/config/mkmakefile.c

Modified: head/usr.sbin/config/mkmakefile.c
==============================================================================
--- head/usr.sbin/config/mkmakefile.c	Mon Feb  3 16:47:10 2014	(r261437)
+++ head/usr.sbin/config/mkmakefile.c	Mon Feb  3 16:54:53 2014	(r261438)
@@ -513,18 +513,18 @@ nextparam:
 		nowerror = 1;
 		goto nextparam;
 	}
+	if (std) {
+		fprintf(stderr,
+		    "standard entry %s has optional inclusion specifier %s!\n",
+		    this, wd);
+		exit(1);
+	}
 	nreqs++;
 	STAILQ_FOREACH(dp, &dtab, d_next)
 		if (eq(dp->d_name, wd)) {
 			dp->d_done |= DEVDONE;
 			goto nextparam;
 		}
-	if (std) {
-		fprintf(stderr,
-		    "standard entry %s has a device keyword - %s!\n",
-		    this, wd);
-		exit(1);
-	}
 	SLIST_FOREACH(op, &opt, op_next)
 		if (op->op_value == 0 && opteq(op->op_name, wd))
 			goto nextparam;