From 6cf0a115451d6d5ead94860f0731040dc2293db0 Mon Sep 17 00:00:00 2001
From: Rob Landley <rob@landley.net>
Date: Mon, 26 Nov 2012 14:14:29 -0600
Subject: Cleanup i18n support (#ifdefectomy, move global init to process
 launch). Teach make.sh to emit "#define FLAG_x 0" for options inside disabled
 USE macros so we can unconditionally refer to them.

---
 main.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'main.c')

diff --git a/main.c b/main.c
index 2b04d135..829b787a 100644
--- a/main.c
+++ b/main.c
@@ -101,9 +101,6 @@ void toy_exec(char *argv[])
   which = toy_find(argv[0]);
   if (!which) return;
   toy_init(which, argv);
-#ifdef CFG_TOYBOX_I18N
-  setlocale(LC_ALL, "");
-#endif
   toys.which->toy_main();
   exit(toys.exitval);
 }
@@ -145,6 +142,8 @@ void toybox_main(void)
 
 int main(int argc, char *argv[])
 {
+  if (CFG_TOYBOX_I18N) setlocale(LC_ALL, "");
+
   // Artificial scope to eat less stack for things we call
   {
     char *name;
-- 
cgit v1.2.3