Print this page
2964 need POSIX 2008 locale object support
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Gordon Ross <gordon.ross@nexenta.com>
Approved by: TBD

*** 1,6 **** --- 1,7 ---- /* + * Copyright 2013 Garrett D'Amore <garrett@damore.org> * Copyright 2010 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 1989 The Regents of the University of California. * All rights reserved. * * Redistribution and use in source and binary forms are permitted
*** 20,34 **** #include "tzfile.h" #include <fcntl.h> #include <sys/stat.h> #include <string.h> #include <stdio.h> #include "timelocal.h" static char *_add(const char *, char *, const char *); static char *_conv(int, const char *, char *, const char *); ! static char *_fmt(const char *, const struct tm *, char *, const char * const); static char *_yconv(int, int, int, int, char *, const char *); extern char *tzname[]; #define IN_NONE 0 --- 21,38 ---- #include "tzfile.h" #include <fcntl.h> #include <sys/stat.h> #include <string.h> #include <stdio.h> + #include <locale.h> #include "timelocal.h" + #include "localeimpl.h" static char *_add(const char *, char *, const char *); static char *_conv(int, const char *, char *, const char *); ! static char *_fmt(locale_t, const char *, const struct tm *, char *, ! const char * const); static char *_yconv(int, int, int, int, char *, const char *); extern char *tzname[]; #define IN_NONE 0
*** 60,87 **** { "%04d", "%d", "%4d", "%04d" } }; size_t ! strftime(char *_RESTRICT_KYWD s, size_t maxsize, ! const char *_RESTRICT_KYWD format, const struct tm *_RESTRICT_KYWD t) { char *p; tzset(); ! p = _fmt(((format == NULL) ? "%c" : format), t, s, s + maxsize); if (p == s + maxsize) return (0); *p = '\0'; return (p - s); } static char * ! _fmt(const char *format, const struct tm *t, char *pt, const char * const ptlim) { int Ealternative, Oalternative, PadIndex; ! struct lc_time_T *tptr = __get_current_time_locale(); #define PADDING(x) fmt_padding[x][PadIndex] for (; *format; ++format) { if (*format == '%') { --- 64,100 ---- { "%04d", "%d", "%4d", "%04d" } }; size_t ! strftime_l(char *_RESTRICT_KYWD s, size_t maxsize, ! const char *_RESTRICT_KYWD format, const struct tm *_RESTRICT_KYWD t, ! locale_t loc) { char *p; tzset(); ! p = _fmt(loc, ((format == NULL) ? "%c" : format), t, s, s + maxsize); if (p == s + maxsize) return (0); *p = '\0'; return (p - s); } + size_t + strftime(char *_RESTRICT_KYWD s, size_t maxsize, + const char *_RESTRICT_KYWD format, const struct tm *_RESTRICT_KYWD t) + { + return (strftime_l(s, maxsize, format, t, uselocale(NULL))); + } + static char * ! _fmt(locale_t loc, const char *format, const struct tm *t, char *pt, ! const char * const ptlim) { int Ealternative, Oalternative, PadIndex; ! const struct lc_time *tptr = loc->time; #define PADDING(x) fmt_padding[x][PadIndex] for (; *format; ++format) { if (*format == '%') {
*** 128,141 **** */ pt = _yconv(t->tm_year, TM_YEAR_BASE, 1, 0, pt, ptlim); continue; case 'c': ! pt = _fmt(tptr->c_fmt, t, pt, ptlim); continue; case 'D': ! pt = _fmt("%m/%d/%y", t, pt, ptlim); continue; case 'd': pt = _conv(t->tm_mday, PADDING(PAD_FMT_DAYOFMONTH), pt, ptlim); continue; --- 141,154 ---- */ pt = _yconv(t->tm_year, TM_YEAR_BASE, 1, 0, pt, ptlim); continue; case 'c': ! pt = _fmt(loc, tptr->c_fmt, t, pt, ptlim); continue; case 'D': ! pt = _fmt(loc, "%m/%d/%y", t, pt, ptlim); continue; case 'd': pt = _conv(t->tm_mday, PADDING(PAD_FMT_DAYOFMONTH), pt, ptlim); continue;
*** 161,171 **** case 'e': pt = _conv(t->tm_mday, PADDING(PAD_FMT_SDAYOFMONTH), pt, ptlim); continue; case 'F': ! pt = _fmt("%Y-%m-%d", t, pt, ptlim); continue; case 'H': pt = _conv(t->tm_hour, PADDING(PAD_FMT_HMS), pt, ptlim); continue; --- 174,184 ---- case 'e': pt = _conv(t->tm_mday, PADDING(PAD_FMT_SDAYOFMONTH), pt, ptlim); continue; case 'F': ! pt = _fmt(loc, "%Y-%m-%d", t, pt, ptlim); continue; case 'H': pt = _conv(t->tm_hour, PADDING(PAD_FMT_HMS), pt, ptlim); continue;
*** 221,234 **** case 'p': pt = _add((t->tm_hour >= (HOURSPERDAY / 2)) ? tptr->pm : tptr->am, pt, ptlim); continue; case 'R': ! pt = _fmt("%H:%M", t, pt, ptlim); continue; case 'r': ! pt = _fmt(tptr->ampm_fmt, t, pt, ptlim); continue; case 'S': pt = _conv(t->tm_sec, PADDING(PAD_FMT_HMS), pt, ptlim); continue; --- 234,247 ---- case 'p': pt = _add((t->tm_hour >= (HOURSPERDAY / 2)) ? tptr->pm : tptr->am, pt, ptlim); continue; case 'R': ! pt = _fmt(loc, "%H:%M", t, pt, ptlim); continue; case 'r': ! pt = _fmt(loc, tptr->ampm_fmt, t, pt, ptlim); continue; case 'S': pt = _conv(t->tm_sec, PADDING(PAD_FMT_HMS), pt, ptlim); continue;
*** 243,253 **** pt = _add(buf, pt, ptlim); continue; } case 'T': ! pt = _fmt("%H:%M:%S", t, pt, ptlim); continue; case 't': pt = _add("\t", pt, ptlim); continue; case 'U': --- 256,266 ---- pt = _add(buf, pt, ptlim); continue; } case 'T': ! pt = _fmt(loc, "%H:%M:%S", t, pt, ptlim); continue; case 't': pt = _add("\t", pt, ptlim); continue; case 'U':
*** 355,365 **** /* * From Arnold Robbins' strftime version 3.0: * "date as dd-bbb-YYYY" * (ado, 1993-05-24) */ ! pt = _fmt("%e-%b-%Y", t, pt, ptlim); continue; case 'W': pt = _conv((t->tm_yday + DAYSPERWEEK - (t->tm_wday ? (t->tm_wday - 1) : --- 368,378 ---- /* * From Arnold Robbins' strftime version 3.0: * "date as dd-bbb-YYYY" * (ado, 1993-05-24) */ ! pt = _fmt(loc, "%e-%b-%Y", t, pt, ptlim); continue; case 'W': pt = _conv((t->tm_yday + DAYSPERWEEK - (t->tm_wday ? (t->tm_wday - 1) :
*** 369,382 **** continue; case 'w': pt = _conv(t->tm_wday, "%d", pt, ptlim); continue; case 'X': ! pt = _fmt(tptr->X_fmt, t, pt, ptlim); continue; case 'x': ! pt = _fmt(tptr->x_fmt, t, pt, ptlim); continue; case 'y': pt = _yconv(t->tm_year, TM_YEAR_BASE, 0, 1, pt, ptlim); continue; --- 382,395 ---- continue; case 'w': pt = _conv(t->tm_wday, "%d", pt, ptlim); continue; case 'X': ! pt = _fmt(loc, tptr->X_fmt, t, pt, ptlim); continue; case 'x': ! pt = _fmt(loc, tptr->x_fmt, t, pt, ptlim); continue; case 'y': pt = _yconv(t->tm_year, TM_YEAR_BASE, 0, 1, pt, ptlim); continue;
*** 436,446 **** pt = _conv(diff, PADDING(PAD_FMT_YEAR), pt, ptlim); } continue; case '+': ! pt = _fmt(tptr->date_fmt, t, pt, ptlim); continue; case '-': if (PadIndex != PAD_DEFAULT) break; PadIndex = PAD_LESS; --- 449,459 ---- pt = _conv(diff, PADDING(PAD_FMT_YEAR), pt, ptlim); } continue; case '+': ! pt = _fmt(loc, tptr->date_fmt, t, pt, ptlim); continue; case '-': if (PadIndex != PAD_DEFAULT) break; PadIndex = PAD_LESS;