aboutsummaryrefslogtreecommitdiff
path: root/shell
diff options
context:
space:
mode:
authorvda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-11-21 00:09:37 +0000
committervda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-11-21 00:09:37 +0000
commit121105952f7db668ea774ce7889c9485723019f1 (patch)
treef9dae67bb1b22c7249c24e20b7f4ae82ec824d52 /shell
parent230310058181bfa932f1f8532a85a27bd3b467a8 (diff)
downloadbusybox-w32-121105952f7db668ea774ce7889c9485723019f1.tar.gz
busybox-w32-121105952f7db668ea774ce7889c9485723019f1.tar.bz2
busybox-w32-121105952f7db668ea774ce7889c9485723019f1.zip
httpd: LC_TIME locale _must_ be POSIX to httpd! We speak over the net!
git-svn-id: svn://busybox.net/trunk/busybox@16596 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'shell')
-rw-r--r--shell/ash.c1
-rw-r--r--shell/lash.c5
2 files changed, 1 insertions, 5 deletions
diff --git a/shell/ash.c b/shell/ash.c
index 3c7639707..4fef0f2d3 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -1495,7 +1495,6 @@ static void getoptsreset(const char *);
1495#endif 1495#endif
1496 1496
1497#ifdef CONFIG_LOCALE_SUPPORT 1497#ifdef CONFIG_LOCALE_SUPPORT
1498#include <locale.h>
1499static void change_lc_all(const char *value); 1498static void change_lc_all(const char *value);
1500static void change_lc_ctype(const char *value); 1499static void change_lc_ctype(const char *value);
1501#endif 1500#endif
diff --git a/shell/lash.c b/shell/lash.c
index 4067bc6bc..472cbddb9 100644
--- a/shell/lash.c
+++ b/shell/lash.c
@@ -25,10 +25,6 @@
25#include <getopt.h> 25#include <getopt.h>
26#include "cmdedit.h" 26#include "cmdedit.h"
27 27
28#ifdef CONFIG_LOCALE_SUPPORT
29#include <locale.h>
30#endif
31
32#include <glob.h> 28#include <glob.h>
33#define expand_t glob_t 29#define expand_t glob_t
34 30
@@ -377,6 +373,7 @@ static int builtin_export(struct child_prog *child)
377#endif 373#endif
378 374
379#ifdef CONFIG_LOCALE_SUPPORT 375#ifdef CONFIG_LOCALE_SUPPORT
376 // TODO: why getenv? "" would be just as good...
380 if(strncmp(v, "LC_ALL=", 7)==0) 377 if(strncmp(v, "LC_ALL=", 7)==0)
381 setlocale(LC_ALL, getenv("LC_ALL")); 378 setlocale(LC_ALL, getenv("LC_ALL"));
382 if(strncmp(v, "LC_CTYPE=", 9)==0) 379 if(strncmp(v, "LC_CTYPE=", 9)==0)