From owner-cvs-src@FreeBSD.ORG Fri May 13 06:31:46 2005 Return-Path: Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2EB8D16A4CE; Fri, 13 May 2005 06:31:46 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 02EC943D75; Fri, 13 May 2005 06:31:46 +0000 (GMT) (envelope-from harti@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 j4D6Vj6a046902; Fri, 13 May 2005 06:31:45 GMT (envelope-from harti@repoman.freebsd.org) Received: (from harti@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j4D6VjWw046901; Fri, 13 May 2005 06:31:45 GMT (envelope-from harti) Message-Id: <200505130631.j4D6VjWw046901@repoman.freebsd.org> From: Hartmut Brandt Date: Fri, 13 May 2005 06:31:45 +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 job.c job.h X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 May 2005 06:31:46 -0000 harti 2005-05-13 06:31:45 UTC FreeBSD src repository Modified files: usr.bin/make job.c job.h Log: Make Shell_Init() static - it's only used here. Make sure we don't end up with shellPath beeing non-zero, but shellName beeing zero in the error case - back out cleanly from the error. When executing a command for macro assignment in Cmd_Exec() stuff the path of the shell into argv[0], not the name. This makes no difference from the functionality point of view, but allows the regression tests to determine whether make executes the correct shell. Revision Changes Path 1.112 +9 -9 src/usr.bin/make/job.c 1.40 +0 -1 src/usr.bin/make/job.h