diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2007-01-21 22:47:36 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2007-01-21 22:47:36 +0000 |
| commit | 553e011320798af097e8de95a1e2a1d2ed6a1a3e (patch) | |
| tree | d2e7cd070f33afddb0ce84129e61b4f3034bceb4 /Src/Zle/zle_tricky.c | |
| parent | f3bf48149a2e86faf35db529d864edd904b52fb4 (diff) | |
| download | zsh-553e011320798af097e8de95a1e2a1d2ed6a1a3e.tar.gz zsh-553e011320798af097e8de95a1e2a1d2ed6a1a3e.tar.xz zsh-553e011320798af097e8de95a1e2a1d2ed6a1a3e.zip | |
23118: improve sorting to make it work with locales
Diffstat (limited to 'Src/Zle/zle_tricky.c')
| -rw-r--r-- | Src/Zle/zle_tricky.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/Src/Zle/zle_tricky.c b/Src/Zle/zle_tricky.c index 1393027f7..845f74bc5 100644 --- a/Src/Zle/zle_tricky.c +++ b/Src/Zle/zle_tricky.c @@ -2100,28 +2100,26 @@ sfxlen(char *s, char *t) } #endif -/* This is strcmp with ignoring backslashes. */ +/* This is zstrcmp with ignoring backslashes. */ /**/ mod_export int -strbpcmp(char **aa, char **bb) +zstrbcmp(const char *a, const char *b) { - char *a = *aa, *b = *bb; + const char *astart = a; while (*a && *b) { if (*a == '\\') a++; if (*b == '\\') b++; - if (*a != *b) + if (*a != *b || !*a) break; - if (*a) - a++; - if (*b) - b++; + a++; + b++; } if (isset(NUMERICGLOBSORT) && (idigit(*a) || idigit(*b))) { - for (; a > *aa && idigit(a[-1]); a--, b--); + for (; a > astart && idigit(a[-1]); a--, b--); if (idigit(*a) && idigit(*b)) { while (*a == '0') a++; @@ -2310,8 +2308,8 @@ listlist(LinkList l) *p = (char *) getdata(node); *p = NULL; - qsort((void *) data, num, sizeof(char *), - (int (*) _((const void *, const void *))) strbpcmp); + strmetasort((char **)data, SORTIT_IGNORING_BACKSLASHES | + (isset(NUMERICGLOBSORT) ? SORTIT_NUMERICALLY : 0), NULL); for (p = data, lenp = lens; *p; p++, lenp++) { len = *lenp = ZMB_nicewidth(*p) + 2; |