From owner-cvs-src@FreeBSD.ORG Sat Sep 10 08:19:59 2005 Return-Path: X-Original-To: cvs-src@FreeBSD.org 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 BE87B16A41F; Sat, 10 Sep 2005 08:19:59 +0000 (GMT) (envelope-from stefanf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7D09E43D4C; Sat, 10 Sep 2005 08:19:59 +0000 (GMT) (envelope-from stefanf@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 j8A8JxaB013450; Sat, 10 Sep 2005 08:19:59 GMT (envelope-from stefanf@repoman.freebsd.org) Received: (from stefanf@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j8A8Jx24013449; Sat, 10 Sep 2005 08:19:59 GMT (envelope-from stefanf) Message-Id: <200509100819.j8A8Jx24013449@repoman.freebsd.org> From: Stefan Farfeleder Date: Sat, 10 Sep 2005 08:19:58 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Cc: Subject: cvs commit: src/bin/sh eval.c X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 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: Sat, 10 Sep 2005 08:19:59 -0000 stefanf 2005-09-10 08:19:58 UTC FreeBSD src repository Modified files: bin/sh eval.c Log: Pass the EV_TESTED flag to the left operand of NSEMI nodes. This fixes two cases of unwanted termination with set -e: * if-commands containing several commands separated by semicolons, eg if false; false; then [...] * functions with an explicitely tested exit status that contain a failing command which is not the last one, eg f() { false false } f || true PR: 77067, 85267 Briefly reviewed by: cracauer Revision Changes Path 1.45 +1 -1 src/bin/sh/eval.c