Re: fc -lr broken in current git?

[Peter Stephenson <Peter.Stephenson@csr.com>]

On Mon, 30 Apr 2012 14:07:09 +0200
Hauke Petersen <hkptrsn@googlemail.com> 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.

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	30 Apr 2012 12:45:12 -0000
@@ -1641,7 +1641,7 @@ static int
 fclist(FILE *f, Options ops, zlong first, zlong last,
        struct asgment *subs, Patprog pprog)
 {
-    int fclistdone = 0;
+    int fclistdone = 0, wrong_order;
     zlong tmp;
     char *s, *tdfmt, *timebuf;
     Histent ent;
@@ -1651,8 +1651,11 @@ fclist(FILE *f, Options ops, zlong first
 	tmp = last;
 	last = first;
 	first = tmp;
+	wrong_order = (last > first);
+    } else {
+	wrong_order = (first > last);
     }
-    if (first > last) {
+    if (wrong_order) {
 	zwarnnam("fc", "history events are in wrong order, aborted");
 	if (f != stdout)
 	    fclose(f);

-- 
Peter Stephenson <pws@csr.com>            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