From owner-svn-src-head@FreeBSD.ORG Sun Jan 4 17:08:48 2009 Return-Path: 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 7FD06106566C; Sun, 4 Jan 2009 17:08:48 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from harmony.bsdimp.com (bsdimp.com [199.45.160.85]) by mx1.freebsd.org (Postfix) with ESMTP id 22A538FC12; Sun, 4 Jan 2009 17:08:48 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from localhost (localhost [127.0.0.1]) by harmony.bsdimp.com (8.14.2/8.14.1) with ESMTP id n04H7fxX095092; Sun, 4 Jan 2009 10:07:41 -0700 (MST) (envelope-from imp@bsdimp.com) Date: Sun, 04 Jan 2009 10:07:55 -0700 (MST) Message-Id: <20090104.100755.686402162.imp@bsdimp.com> To: obrien@freebsd.org From: "M. Warner Losh" In-Reply-To: <200901031014.n03AE1lA022458@svn.freebsd.org> References: <200901031014.n03AE1lA022458@svn.freebsd.org> X-Mailer: Mew version 5.2 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r186713 - head/usr.bin/make 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Jan 2009 17:08:48 -0000 In message: <200901031014.n03AE1lA022458@svn.freebsd.org> "David E. O'Brien" writes: : Author: obrien : Date: Sat Jan 3 10:14:01 2009 : New Revision: 186713 : URL: http://svn.freebsd.org/changeset/base/186713 : : Log: : + Add the -Q be-quiet flag for parallel jobs. : - Enable -Q by default for the moment - there is something weird : going on in the rescue build. This seems to also include other things not related to -Q, is that intentional: : Modified: head/usr.bin/make/var.c : ============================================================================== : --- head/usr.bin/make/var.c Sat Jan 3 05:32:37 2009 (r186712) : +++ head/usr.bin/make/var.c Sat Jan 3 10:14:01 2009 (r186713) : @@ -946,12 +946,14 @@ VarFindAny(const char name[], GNode *ctx : * The name and val arguments are duplicated so they may : * safely be freed. : */ : -static void : +static Var * : VarAdd(const char *name, const char *val, GNode *ctxt) : { : + Var *v; : : - Lst_AtFront(&ctxt->context, VarCreate(name, val, 0)); : + Lst_AtFront(&ctxt->context, v = VarCreate(name, val, 0)); : DEBUGF(VAR, ("%s:%s = %s\n", ctxt->name, name, val)); : + return (v); : } : : /** : @@ -1004,30 +1006,22 @@ Var_Set(const char *name, const char *va : n = VarPossiblyExpand(name, ctxt); : v = VarFindOnly(n, ctxt); : if (v == NULL) { : - VarAdd(n, val, ctxt); : - if (ctxt == VAR_CMD) { : - /* : - * Any variables given on the command line : - * are automatically exported to the : - * environment (as per POSIX standard) : - */ : - setenv(n, val, 1); : - } : + v = VarAdd(n, val, ctxt); : } else { : Buf_Clear(v->val); : Buf_Append(v->val, val); : - : - if (ctxt == VAR_CMD || (v->flags & VAR_TO_ENV)) { : - /* : - * Any variables given on the command line : - * are automatically exported to the : - * environment (as per POSIX standard) : - */ : - setenv(n, val, 1); : - } : DEBUGF(VAR, ("%s:%s = %s\n", ctxt->name, n, val)); : } : : + if (ctxt == VAR_CMD || (v->flags & VAR_TO_ENV)) { : + /* : + * Any variables given on the command line : + * are automatically exported to the : + * environment (as per POSIX standard) : + */ : + setenv(n, val, 1); : + } : + : free(n); : } : : @@ -2325,7 +2319,8 @@ match_var(const char str[], const char v : * None. The old string must be freed by the caller : */ : Buffer * : -Var_Subst(const char *str, GNode *ctxt, Boolean err) : +//Var_Subst(const char *var, const char *str, GNode *ctxt, Boolean undefErr) : +Var_Subst( const char *str, GNode *ctxt, Boolean err) : { : Boolean errorReported; : Buffer *buf; /* Buffer for forming things */ :