From owner-cvs-src-old@FreeBSD.ORG Sun May 31 12:36:30 2009 Return-Path: Delivered-To: cvs-src-old@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CD6311065670 for ; Sun, 31 May 2009 12:36:30 +0000 (UTC) (envelope-from stefanf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BA1638FC0A for ; Sun, 31 May 2009 12:36:30 +0000 (UTC) (envelope-from stefanf@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4VCaUnG061655 for ; Sun, 31 May 2009 12:36:30 GMT (envelope-from stefanf@repoman.freebsd.org) Received: (from svn2cvs@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4VCaUxL061654 for cvs-src-old@freebsd.org; Sun, 31 May 2009 12:36:30 GMT (envelope-from stefanf@repoman.freebsd.org) Message-Id: <200905311236.n4VCaUxL061654@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to stefanf@repoman.freebsd.org using -f From: Stefan Farfeleder Date: Sun, 31 May 2009 12:36:14 +0000 (UTC) To: cvs-src-old@freebsd.org X-FreeBSD-CVS-Branch: HEAD Subject: cvs commit: src/bin/sh eval.c eval.h histedit.c main.c trap.c X-BeenThere: cvs-src-old@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: **OBSOLETE** CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 May 2009 12:36:31 -0000 stefanf 2009-05-31 12:36:14 UTC FreeBSD src repository Modified files: bin/sh eval.c eval.h histedit.c main.c trap.c Log: SVN rev 193169 on 2009-05-31 12:36:14Z by stefanf Fix the eval command in combination with set -e. Before this change the shell would always terminate if eval returned with a non-zero exit status regardless if the status was actually tested. Unfortunately a new file-scope variable is needed, the alternative would only be to add a new parameter to all built-ins. PR: 134881 Revision Changes Path 1.58 +5 -3 src/bin/sh/eval.c 1.12 +1 -1 src/bin/sh/eval.h 1.30 +2 -2 src/bin/sh/histedit.c 1.30 +1 -1 src/bin/sh/main.c 1.33 +2 -2 src/bin/sh/trap.c