diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2006-11-21 00:09:37 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2006-11-21 00:09:37 +0000 |
| commit | fcdb00f7359488d197ac3361dfbc49ccdead8b87 (patch) | |
| tree | f9dae67bb1b22c7249c24e20b7f4ae82ec824d52 /coreutils | |
| parent | 6c85ddc8509e4b72ca5b4e47ca5085101a02f07c (diff) | |
| download | busybox-w32-fcdb00f7359488d197ac3361dfbc49ccdead8b87.tar.gz busybox-w32-fcdb00f7359488d197ac3361dfbc49ccdead8b87.tar.bz2 busybox-w32-fcdb00f7359488d197ac3361dfbc49ccdead8b87.zip | |
httpd: LC_TIME locale _must_ be POSIX to httpd! We speak over the net!
Diffstat (limited to 'coreutils')
| -rw-r--r-- | coreutils/cal.c | 7 | ||||
| -rw-r--r-- | coreutils/ls.c | 2 | ||||
| -rw-r--r-- | coreutils/wc.c | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/coreutils/cal.c b/coreutils/cal.c index 6f5f0a434..681a88d90 100644 --- a/coreutils/cal.c +++ b/coreutils/cal.c | |||
| @@ -87,9 +87,10 @@ int cal_main(int argc, char **argv) | |||
| 87 | char day_headings[28]; /* 28 for julian, 21 for nonjulian */ | 87 | char day_headings[28]; /* 28 for julian, 21 for nonjulian */ |
| 88 | char buf[40]; | 88 | char buf[40]; |
| 89 | 89 | ||
| 90 | #ifdef CONFIG_LOCALE_SUPPORT | 90 | // Done in busybox.c, ok to remove? |
| 91 | setlocale(LC_TIME, ""); | 91 | //#ifdef CONFIG_LOCALE_SUPPORT |
| 92 | #endif | 92 | // setlocale(LC_TIME, ""); |
| 93 | //#endif | ||
| 93 | 94 | ||
| 94 | flags = getopt32(argc, argv, "jy"); | 95 | flags = getopt32(argc, argv, "jy"); |
| 95 | 96 | ||
diff --git a/coreutils/ls.c b/coreutils/ls.c index 8a83d7543..909f4d54e 100644 --- a/coreutils/ls.c +++ b/coreutils/ls.c | |||
| @@ -359,7 +359,7 @@ static int sortcmp(const void *a, const void *b) | |||
| 359 | } | 359 | } |
| 360 | 360 | ||
| 361 | if (dif == 0) { | 361 | if (dif == 0) { |
| 362 | /* sort by name- may be a tie_breaker for time or size cmp */ | 362 | /* sort by name - may be a tie_breaker for time or size cmp */ |
| 363 | if (ENABLE_LOCALE_SUPPORT) dif = strcoll(d1->name, d2->name); | 363 | if (ENABLE_LOCALE_SUPPORT) dif = strcoll(d1->name, d2->name); |
| 364 | else dif = strcmp(d1->name, d2->name); | 364 | else dif = strcmp(d1->name, d2->name); |
| 365 | } | 365 | } |
diff --git a/coreutils/wc.c b/coreutils/wc.c index 4b76e5499..973929ebe 100644 --- a/coreutils/wc.c +++ b/coreutils/wc.c | |||
| @@ -44,8 +44,6 @@ | |||
| 44 | #include "busybox.h" | 44 | #include "busybox.h" |
| 45 | 45 | ||
| 46 | #ifdef CONFIG_LOCALE_SUPPORT | 46 | #ifdef CONFIG_LOCALE_SUPPORT |
| 47 | #include <locale.h> | ||
| 48 | #include <ctype.h> | ||
| 49 | #define isspace_given_isprint(c) isspace(c) | 47 | #define isspace_given_isprint(c) isspace(c) |
| 50 | #else | 48 | #else |
| 51 | #undef isspace | 49 | #undef isspace |
