From owner-cvs-all@FreeBSD.ORG Thu Jul 22 11:12:02 2004 Return-Path: Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5811316A4CE; Thu, 22 Jul 2004 11:12:02 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5243443D31; Thu, 22 Jul 2004 11:12:02 +0000 (GMT) (envelope-from harti@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6MBC2pt098243; Thu, 22 Jul 2004 11:12:02 GMT (envelope-from harti@repoman.freebsd.org) Received: (from harti@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6MBC2OI098242; Thu, 22 Jul 2004 11:12:02 GMT (envelope-from harti) Message-Id: <200407221112.i6MBC2OI098242@repoman.freebsd.org> From: Hartmut Brandt Date: Thu, 22 Jul 2004 11:12:01 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Subject: cvs commit: src/usr.bin/make parse.c X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Jul 2004 11:12:02 -0000 harti 2004-07-22 11:12:01 UTC FreeBSD src repository Modified files: usr.bin/make parse.c Log: Fix handling of comments on .elif lines. The patch given in a followup to the PR failed, because the line skipping function is actually called from two places in the code to do quite different things (this should be two functions probably): in a false .if to skip to the next line beginning with a dot and to collect .for loops. In the seconds case we should not skip comments, because they are actually harder to handle than we need for the .if case and should defer this to the main code. PR: bin/25627 Submitted by: Seth Kingsley (original patch) Revision Changes Path 1.57 +7 -0 src/usr.bin/make/parse.c