commit 9b14cb6b12e6f1b07a1ad401e5cb6e091df4ac2f
author Rob Landley <rob@landley.net> Sat Sep 20 17:51:23 2014 -0500
committer Rob Landley <rob@landley.net> Sat Sep 20 17:51:23 2014 -0500
tree 381ab8b66cb4b1f5a93b09fb870ef18c3d8a0dae
parent 94a4603481b9fc663a72549b4cd0dcbd95fca062

Always call setlocale if I18N is enabled, so nested toy_exec() can switch it back off if necessary.

main.c

diff --git a/main.c b/main.c
index cfa2cc9..6e7d267 100644
--- a/main.c
+++ b/main.c
@@ -66,7 +66,7 @@
   toys.which = which;
   toys.argv = argv;
 
-  if (CFG_TOYBOX_I18N && (which->flags & TOYFLAG_LOCALE)) setlocale(LC_ALL, "");
+  if (CFG_TOYBOX_I18N) setlocale(LC_ALL, "C"+!!(which->flags & TOYFLAG_LOCALE));
 
   if (CFG_TOYBOX_HELP_DASHDASH && argv[1] && !strcmp(argv[1], "--help")) {
     if (toys.which == toy_list && toys.argv[2])