From: Steve Holme Date: Wed, 5 Feb 2014 20:20:45 +0000 (+0000) Subject: tool_operate: Moved locale setup code into operate_init() X-Git-Tag: curl-7_36_0~217 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=61ba1daba01dfd959d68636b8d1785d00cdf65b4;p=curl tool_operate: Moved locale setup code into operate_init() --- diff --git a/src/tool_operate.c b/src/tool_operate.c index de49bc9b1..b180f067d 100644 --- a/src/tool_operate.c +++ b/src/tool_operate.c @@ -193,6 +193,11 @@ static CURLcode operate_init(struct Configurable *config) return CURLE_FAILED_INIT; } + /* Setup proper locale from environment */ +#ifdef HAVE_SETLOCALE + setlocale(LC_ALL, ""); +#endif + return CURLE_OK; } @@ -230,11 +235,6 @@ static int operate_do(struct Configurable *config, int argc, ** from outside of nested loops further down below. */ - /* setup proper locale from environment */ -#ifdef HAVE_SETLOCALE - setlocale(LC_ALL, ""); -#endif - /* Parse .curlrc if necessary */ if((argc == 1) || (!curlx_strequal(argv[1], "-q"))) { parseconfig(NULL, config); /* ignore possible failure */