aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2007-01-01 23:53:12 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2007-01-01 23:53:12 +0000
commit6dc6ebbf44f01f31b683ddde36f0ba694b98bbdd (patch)
treed37cdd5a65b6cd7b5ec9b83e15c5d97365768f17
parentf782f52c8cab1457d9e912b8bf2afdde6d170816 (diff)
downloadbusybox-w32-6dc6ebbf44f01f31b683ddde36f0ba694b98bbdd.tar.gz
busybox-w32-6dc6ebbf44f01f31b683ddde36f0ba694b98bbdd.tar.bz2
busybox-w32-6dc6ebbf44f01f31b683ddde36f0ba694b98bbdd.zip
awk: undo locale setting for numbers - or else parsing
can act quite mysteriously date: add if(ENABLE_LOCALE_SUPPORT)
-rw-r--r--coreutils/date.c3
-rw-r--r--editors/awk.c5
2 files changed, 7 insertions, 1 deletions
diff --git a/coreutils/date.c b/coreutils/date.c
index 37ccfd5ba..a6690e8bd 100644
--- a/coreutils/date.c
+++ b/coreutils/date.c
@@ -212,7 +212,8 @@ format_utc:
212 } 212 }
213 } else if (opt & DATE_OPT_RFC2822) { 213 } else if (opt & DATE_OPT_RFC2822) {
214 /* Undo busybox.c for date -R */ 214 /* Undo busybox.c for date -R */
215 setlocale(LC_TIME, "C"); 215 if (ENABLE_LOCALE_SUPPORT)
216 setlocale(LC_TIME, "C");
216 strcpy(date_fmt, "%a, %d %b %Y %H:%M:%S "); 217 strcpy(date_fmt, "%a, %d %b %Y %H:%M:%S ");
217 i = 22; 218 i = 22;
218 goto format_utc; 219 goto format_utc;
diff --git a/editors/awk.c b/editors/awk.c
index 97e78163c..f48b0e43f 100644
--- a/editors/awk.c
+++ b/editors/awk.c
@@ -2652,6 +2652,11 @@ int awk_main(int argc, char **argv)
2652 char *vnames = (char *)vNames; /* cheat */ 2652 char *vnames = (char *)vNames; /* cheat */
2653 char *vvalues = (char *)vValues; 2653 char *vvalues = (char *)vValues;
2654 2654
2655 /* Undo busybox.c, or else strtod may eat ','! This breaks parsing:
2656 * $1,$2 == '$1,' '$2', NOT '$1' ',' '$2' */
2657 if (ENABLE_LOCALE_SUPPORT)
2658 setlocale(LC_NUMERIC, "C");
2659
2655 zero_out_var(&tv); 2660 zero_out_var(&tv);
2656 2661
2657 /* allocate global buffer */ 2662 /* allocate global buffer */