diff options
Diffstat (limited to 'coreutils/cal.c')
| -rw-r--r-- | coreutils/cal.c | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/coreutils/cal.c b/coreutils/cal.c index e6f9af937..5ecb9131d 100644 --- a/coreutils/cal.c +++ b/coreutils/cal.c @@ -16,8 +16,8 @@ * * Major size reduction... over 50% (>1.5k) on i386. */ - #include "libbb.h" +#include "unicode.h" /* We often use "unsigned" intead of "int", it's easier to div on most CPUs */ @@ -83,9 +83,16 @@ int cal_main(int argc UNUSED_PARAM, char **argv) time_t now; unsigned month, year, flags, i; char *month_names[12]; - char day_headings[28]; /* 28 for julian, 21 for nonjulian */ + /* normal heading: */ + /* "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 buf[40]; + init_unicode(); + flags = getopt32(argv, "jy"); /* This sets julian = flags & 1: */ option_mask32 &= 1; @@ -122,15 +129,24 @@ int cal_main(int argc UNUSED_PARAM, char **argv) if (i < 7) { zero_tm.tm_wday = i; -//FIXME: unicode -//Bug 839: -//testcase with doublewidth Japanese chars: "LANG=zh_TW.utf8 cal" -//perhaps use wc[s]width() to probe terminal width /* abbreviated weekday name according to locale */ strftime(buf, sizeof(buf), "%a", &zero_tm); +#if ENABLE_FEATURE_ASSUME_UNICODE + if (julian) + *hp++ = ' '; + { + char *two_wchars = unicode_cut_nchars(2, buf); + strcpy(hp, two_wchars); + free(two_wchars); + } + hp += strlen(hp); + *hp++ = ' '; +#else strncpy(day_headings + i * (3+julian) + julian, buf, 2); +#endif } } while (++i < 12); + IF_FEATURE_ASSUME_UNICODE(hp[-1] = '\0';) if (month) { unsigned row, len, days[MAXDAYS]; |