From owner-svn-src-stable-7@FreeBSD.ORG Wed Jul 14 15:18:22 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7601C1065675; Wed, 14 Jul 2010 15:18:22 +0000 (UTC) (envelope-from mp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 64F228FC21; Wed, 14 Jul 2010 15:18:22 +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 o6EFIM9c002632; Wed, 14 Jul 2010 15:18:22 GMT (envelope-from mp@svn.freebsd.org) Received: (from mp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6EFIMb6002630; Wed, 14 Jul 2010 15:18:22 GMT (envelope-from mp@svn.freebsd.org) Message-Id: <201007141518.o6EFIMb6002630@svn.freebsd.org> From: Mark Peek Date: Wed, 14 Jul 2010 15:18:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r210060 - stable/7/contrib/tcsh X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Jul 2010 15:18:22 -0000 Author: mp Date: Wed Jul 14 15:18:22 2010 New Revision: 210060 URL: http://svn.freebsd.org/changeset/base/210060 Log: Merge r197812: Fix tcsh losing history when tcsh terminates because the pty beneath it is closed. Modified: stable/7/contrib/tcsh/sh.c Directory Properties: stable/7/contrib/tcsh/ (props changed) Modified: stable/7/contrib/tcsh/sh.c ============================================================================== --- stable/7/contrib/tcsh/sh.c Wed Jul 14 15:14:52 2010 (r210059) +++ stable/7/contrib/tcsh/sh.c Wed Jul 14 15:18:22 2010 (r210060) @@ -1291,6 +1291,8 @@ main(int argc, char **argv) /* * Mop-up. */ + /* Take care of these (especially HUP) here instead of inside flush. */ + handle_pending_signals(); if (intty) { if (loginsh) { xprintf("logout\n");