diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2007-02-06 21:47:54 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2007-02-06 21:47:54 +0000 |
| commit | 0108088f52ee58fc8a2e83f86c9f2506165a16cd (patch) | |
| tree | bebb78bce7e19684f24c7e6c9b46cf1f2d65f6ce /Src/builtin.c | |
| parent | bae2ec88e587efb6f0cc9ef8db5d3c8b6de78382 (diff) | |
| download | zsh-0108088f52ee58fc8a2e83f86c9f2506165a16cd.tar.gz zsh-0108088f52ee58fc8a2e83f86c9f2506165a16cd.tar.xz zsh-0108088f52ee58fc8a2e83f86c9f2506165a16cd.zip | |
23152: make ztrcmp() respect MULTIBYTE
make sorting of printed hash tables more consistent
Diffstat (limited to 'Src/builtin.c')
| -rw-r--r-- | Src/builtin.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/Src/builtin.c b/Src/builtin.c index 36e829f22..cec211e67 100644 --- a/Src/builtin.c +++ b/Src/builtin.c @@ -493,7 +493,7 @@ bin_enable(char *name, char **argv, Options ops, int func) tokenize(*argv); if ((pprog = patcompile(*argv, PAT_STATIC, 0))) { queue_signals(); - match += scanmatchtable(ht, pprog, 0, 0, scanfunc, 0); + match += scanmatchtable(ht, pprog, 0, 0, 0, scanfunc, 0); unqueue_signals(); } else { @@ -2394,7 +2394,7 @@ bin_typeset(char *name, char **argv, Options ops, int func) continue; } if (OPT_PLUS(ops,'m') && !asg->value) { - scanmatchtable(paramtab, pprog, on|roff, 0, + scanmatchtable(paramtab, pprog, 1, on|roff, 0, paramtab->printnode, printflags); continue; } @@ -2720,7 +2720,7 @@ bin_functions(char *name, char **argv, Options ops, int func) /* with no options, just print all functions matching the glob pattern */ queue_signals(); if (!(on|off)) { - scanmatchtable(shfunctab, pprog, 0, DISABLED, + scanmatchtable(shfunctab, pprog, 1, 0, DISABLED, shfunctab->printnode, pflags); } else { /* apply the options to all functions matching the glob pattern */ @@ -2987,25 +2987,25 @@ bin_whence(char *nam, char **argv, Options ops, int func) * We're not using it, so search for ... */ /* aliases ... */ - scanmatchtable(aliastab, pprog, 0, DISABLED, + scanmatchtable(aliastab, pprog, 1, 0, DISABLED, aliastab->printnode, printflags); /* and reserved words ... */ - scanmatchtable(reswdtab, pprog, 0, DISABLED, + scanmatchtable(reswdtab, pprog, 1, 0, DISABLED, reswdtab->printnode, printflags); /* and shell functions... */ - scanmatchtable(shfunctab, pprog, 0, DISABLED, + scanmatchtable(shfunctab, pprog, 1, 0, DISABLED, shfunctab->printnode, printflags); /* and builtins. */ - scanmatchtable(builtintab, pprog, 0, DISABLED, + scanmatchtable(builtintab, pprog, 1, 0, DISABLED, builtintab->printnode, printflags); } /* Done search for `internal' commands, if the -p option * * was not used. Now search the path. */ cmdnamtab->filltable(cmdnamtab); - scanmatchtable(cmdnamtab, pprog, 0, 0, + scanmatchtable(cmdnamtab, pprog, 1, 0, 0, cmdnamtab->printnode, printflags); unqueue_signals(); @@ -3193,7 +3193,7 @@ bin_hash(char *name, char **argv, Options ops, UNUSED(int func)) tokenize(*argv); /* expand */ if ((pprog = patcompile(*argv, PAT_STATIC, NULL))) { /* display matching hash table elements */ - scanmatchtable(ht, pprog, 0, 0, ht->printnode, printflags); + scanmatchtable(ht, pprog, 1, 0, 0, ht->printnode, printflags); } else { untokenize(*argv); zwarnnam(name, "bad pattern : %s", *argv); @@ -3378,7 +3378,7 @@ bin_alias(char *name, char **argv, Options ops, UNUSED(int func)) if ((pprog = patcompile(*argv, PAT_STATIC, NULL))) { /* display the matching aliases */ queue_signals(); - scanmatchtable(ht, pprog, flags1, flags2, + scanmatchtable(ht, pprog, 1, flags1, flags2, ht->printnode, printflags); unqueue_signals(); } else { |