append mark qualifier disturbs sort qualifier?

append mark qualifier disturbs sort qualifier?

[Han Pingtian]

Hi,

I noticed this result:

% zsh -f
localhost% print -l **/*(T)
2/
2/3/
2/3/4/
2/3/4/5.txt 
2/3/4/6.txt 
localhost% print -l **/*(odon)
2/3/4/5.txt
2/3/4/6.txt
2/3/4
2/3
2
localhost% print -l **/*(odT)  
2/3/4/5.txt 
2/3/4/6.txt 
2/3/4/
2/3/
2/
localhost% print -l **/*(odonT)
2/3/4/
2/3/4/5.txt 
2/3/4/6.txt 
2/
2/3/

Here, looks like "(T)" disturbs the sorting of "(odon)"?

Thanks in advance!

Re: append mark qualifier disturbs sort qualifier?

[Peter Stephenson]

On Wed, 24 Sep 2014 17:24:04 +0800
Han Pingtian <hanpt@linux.vnet.ibm.com> wrote:
> localhost% print -l **/*(odonT)
> 2/3/4/
> 2/3/4/5.txt 
> 2/3/4/6.txt 
> 2/
> 2/3/
> 
> Here, looks like "(T)" disturbs the sorting of "(odon)"?

I've reproduced this but haven't looked in detail yet.

It looks vaguely like the extra / is confusing it into thinking 2/3/4/
is an empty file in the directory 2/3/4.

However, that doesn't explain why 2/ comes before 2/3/.

pws

Re: append mark qualifier disturbs sort qualifier?

[Bart Schaefer]

On Sep 24, 10:49am, Peter Stephenson wrote:
}
} On Wed, 24 Sep 2014 17:24:04 +0800
} Han Pingtian <hanpt@linux.vnet.ibm.com> wrote:
} > localhost% print -l **/*(odonT)
} > 2/3/4/
} > 2/3/4/5.txt 
} > 2/3/4/6.txt 
} > 2/
} > 2/3/
} > 
} > Here, looks like "(T)" disturbs the sorting of "(odon)"?
} 
} I've reproduced this but haven't looked in detail yet.
} 
} It looks vaguely like the extra / is confusing it into thinking 2/3/4/
} is an empty file in the directory 2/3/4.

Not an empty file, but a file named (empty string).

} However, that doesn't explain why 2/ comes before 2/3/.

Empty string sorts before 3 the same as empty string sorts before 5 and
6.  This is all the same side-effect.

Re: append mark qualifier disturbs sort qualifier?

[Peter Stephenson]

On Wed, 24 Sep 2014 17:24:04 +0800
Han Pingtian <hanpt@linux.vnet.ibm.com> wrote:
> localhost% print -l **/*(odonT)
> 2/3/4/
> 2/3/4/5.txt 
> 2/3/4/6.txt 
> 2/
> 2/3/
> 
> Here, looks like "(T)" disturbs the sorting of "(odon)"?

Aha.

diff --git a/Src/glob.c b/Src/glob.c
index c24bfec..ca7bc44 100644
--- a/Src/glob.c
+++ b/Src/glob.c
@@ -900,6 +900,9 @@ gmatchcmp(Gmatch a, Gmatch b)
 		/* Count slashes.  Trailing slashes don't count. */
 		while (*aptr && *aptr == *bptr)
 		    aptr++, bptr++;
+		/* Like I just said... */
+		if ((!*aptr || !*bptr) && aptr > a->name && aptr[-1] == '/')
+		    aptr--, bptr--;
 		if (*aptr)
 		    for (; aptr[1]; aptr++)
 			if (*aptr == '/') {

-- 
Peter Stephenson <p.w.stephenson@ntlworld.com>
Web page now at http://homepage.ntlworld.com/p.w.stephenson/

Re: append mark qualifier disturbs sort qualifier?

[Han Pingtian]

On Wed, Sep 24, 2014 at 07:27:57PM +0100, Peter Stephenson wrote:
> On Wed, 24 Sep 2014 17:24:04 +0800
> Han Pingtian <hanpt@linux.vnet.ibm.com> wrote:
> > localhost% print -l **/*(odonT)
> > 2/3/4/
> > 2/3/4/5.txt 
> > 2/3/4/6.txt 
> > 2/
> > 2/3/
> > 
> > Here, looks like "(T)" disturbs the sorting of "(odon)"?
> 
> Aha.
> 
> diff --git a/Src/glob.c b/Src/glob.c
> index c24bfec..ca7bc44 100644
> --- a/Src/glob.c
> +++ b/Src/glob.c
> @@ -900,6 +900,9 @@ gmatchcmp(Gmatch a, Gmatch b)
>  		/* Count slashes.  Trailing slashes don't count. */
>  		while (*aptr && *aptr == *bptr)
>  		    aptr++, bptr++;
> +		/* Like I just said... */
> +		if ((!*aptr || !*bptr) && aptr > a->name && aptr[-1] == '/')
> +		    aptr--, bptr--;
>  		if (*aptr)
>  		    for (; aptr[1]; aptr++)
>  			if (*aptr == '/') {
> 
This patch works just fine. Thanks!