generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add standalone_months field to libc strftime().

Browse Source 
Replicate my change 722a5c0462f38827f4097065bfc3826b9e0e9fb4 into
bionic in an attempt to fix the build.
This commit is contained in:
Eric Fischer 2009-05-15 13:33:20 -07:00
parent a0508577c9
commit a48fa7f4de
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libc/include/time.h
View File

@ -83,6 +83,7 @@ extern size_t strftime(char *s, size_t max, const char *format, const struc
struct strftime_locale { struct strftime_locale {
const char * mon[12]; const char * mon[12];
const char * month[12]; const char * month[12];
const char * standalone_month[12];
const char * wday[7]; const char * wday[7];
const char * weekday[7]; const char * weekday[7];
const char * X_fmt; const char * X_fmt;

18
libc/tzcode/strftime.c
View File

@ -68,6 +68,9 @@ static const struct lc_time_T C_time_locale = {
}, { }, {
"January", "February", "March", "April", "May", "June", "January", "February", "March", "April", "May", "June",
"July", "August", "September", "October", "November", "December" "July", "August", "September", "October", "November", "December"
}, {
"January", "February", "March", "April", "May", "June",
"July", "August", "September", "October", "November", "December"
}, { }, {
"Sun", "Mon", "Tue", "Wed", "Sun", "Mon", "Tue", "Wed",
"Thu", "Fri", "Sat" "Thu", "Fri", "Sat"
@ -219,10 +222,17 @@ label:
pt, ptlim, modifier); pt, ptlim, modifier);
continue; continue;
case 'B': case 'B':
pt = _add((t->tm_mon < 0 || if (modifier == '-') {
t->tm_mon >= MONSPERYEAR) ? pt = _add((t->tm_mon < 0 ||
"?" : locale->month[t->tm_mon], t->tm_mon >= MONSPERYEAR) ?
pt, ptlim, modifier); "?" : Locale->standalone_month[t->tm_mon],
pt, ptlim, modifier);
} else {
pt = _add((t->tm_mon < 0 ||
t->tm_mon >= MONSPERYEAR) ?
"?" : Locale->month[t->tm_mon],
pt, ptlim, modifier);
}
continue; continue;
case 'b': case 'b':
case 'h': case 'h':