From owner-svn-src-head@FreeBSD.ORG Thu Dec 24 15:14:23 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 2A55D1065672; Thu, 24 Dec 2009 15:14:23 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 1A8658FC15; Thu, 24 Dec 2009 15:14:23 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nBOFEMoe033636; Thu, 24 Dec 2009 15:14:22 GMT (envelope-from jilles@svn.freebsd.org) Received: (from jilles@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBOFEMct033633; Thu, 24 Dec 2009 15:14:22 GMT (envelope-from jilles@svn.freebsd.org) Message-Id: <200912241514.nBOFEMct033633@svn.freebsd.org> From: Jilles Tjoelker Date: Thu, 24 Dec 2009 15:14:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r200943 - head/bin/sh 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: Thu, 24 Dec 2009 15:14:23 -0000 Author: jilles Date: Thu Dec 24 15:14:22 2009 New Revision: 200943 URL: http://svn.freebsd.org/changeset/base/200943 Log: sh: Remove setting variables from dotcmd/exportcmd. It is already done by evalcommand(), unless special-ness has been removed, in which case variable assignments should not persist. (These are currently always special builtins, but this will change later: command builtin, command substitution.) This also fixes a memory leak when calling . with variable assignments. Example: valgrind --leak-check=full sh -c 'x=1 . /dev/null; x=2' Modified: head/bin/sh/main.c head/bin/sh/var.c Modified: head/bin/sh/main.c ============================================================================== --- head/bin/sh/main.c Thu Dec 24 14:32:21 2009 (r200942) +++ head/bin/sh/main.c Thu Dec 24 15:14:22 2009 (r200943) @@ -315,7 +315,6 @@ find_dot_file(char *basename) int dotcmd(int argc, char **argv) { - struct strlist *sp; char *fullname; if (argc < 2) @@ -323,9 +322,6 @@ dotcmd(int argc, char **argv) exitstatus = 0; - for (sp = cmdenviron; sp ; sp = sp->next) - setvareq(savestr(sp->text), VSTRFIXED|VTEXTFIXED); - fullname = find_dot_file(argv[1]); setinputfile(fullname, 1); commandname = fullname; Modified: head/bin/sh/var.c ============================================================================== --- head/bin/sh/var.c Thu Dec 24 14:32:21 2009 (r200942) +++ head/bin/sh/var.c Thu Dec 24 15:14:22 2009 (r200943) @@ -607,7 +607,6 @@ exportcmd(int argc, char **argv) if (values && argc != 0) error("-p requires no arguments"); - listsetvar(cmdenviron); if (argc != 0) { while ((name = *argv++) != NULL) { if ((p = strchr(name, '=')) != NULL) {