summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen2001-05-13 00:33:16 +0000
committerEric Andersen2001-05-13 00:33:16 +0000
commit4819c3d477e83b846649220fc96534c9bb93d642 (patch)
tree7f77150cefbe61ee6615634e09bfb35f3f4ec347
parent1f3b9f297e948b70a82b82919d0ef4d4e1b61d7f (diff)
downloadbusybox-4819c3d477e83b846649220fc96534c9bb93d642.zip
busybox-4819c3d477e83b846649220fc96534c9bb93d642.tar.gz
Make the locale stuff only do the getpid==1 check if BB_INIT is defined
-rw-r--r--applets/busybox.c6
-rw-r--r--busybox.c6
2 files changed, 10 insertions, 2 deletions
diff --git a/applets/busybox.c b/applets/busybox.c
index 41b6069..9cc8848 100644
--- a/applets/busybox.c
+++ b/applets/busybox.c
@@ -82,9 +82,13 @@ int main(int argc, char **argv)
}
#endif
-#ifdef BB_LOCALE_SUPPORT
+#ifdef BB_LOCALE_SUPPORT
+#ifdef BB_INIT
if(getpid()!=1) /* Do not set locale for `init' */
+#endif
+ {
setlocale(LC_ALL, "");
+ }
#endif
run_applet_by_name(applet_name, argc, argv);
diff --git a/busybox.c b/busybox.c
index 41b6069..9cc8848 100644
--- a/busybox.c
+++ b/busybox.c
@@ -82,9 +82,13 @@ int main(int argc, char **argv)
}
#endif
-#ifdef BB_LOCALE_SUPPORT
+#ifdef BB_LOCALE_SUPPORT
+#ifdef BB_INIT
if(getpid()!=1) /* Do not set locale for `init' */
+#endif
+ {
setlocale(LC_ALL, "");
+ }
#endif
run_applet_by_name(applet_name, argc, argv);