From owner-p4-projects@FreeBSD.ORG  Tue Nov 29 19:06:42 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4448416A423; Tue, 29 Nov 2005 19:06:41 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 036DB16A41F
	for <perforce@freebsd.org>; Tue, 29 Nov 2005 19:06:41 +0000 (GMT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0C32743D79
	for <perforce@freebsd.org>; Tue, 29 Nov 2005 19:06:28 +0000 (GMT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jATJ6RqS022717
	for <perforce@freebsd.org>; Tue, 29 Nov 2005 19:06:27 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jATJ6QnU022713
	for perforce@freebsd.org; Tue, 29 Nov 2005 19:06:26 GMT
	(envelope-from peter@freebsd.org)
Date: Tue, 29 Nov 2005 19:06:26 GMT
Message-Id: <200511291906.jATJ6QnU022713@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 87455 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, 29 Nov 2005 19:06:42 -0000

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

Change 87455 by peter@peter_melody on 2005/11/29 19:06:13

	When DEFAULTS was added, the existence check of the main
	config file was deferred till AFTER a mkdir of ../compile/[*argv]
	This leads to garbage directories being created.  As a hack, do an
	explicit open test for the named config file.

Affected files ...

.. //depot/projects/hammer/usr.sbin/config/main.c#11 edit

Differences ...

==== //depot/projects/hammer/usr.sbin/config/main.c#11 (text+ko) ====

@@ -96,6 +96,7 @@
 	int ch, len;
 	char *p;
 	char xxx[MAXPATHLEN];
+	FILE *fp;
 
 	while ((ch = getopt(argc, argv, "d:gpV")) != -1)
 		switch (ch) {
@@ -125,6 +126,10 @@
 		usage();
 
 	PREFIX = *argv;
+	fp = fopen(PREFIX, "r");
+	if (fp == NULL)
+		err(2, "%s", PREFIX);
+	fclose(fp);
 	if (freopen("DEFAULTS", "r", stdin) != NULL) {
 		found_defaults = 1;
 		yyfile = "DEFAULTS";