diff options
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/mysql_install.c | 2 | ||||
| -rw-r--r-- | extra/replace.c | 2 | ||||
| -rw-r--r-- | extra/resolve_stack_dump.c | 13 | ||||
| -rw-r--r-- | extra/resolveip.c | 2 |
4 files changed, 11 insertions, 8 deletions
diff --git a/extra/mysql_install.c b/extra/mysql_install.c index e2783f906b9..3f3da8cfb51 100644 --- a/extra/mysql_install.c +++ b/extra/mysql_install.c @@ -157,7 +157,7 @@ static int get_answer(QUESTION_WIDGET* w) char c; if (!fgets(buf,sizeof(buf),w->in)) die("Failed fgets on input stream"); - switch ((c=tolower(*buf))) + switch ((c=my_tolower(system_charset_info,*buf))) { case '\n': return w->default_ind; diff --git a/extra/replace.c b/extra/replace.c index 41312f5e3d4..5826586988a 100644 --- a/extra/replace.c +++ b/extra/replace.c @@ -113,7 +113,7 @@ char *argv[]; exit(1); for (i=1,pos=word_end_chars ; i < 256 ; i++) - if (isspace(i)) + if (my_isspace(system_charset_info,i)) *pos++=i; *pos=0; if (!(replace=init_replace((char**) from.typelib.type_names, diff --git a/extra/resolve_stack_dump.c b/extra/resolve_stack_dump.c index c54f17a186e..f19ef467b5c 100644 --- a/extra/resolve_stack_dump.c +++ b/extra/resolve_stack_dump.c @@ -175,9 +175,9 @@ trace dump and specify the path to it with -s or --symbols-file"); static uchar hex_val(char c) { uchar l; - if (isdigit(c)) + if (my_isdigit(system_charset_info,c)) return c - '0'; - l = tolower(c); + l = my_tolower(system_charset_info,c); if (l < 'a' || l > 'f') return HEX_INVALID; return (uchar)10 + ((uchar)c - (uchar)'a'); @@ -203,9 +203,11 @@ static int init_sym_entry(SYM_ENTRY* se, char* buf) if (!se->addr) return -1; - while (isspace(*buf++)) ; + while (my_isspace(system_charset_info,*buf++)) + /* empty */; - while (isspace(*buf++)) ; /* skip more space */ + while (my_isspace(system_charset_info,*buf++)) + /* empty - skip more space */; --buf; /* now we are on the symbol */ for (p = se->symbol, p_end = se->symbol + sizeof(se->symbol) - 1; @@ -285,7 +287,8 @@ static void do_resolve() while (fgets(buf, sizeof(buf), fp_dump)) { p = buf; - while(isspace(*p)) + /* skip space */ + while (my_isspace(system_charset_info,*p)) ++p; if (*p++ == '0' && *p++ == 'x') diff --git a/extra/resolveip.c b/extra/resolveip.c index e380d920e9f..17bf087bd19 100644 --- a/extra/resolveip.c +++ b/extra/resolveip.c @@ -122,7 +122,7 @@ int main(int argc, char **argv) { ip = *argv++; - if (isdigit(ip[0])) + if (my_isdigit(system_charset_info,ip[0])) { taddr = inet_addr(ip); if (taddr == htonl(INADDR_BROADCAST)) |