OSDN Git Service

Forgot to check in main() part of TOYFLAG_LOCALE change.
authorRob Landley <rob@landley.net>
Sat, 21 Jun 2014 18:03:42 +0000 (13:03 -0500)
committerRob Landley <rob@landley.net>
Sat, 21 Jun 2014 18:03:42 +0000 (13:03 -0500)
main.c

diff --git a/main.c b/main.c
index fdb4749..6321ad1 100644 (file)
--- a/main.c
+++ b/main.c
@@ -66,6 +66,8 @@ static void toy_singleinit(struct toy_list *which, char *argv[])
   toys.which = which;
   toys.argv = argv;
 
+  if (CFG_TOYBOX_I18N && (which->flags & TOYFLAG_LOCALE)) setlocale(LC_ALL, "");
+
   if (CFG_TOYBOX_HELP_DASHDASH && argv[1] && !strcmp(argv[1], "--help")) {
     if (toys.which == toy_list && toys.argv[2])
       if (!(toys.which = toy_find(toys.argv[2]))) return;
@@ -166,8 +168,6 @@ list:
 
 int main(int argc, char *argv[])
 {
-  if (CFG_TOYBOX_I18N) setlocale(LC_ALL, "");
-
   if (CFG_TOYBOX) {
     // Trim path off of command name
     *argv = basename(*argv);