diff options
| author | Jun T <takimoto-j@kba.biglobe.ne.jp> | 2014-06-10 23:46:15 -0700 |
|---|---|---|
| committer | Barton E. Schaefer <schaefer@zsh.org> | 2014-06-10 23:46:15 -0700 |
| commit | e1fbf76de0b7682ed0f66883073037fee581e316 (patch) | |
| tree | ab469eb9924cc9d36d7e7a383842fb1e5c5f0447 | |
| parent | 6336347c9e02ebae565b2d62987d1052bcba5567 (diff) | |
| download | zsh-e1fbf76de0b7682ed0f66883073037fee581e316.tar.gz zsh-e1fbf76de0b7682ed0f66883073037fee581e316.tar.xz zsh-e1fbf76de0b7682ed0f66883073037fee581e316.zip | |
32765: fix build when not MULTIBYTE_SUPPORT
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Src/glob.c | 16 |
2 files changed, 18 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 757ceaf57..f4fac3142 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-06-10 Barton E. Schaefer <schaefer@zsh.org> + + * Jun T: 32765: Src/glob.c: fix build when not MULTIBYTE_SUPPORT + 2014-06-09 Peter Stephenson <p.stephenson@samsung.com> * Jun T: 32755: Doc/Zsh/grammar.yo: move line that was in the diff --git a/Src/glob.c b/Src/glob.c index 15a5f70b7..6403e46f7 100644 --- a/Src/glob.c +++ b/Src/glob.c @@ -2129,7 +2129,13 @@ bracechardots(char *str, convchar_t *c1p, convchar_t *c2p) pconv = pnext; MB_METACHARINIT(); pnext += MB_METACHARLENCONV(pconv, &cstart); - if (cstart == WEOF || pnext[0] != '.' || pnext[1] != '.') + if ( +#ifdef MULTIBYTE_SUPPORT + cstart == WEOF || +#else + !cstart || +#endif + pnext[0] != '.' || pnext[1] != '.') return 0; pnext += 2; if (itok(*pnext)) { @@ -2140,7 +2146,13 @@ bracechardots(char *str, convchar_t *c1p, convchar_t *c2p) pconv = pnext; MB_METACHARINIT(); pnext += MB_METACHARLENCONV(pconv, &cend); - if (cend == WEOF || *pnext != Outbrace) + if ( +#ifdef MULTIBYTE_SUPPORT + cend == WEOF || +#else + !cend || +#endif + *pnext != Outbrace) return 0; if (c1p) *c1p = cstart; |