emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unicode: s/FEATURE_ASSUME_UNICODE/UNICODE_SUPPORT, add UNICODE_USING_LOCALE

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2010-03-26 14:06:56 +01:00
parent aa167556cd
commit 19158a837d
19 changed files with 481 additions and 596 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
coreutils/cal.c
View File

@@ -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];

2
coreutils/df.c
View File

@@ -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);

4
coreutils/expand.c
View File

@@ -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;