From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 26510 invoked by alias); 31 Dec 2016 07:54:38 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: X-Seq: 40249 Received: (qmail 18572 invoked from network); 31 Dec 2016 07:54:38 -0000 X-Qmail-Scanner-Diagnostics: from mail-ua0-f196.google.com by f.primenet.com.au (envelope-from , uid 7791) with qmail-scanner-2.11 (clamdscan: 0.99.2/21882. spamassassin: 3.4.1. Clear:RC:0(209.85.217.196):SA:0(-0.0/5.0):. Processed in 1.202942 secs); 31 Dec 2016 07:54:38 -0000 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_PASS,T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.1 X-Envelope-From: schaefer@brasslantern.com X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | Received-SPF: pass (ns1.primenet.com.au: SPF record at _netblocks.google.com designates 209.85.217.196 as permitted sender) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brasslantern-com.20150623.gappssmtp.com; s=20150623; h=resent-from:resent-message-id:resent-date:resent-to:from:message-id :date:to:subject:mime-version; bh=du+yCfaV1KODf2nm/Z6yYGfHZDYlUNf5kEcFqPv/DAc=; b=S3FCJo6KyHx4izuDzEGBXEQLK7w1zGD4Blr4PTwr/92RNXaK7dBwidvuE71nDOFnet nbYiG4sN/3MIFawHl1JSGw6yJglVwhvCAwtfhPZLZJuBYT48kHh4SqJem7YDpbEld3Qg St5Ef+UYMYXZUqvUmx8ky1TAFlus46AnRsezf78WkuKooFJY8lRGyi5099LnrNNPYzc6 DeJptSMgoKMCPcedZPA6I/tvbwocgFdC0vz2QMEbXGDyRaEWrvuVKZm/NU2m/qouHg8l PeLrxv4JRS4EPrv4FywRD4fH4oyHAq4gj7ZePmQ9k+VSY0dzYVUopuqIr/xH3RkeXbdz dYEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:resent-from:resent-message-id:resent-date :resent-to:from:message-id:date:to:subject:mime-version; bh=du+yCfaV1KODf2nm/Z6yYGfHZDYlUNf5kEcFqPv/DAc=; b=lnHuLfbh5TOykOEmUF1KYfYZ/tsA2roCO82gjRdNDFj1PnRbW2N1w0M9pJdz34XiS4 NpJktkZdObliUMg+aNzqpWbtdphYiJ4ff5ncnF6R+Z27IiA5AqT5L7MSqtW5hsvyaIOG DV407Az4y7XLPqbtxveP8eKBzyDsBYwgbyWzSD3zdilikUDsgadaCA8rZcivoof767+O fP2Qq5/XGRrYV5v1mZVF/RqGR8a7aBsFzSdmArQF8pbJohdzibhIoBKiu5/Lcrd6V/E8 wIby7YkF9WUKr+whiaYkbeDwNnDjtEmxLUyHf9FSRDgFy/QJllpF8Jv1aMef6D2vBcdA YrPA== X-Gm-Message-State: AIkVDXIT4HqYcx46LErMGJjQv507ttNmwALiY9u3Tc9NlJ7wC7167yFFfVVIeqAZusWrFQ== X-Received: by 10.176.6.167 with SMTP id g36mr34590149uag.97.1483161178179; Fri, 30 Dec 2016 21:12:58 -0800 (PST) Resent-From: Bart Schaefer Resent-Message-Id: <161230211312.ZM24554@torch.brasslantern.com> Resent-Date: Fri, 30 Dec 2016 21:13:12 -0800 X-Mailer: OpenZMail Classic (0.9.2 24April2005) Resent-To: zsh-workers@zsh.org From: Bart Schaefer Message-Id: <161228164139.ZM6869@torch.brasslantern.com> Date: Wed, 28 Dec 2016 16:41:39 -0800 X-Mailer: OpenZMail Classic (0.9.2 24April2005) To: zsh-workers@zsh.org Subject: Error in zshaddhistory() should not prevent command from running MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Should this actually be in callhookfunc() itself? I note that the doc warns about errors in precmd killing off periodic, or else I'd say it ought to be. Possibly more controversial, why run this hook at all when nothing is being added? diff --git a/Src/hist.c b/Src/hist.c index 97fd340..350688d 100644 --- a/Src/hist.c +++ b/Src/hist.c @@ -1418,7 +1418,7 @@ hend(Eprog prog) DPUTS(hptr < chline, "History end pointer off start of line"); *hptr = '\0'; } - { + if (*chline) { LinkList hookargs = newlinklist(); int save_errflag = errflag; errflag = 0; @@ -1427,6 +1427,7 @@ hend(Eprog prog) addlinknode(hookargs, chline); callhookfunc("zshaddhistory", hookargs, 1, &hookret); + errflag &= ~ERRFLAG_ERROR; errflag |= save_errflag; } /* For history sharing, lock history file once for both read and write */