diff options
| author | Denys Vlasenko | 2010-03-26 14:06:56 +0100 |
|---|---|---|
| committer | Denys Vlasenko | 2010-03-26 14:06:56 +0100 |
| commit | 19158a837df5093a2d655536424412bac2b07467 (patch) | |
| tree | 3f3ce9c808e05dbf8dd38292f4c2db52cb73b429 /coreutils | |
| parent | aa167556cd2954bb9a9fb0a005178462087a4600 (diff) | |
| download | busybox-19158a837df5093a2d655536424412bac2b07467.zip busybox-19158a837df5093a2d655536424412bac2b07467.tar.gz | |
unicode: s/FEATURE_ASSUME_UNICODE/UNICODE_SUPPORT, add UNICODE_USING_LOCALE
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'coreutils')
| -rw-r--r-- | coreutils/cal.c | 8 | ||||
| -rw-r--r-- | coreutils/df.c | 2 | ||||
| -rw-r--r-- | coreutils/expand.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/coreutils/cal.c b/coreutils/cal.c index 79fe074..c98229c 100644 --- a/coreutils/cal.c +++ b/coreutils/cal.c @@ -87,8 +87,8 @@ int cal_main(int argc UNUSED_PARAM, char **argv) /* "Su Mo Tu We Th Fr Sa" */ /* -j heading: */ /* " Su Mo Tu We Th Fr Sa" */ - char day_headings[ENABLE_FEATURE_ASSUME_UNICODE ? 28 * 6 : 28]; - IF_FEATURE_ASSUME_UNICODE(char *hp = day_headings;) + char day_headings[ENABLE_UNICODE_SUPPORT ? 28 * 6 : 28]; + IF_UNICODE_SUPPORT(char *hp = day_headings;) char buf[40]; init_unicode(); @@ -134,7 +134,7 @@ int cal_main(int argc UNUSED_PARAM, char **argv) zero_tm.tm_wday = i; /* abbreviated weekday name according to locale */ strftime(buf, sizeof(buf), "%a", &zero_tm); -#if ENABLE_FEATURE_ASSUME_UNICODE +#if ENABLE_UNICODE_SUPPORT if (julian) *hp++ = ' '; { @@ -149,7 +149,7 @@ int cal_main(int argc UNUSED_PARAM, char **argv) #endif } } while (++i < 12); - IF_FEATURE_ASSUME_UNICODE(hp[-1] = '\0';) + IF_UNICODE_SUPPORT(hp[-1] = '\0';) if (month) { unsigned row, len, days[MAXDAYS]; diff --git a/coreutils/df.c b/coreutils/df.c index 4b23faa..5eeb5b4 100644 --- a/coreutils/df.c +++ b/coreutils/df.c @@ -174,7 +174,7 @@ int df_main(int argc UNUSED_PARAM, char **argv) } #endif -#if ENABLE_FEATURE_ASSUME_UNICODE +#if ENABLE_UNICODE_SUPPORT { uni_stat_t uni_stat; char *uni_dev = unicode_conv_to_printable(&uni_stat, device); diff --git a/coreutils/expand.c b/coreutils/expand.c index cfb1e25..b874b6a 100644 --- a/coreutils/expand.c +++ b/coreutils/expand.c @@ -48,7 +48,7 @@ static void expand(FILE *file, unsigned tab_size, unsigned opt) if (c == '\t') { unsigned len; *ptr = '\0'; -# if ENABLE_FEATURE_ASSUME_UNICODE +# if ENABLE_UNICODE_SUPPORT { uni_stat_t uni_stat; printable_string(&uni_stat, ptr_strbeg); @@ -107,7 +107,7 @@ static void unexpand(FILE *file, unsigned tab_size, unsigned opt) } n = strcspn(ptr, "\t "); printf("%*s%.*s", len, "", n, ptr); -# if ENABLE_FEATURE_ASSUME_UNICODE +# if ENABLE_UNICODE_SUPPORT { char c; uni_stat_t uni_stat; |