From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 21385 invoked by alias); 3 May 2012 09:17:56 -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: 30469 Received: (qmail 9508 invoked from network); 3 May 2012 09:17:45 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_LOW, SPF_HELO_PASS autolearn=ham version=3.3.2 Received-SPF: none (ns1.primenet.com.au: domain at csr.com does not designate permitted sender hosts) Date: Thu, 3 May 2012 10:17:33 +0100 From: Peter Stephenson To: Subject: Re: fc -lr broken in current git? Message-ID: <20120503101733.646911ed@pwslap01u.europe.root.pri> In-Reply-To: <20120430134614.2104cda8@pwslap01u.europe.root.pri> References: <4F9E806D.9030206@gmail.com> <20120430134614.2104cda8@pwslap01u.europe.root.pri> Organization: Cambridge Silicon Radio X-Mailer: Claws Mail 3.7.9 (GTK+ 2.22.0; i386-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.101.10.18] X-Scanned-By: MailControl 7.7.0.1 (www.mailcontrol.com) on 10.68.0.114 On Mon, 30 Apr 2012 13:46:14 +0100 Peter Stephenson wrote: > On Mon, 30 Apr 2012 14:07:09 +0200 > Hauke Petersen wrote: > > fc -lr seems to be problematic in current git: > > Yes, it doesn't take account of the -r flag. > > I wonder if a better fix is only to check the order when actually > executing code, which is where the problems happened. This will allow listing in any order, but not allow any execution out of order, even if the -r flag is explicitly given. That should be enough to prevent bad behaviour; does it disallow anything useful? I think deliberately reversing the order of commands using the history mechanism is a *very* abstruse use. Index: Src/builtin.c =================================================================== RCS file: /cvsroot/zsh/zsh/Src/builtin.c,v retrieving revision 1.256 diff -p -u -r1.256 builtin.c --- Src/builtin.c 7 Mar 2012 06:10:42 -0000 1.256 +++ Src/builtin.c 3 May 2012 09:12:41 -0000 @@ -1498,7 +1498,7 @@ bin_fc(char *nam, char **argv, Options o } if (OPT_ISSET(ops,'l')) { /* list the required part of the history */ - retval = fclist(stdout, ops, first, last, asgf, pprog); + retval = fclist(stdout, ops, first, last, asgf, pprog, 0); unqueue_signals(); } else { @@ -1530,7 +1530,7 @@ bin_fc(char *nam, char **argv, Options o } } ops->ind['n'] = 1; /* No line numbers here. */ - if (!fclist(out, ops, first, last, asgf, pprog)) { + if (!fclist(out, ops, first, last, asgf, pprog, 1)) { char *editor; if (func == BIN_R) @@ -1639,7 +1639,7 @@ fcsubs(char **sp, struct asgment *sub) /**/ static int fclist(FILE *f, Options ops, zlong first, zlong last, - struct asgment *subs, Patprog pprog) + struct asgment *subs, Patprog pprog, int is_command) { int fclistdone = 0; zlong tmp; @@ -1652,8 +1652,8 @@ fclist(FILE *f, Options ops, zlong first last = first; first = tmp; } - if (first > last) { - zwarnnam("fc", "history events are in wrong order, aborted"); + if (is_command && first > last) { + zwarnnam("fc", "history events can't be executed backwards, aborted"); if (f != stdout) fclose(f); return 1; -- Peter Stephenson Software Engineer Tel: +44 (0)1223 692070 Cambridge Silicon Radio Limited Churchill House, Cambridge Business Park, Cowley Road, Cambridge, CB4 0WZ, UK Member of the CSR plc group of companies. CSR plc registered in England and Wales, registered number 4187346, registered office Churchill House, Cambridge Business Park, Cowley Road, Cambridge, CB4 0WZ, United Kingdom More information can be found at www.csr.com. Follow CSR on Twitter at http://twitter.com/CSR_PLC and read our blog at www.csr.com/blog