diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2009-04-18 11:08:37 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2009-04-18 11:08:37 +0000 |
| commit | 855762d6f4aff2733b77c2e41b29442d76812fc8 (patch) | |
| tree | 71da17447f02f62e9d4cc6d546a042d161f3acd9 /winsup/cygwin | |
| parent | 1b8e360e06c4e3596ced7c156b25a04b23fbe627 (diff) | |
| download | cygnal-855762d6f4aff2733b77c2e41b29442d76812fc8.tar.gz cygnal-855762d6f4aff2733b77c2e41b29442d76812fc8.tar.bz2 cygnal-855762d6f4aff2733b77c2e41b29442d76812fc8.zip | |
* dcrt0.cc (globify): Only call mbtowc for non-ascii chars.
Diffstat (limited to 'winsup/cygwin')
| -rw-r--r-- | winsup/cygwin/ChangeLog | 4 | ||||
| -rw-r--r-- | winsup/cygwin/dcrt0.cc | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index d85bb0aa4..3c5d3e537 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,7 @@ +2009-04-18 Corinna Vinschen <corinna@vinschen.de> + + * dcrt0.cc (globify): Only call mbtowc for non-ascii chars. + 2009-04-17 Corinna Vinschen <corinna@vinschen.de> * dcrt0.cc (globify): Make multibyte-aware. diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc index eddd11479..90960afd0 100644 --- a/winsup/cygwin/dcrt0.cc +++ b/winsup/cygwin/dcrt0.cc @@ -229,7 +229,7 @@ globify (char *word, char **&argv, int &argc, int &argvlen) else if (s[1] == quote || s[1] == '\\') s++; *p++ = '\\'; - size_t cnt = mbtowc (NULL, s, MB_CUR_MAX); + size_t cnt = isascii (*s) ? 1 : mbtowc (NULL, s, MB_CUR_MAX); if (cnt <= 1 || cnt == (size_t)-1) *p++ = *s; else |