Loading...
--- Libc/Libc-498/stdtime/FreeBSD/strftime.c.patch
+++ Libc/Libc-763.13/stdtime/FreeBSD/strftime.c.patch
@@ -1,6 +1,6 @@
---- strftime.c.orig 2004-11-25 11:38:45.000000000 -0800
-+++ strftime.c 2005-02-27 16:07:41.000000000 -0800
-@@ -25,6 +25,8 @@
+--- strftime.c.orig 2010-06-24 01:11:42.000000000 -0700
++++ strftime.c 2010-06-24 11:29:51.000000000 -0700
+@@ -25,6 +25,8 @@ static const char elsieid[] = "@(#)strft
#endif /* !defined NOID */
#endif /* !defined lint */
@@ -9,8 +9,8 @@
#include "namespace.h"
#include "private.h"
-@@ -35,19 +37,26 @@
- __FBSDID("$FreeBSD: src/lib/libc/stdtime/strftime.c,v 1.40 2004/06/14 10:31:52 stefanf Exp $");
+@@ -35,18 +37,25 @@ static const char sccsid[] = "@(#)strfti
+ __FBSDID("$FreeBSD: src/lib/libc/stdtime/strftime.c,v 1.44 2009/06/09 09:02:58 delphij Exp $");
#include "tzfile.h"
+#include <time.h>
@@ -22,14 +22,15 @@
+#if !BUILDING_VARIANT
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 *, int *);
+-static char * _fmt(const char *, const struct tm *, char *, const char *,
+- int *);
+-static char * _yconv(int, int, int, int, char *, const char *);
+static char * _conv(int, const char *, char *, const char *, locale_t);
-+#endif /* !BUILDING_VARIANT */
++static char * _yconv(int, int, int, int, char *, const char *, locale_t);
++#endif
+#define _fmt _st_fmt
-+__private_extern__ char *_fmt(const char *, const struct tm *, char *, const char *, int *, struct lc_time_T *, locale_t);
-
- size_t strftime(char * __restrict, size_t, const char * __restrict,
- const struct tm * __restrict);
++__private_extern__ char * _fmt(const char *, const struct tm *, char *, const char *,
++ int *, struct lc_time_T *, locale_t);
extern char * tzname[];
+__private_extern__ long __darwin_altzone; /* DST timezone offset */
@@ -38,8 +39,22 @@
#ifndef YEAR_2000_NAME
#define YEAR_2000_NAME "CHECK_STRFTIME_FORMATS_FOR_TWO_DIGIT_YEARS"
-@@ -60,29 +69,40 @@
- #define IN_ALL 3
+@@ -62,6 +71,7 @@ extern char * tzname[];
+ #define PAD_SPACE 2
+ #define PAD_ZERO 3
+
++#ifndef BUILDING_VARIANT
+ static const char* fmt_padding[][4] = {
+ /* DEFAULT, LESS, SPACE, ZERO */
+ #define PAD_FMT_MONTHDAY 0
+@@ -80,31 +90,36 @@ static const char* fmt_padding[][4] = {
+ #define PAD_FMT_YEAR 3
+ { "%04d", "%d", "%4d", "%04d" }
+ };
++#endif
++
++#define USG_COMPAT
++#define ALTZONE
size_t
-strftime(char * __restrict s, size_t maxsize, const char * __restrict format,
@@ -49,21 +64,11 @@
{
char * p;
int warn;
-+#if __DARWIN_UNIX03
-+ struct tm t2;
-+#endif /* __DARWIN_UNIX03 */
+ NORMALIZE_LOCALE(loc);
tzset();
warn = IN_NONE;
- p = _fmt(((format == NULL) ? "%c" : format), t, s, s + maxsize, &warn);
-+#if __DARWIN_UNIX03
-+ if (t->tm_isdst >= 0) {
-+ t2 = *t;
-+ t2.tm_gmtoff = t->tm_isdst ? -__darwin_altzone : -_st_get_timezone();
-+ t = &t2;
-+ }
-+#endif /* __DARWIN_UNIX03 */
+ p = _fmt(((format == NULL) ? "%c" : format), t, s, s + maxsize, &warn, __get_current_time_locale(loc), loc);
#ifndef NO_RUN_TIME_WARNINGS_ABOUT_YEAR_2000_PROBLEMS_THANK_YOU
if (warn != IN_NONE && getenv(YEAR_2000_NAME) != NULL) {
@@ -90,7 +95,7 @@
}
#endif /* !defined NO_RUN_TIME_WARNINGS_ABOUT_YEAR_2000_PROBLEMS_THANK_YOU */
if (p == s + maxsize)
-@@ -91,16 +111,25 @@
+@@ -113,16 +128,25 @@ strftime(char * __restrict s, size_t max
return p - s;
}
@@ -114,28 +119,35 @@
+struct lc_time_T * tptr;
+locale_t loc;
{
- int Ealternative, Oalternative;
+ int Ealternative, Oalternative, PadIndex;
- struct lc_time_T *tptr = __get_current_time_locale();
for ( ; *format; ++format) {
if (*format == '%') {
-@@ -146,13 +175,13 @@
+@@ -163,19 +187,19 @@ label:
+ case 'C':
+ /*
+ ** %C used to do a...
+- ** _fmt("%a %b %e %X %Y", t);
++ ** _fmt("%a %b %e %X %Y", t, tptr, loc);
+ ** ...whereas now POSIX 1003.2 calls for
+ ** something completely different.
** (ado, 1993-05-24)
*/
- pt = _conv((t->tm_year + TM_YEAR_BASE) / 100,
-- "%02d", pt, ptlim);
-+ "%02d", pt, ptlim, loc);
+ pt = _yconv(t->tm_year, TM_YEAR_BASE, 1, 0,
+- pt, ptlim);
++ pt, ptlim, loc);
continue;
case 'c':
{
int warn2 = IN_SOME;
-- pt = _fmt(tptr->c_fmt, t, pt, ptlim, warnp);
-+ pt = _fmt(tptr->c_fmt, t, pt, ptlim, warnp, tptr, loc);
+- pt = _fmt(tptr->c_fmt, t, pt, ptlim, &warn2);
++ pt = _fmt(tptr->c_fmt, t, pt, ptlim, &warn2, tptr, loc);
if (warn2 == IN_ALL)
warn2 = IN_THIS;
if (warn2 > *warnp)
-@@ -160,10 +189,10 @@
+@@ -183,11 +207,11 @@ label:
}
continue;
case 'D':
@@ -143,65 +155,77 @@
+ pt = _fmt("%m/%d/%y", t, pt, ptlim, warnp, tptr, loc);
continue;
case 'd':
-- pt = _conv(t->tm_mday, "%02d", pt, ptlim);
-+ pt = _conv(t->tm_mday, "%02d", pt, ptlim, loc);
+ pt = _conv(t->tm_mday, fmt_padding[PAD_FMT_DAYOFMONTH][PadIndex],
+- pt, ptlim);
++ pt, ptlim, loc);
continue;
case 'E':
if (Ealternative || Oalternative)
-@@ -188,21 +217,21 @@
- Oalternative++;
+@@ -213,29 +237,29 @@ label:
goto label;
case 'e':
-- pt = _conv(t->tm_mday, "%2d", pt, ptlim);
-+ pt = _conv(t->tm_mday, "%2d", pt, ptlim, loc);
+ pt = _conv(t->tm_mday,
+- fmt_padding[PAD_FMT_SDAYOFMONTH][PadIndex], pt, ptlim);
++ fmt_padding[PAD_FMT_SDAYOFMONTH][PadIndex], pt, ptlim, loc);
continue;
case 'F':
- pt = _fmt("%Y-%m-%d", t, pt, ptlim, warnp);
+ pt = _fmt("%Y-%m-%d", t, pt, ptlim, warnp, tptr, loc);
continue;
case 'H':
-- pt = _conv(t->tm_hour, "%02d", pt, ptlim);
-+ pt = _conv(t->tm_hour, "%02d", pt, ptlim, loc);
+ pt = _conv(t->tm_hour, fmt_padding[PAD_FMT_HMS][PadIndex],
+- pt, ptlim);
++ pt, ptlim, loc);
continue;
case 'I':
pt = _conv((t->tm_hour % 12) ?
(t->tm_hour % 12) : 12,
-- "%02d", pt, ptlim);
-+ "%02d", pt, ptlim, loc);
+- fmt_padding[PAD_FMT_HMS][PadIndex], pt, ptlim);
++ fmt_padding[PAD_FMT_HMS][PadIndex], pt, ptlim, loc);
continue;
case 'j':
-- pt = _conv(t->tm_yday + 1, "%03d", pt, ptlim);
-+ pt = _conv(t->tm_yday + 1, "%03d", pt, ptlim, loc);
+ pt = _conv(t->tm_yday + 1,
+- fmt_padding[PAD_FMT_DAYOFYEAR][PadIndex], pt, ptlim);
++ fmt_padding[PAD_FMT_DAYOFYEAR][PadIndex], pt, ptlim, loc);
continue;
case 'k':
/*
-@@ -215,7 +244,7 @@
- ** "%l" have been swapped.
+ ** This used to be...
+ ** _conv(t->tm_hour % 12 ?
+- ** t->tm_hour % 12 : 12, 2, ' ');
++ ** t->tm_hour % 12 : 12, 2, ' ', loc);
+ ** ...and has been changed to the below to
+ ** match SunOS 4.1.1 and Arnold Robbins'
+ ** strftime version 3.0. That is, "%k" and
+@@ -243,7 +267,7 @@ label:
** (ado, 1993-05-24)
*/
-- pt = _conv(t->tm_hour, "%2d", pt, ptlim);
-+ pt = _conv(t->tm_hour, "%2d", pt, ptlim, loc);
+ pt = _conv(t->tm_hour, fmt_padding[PAD_FMT_SHMS][PadIndex],
+- pt, ptlim);
++ pt, ptlim, loc);
continue;
#ifdef KITCHEN_SINK
case 'K':
-@@ -237,13 +266,13 @@
+@@ -265,15 +289,15 @@ label:
*/
pt = _conv((t->tm_hour % 12) ?
(t->tm_hour % 12) : 12,
-- "%2d", pt, ptlim);
-+ "%2d", pt, ptlim, loc);
+- fmt_padding[PAD_FMT_SHMS][PadIndex], pt, ptlim);
++ fmt_padding[PAD_FMT_SHMS][PadIndex], pt, ptlim, loc);
continue;
case 'M':
-- pt = _conv(t->tm_min, "%02d", pt, ptlim);
-+ pt = _conv(t->tm_min, "%02d", pt, ptlim, loc);
+ pt = _conv(t->tm_min, fmt_padding[PAD_FMT_HMS][PadIndex],
+- pt, ptlim);
++ pt, ptlim, loc);
continue;
case 'm':
-- pt = _conv(t->tm_mon + 1, "%02d", pt, ptlim);
-+ pt = _conv(t->tm_mon + 1, "%02d", pt, ptlim, loc);
+ pt = _conv(t->tm_mon + 1,
+- fmt_padding[PAD_FMT_MONTH][PadIndex], pt, ptlim);
++ fmt_padding[PAD_FMT_MONTH][PadIndex], pt, ptlim, loc);
continue;
case 'n':
pt = _add("\n", pt, ptlim);
-@@ -255,14 +284,14 @@
+@@ -285,15 +309,15 @@ label:
pt, ptlim);
continue;
case 'R':
@@ -214,12 +238,13 @@
+ warnp, tptr, loc);
continue;
case 'S':
-- pt = _conv(t->tm_sec, "%02d", pt, ptlim);
-+ pt = _conv(t->tm_sec, "%02d", pt, ptlim, loc);
+ pt = _conv(t->tm_sec, fmt_padding[PAD_FMT_HMS][PadIndex],
+- pt, ptlim);
++ pt, ptlim, loc);
continue;
case 's':
{
-@@ -274,15 +303,15 @@
+@@ -305,15 +329,15 @@ label:
tm = *t;
mkt = mktime(&tm);
if (TYPE_SIGNED(time_t))
@@ -238,16 +263,16 @@
continue;
case 't':
pt = _add("\t", pt, ptlim);
-@@ -290,7 +319,7 @@
+@@ -321,7 +345,7 @@ label:
case 'U':
pt = _conv((t->tm_yday + DAYSPERWEEK -
t->tm_wday) / DAYSPERWEEK,
-- "%02d", pt, ptlim);
-+ "%02d", pt, ptlim, loc);
+- fmt_padding[PAD_FMT_WEEKOFYEAR][PadIndex], pt, ptlim);
++ fmt_padding[PAD_FMT_WEEKOFYEAR][PadIndex], pt, ptlim, loc);
continue;
case 'u':
/*
-@@ -301,7 +330,7 @@
+@@ -332,7 +356,7 @@ label:
*/
pt = _conv((t->tm_wday == 0) ?
DAYSPERWEEK : t->tm_wday,
@@ -256,24 +281,24 @@
continue;
case 'V': /* ISO 8601 week number */
case 'G': /* ISO 8601 year (four digits) */
-@@ -380,13 +409,13 @@
+@@ -413,13 +437,13 @@ label:
#endif /* defined XPG4_1994_04_09 */
if (*format == 'V')
- pt = _conv(w, "%02d",
+ pt = _conv(w, fmt_padding[PAD_FMT_WEEKOFYEAR][PadIndex],
- pt, ptlim);
+ pt, ptlim, loc);
else if (*format == 'g') {
*warnp = IN_ALL;
- pt = _conv(year % 100, "%02d",
+ pt = _yconv(year, base, 0, 1,
- pt, ptlim);
+ pt, ptlim, loc);
- } else pt = _conv(year, "%04d",
+ } else pt = _yconv(year, base, 1, 1,
- pt, ptlim);
+ pt, ptlim, loc);
}
continue;
case 'v':
-@@ -395,26 +424,26 @@
+@@ -428,26 +452,26 @@ label:
** "date as dd-bbb-YYYY"
** (ado, 1993-05-24)
*/
@@ -285,8 +310,8 @@
(t->tm_wday ?
(t->tm_wday - 1) :
(DAYSPERWEEK - 1))) / DAYSPERWEEK,
-- "%02d", pt, ptlim);
-+ "%02d", pt, ptlim, loc);
+- fmt_padding[PAD_FMT_WEEKOFYEAR][PadIndex], pt, ptlim);
++ fmt_padding[PAD_FMT_WEEKOFYEAR][PadIndex], pt, ptlim, loc);
continue;
case 'w':
- pt = _conv(t->tm_wday, "%d", pt, ptlim);
@@ -305,21 +330,33 @@
if (warn2 == IN_ALL)
warn2 = IN_THIS;
if (warn2 > *warnp)
-@@ -424,11 +453,11 @@
+@@ -457,11 +481,11 @@ label:
case 'y':
*warnp = IN_ALL;
- pt = _conv((t->tm_year + TM_YEAR_BASE) % 100,
-- "%02d", pt, ptlim);
-+ "%02d", pt, ptlim, loc);
+ pt = _yconv(t->tm_year, TM_YEAR_BASE, 0, 1,
+- pt, ptlim);
++ pt, ptlim, loc);
continue;
case 'Y':
- pt = _conv(t->tm_year + TM_YEAR_BASE, "%04d",
+ pt = _yconv(t->tm_year, TM_YEAR_BASE, 1, 1,
- pt, ptlim);
+ pt, ptlim, loc);
continue;
case 'Z':
#ifdef TM_ZONE
-@@ -476,7 +505,7 @@
+@@ -485,9 +509,9 @@ label:
+
+ if (t->tm_isdst < 0)
+ continue;
+-#ifdef TM_GMTOFF
++#if defined(TM_GMTOFF) && !__DARWIN_UNIX03
+ diff = t->TM_GMTOFF;
+-#else /* !defined TM_GMTOFF */
++#else /* !defined TM_GMTOFF || __DARWIN_UNIX03 */
+ /*
+ ** C99 says that the UTC offset must
+ ** be computed by looking only at
+@@ -509,7 +533,7 @@ label:
*/
if (t->tm_isdst == 0)
#ifdef USG_COMPAT
@@ -328,12 +365,21 @@
#else /* !defined USG_COMPAT */
continue;
#endif /* !defined USG_COMPAT */
-@@ -494,12 +523,12 @@
- pt = _add(sign, pt, ptlim);
- diff /= 60;
- pt = _conv((diff/60)*100 + diff%60,
-- "%04d", pt, ptlim);
-+ "%04d", pt, ptlim, loc);
+@@ -519,7 +543,7 @@ label:
+ #else /* !defined ALTZONE */
+ continue;
+ #endif /* !defined ALTZONE */
+-#endif /* !defined TM_GMTOFF */
++#endif /* !defined TM_GMTOFF || __DARWIN_UNIX03 */
+ if (diff < 0) {
+ sign = "-";
+ diff = -diff;
+@@ -529,12 +553,12 @@ label:
+ diff = (diff / MINSPERHOUR) * 100 +
+ (diff % MINSPERHOUR);
+ pt = _conv(diff,
+- fmt_padding[PAD_FMT_YEAR][PadIndex], pt, ptlim);
++ fmt_padding[PAD_FMT_YEAR][PadIndex], pt, ptlim, loc);
}
continue;
case '+':
@@ -341,9 +387,9 @@
- warnp);
+ warnp, tptr, loc);
continue;
- case '%':
- /*
-@@ -519,15 +548,16 @@
+ case '-':
+ if (PadIndex != PAD_DEFAULT)
+@@ -569,15 +593,16 @@ label:
}
static char *
@@ -362,8 +408,32 @@
return _add(buf, pt, ptlim);
}
-@@ -541,3 +571,4 @@
- ++pt;
+@@ -601,13 +626,14 @@ const char * const ptlim;
+ */
+
+ static char *
+-_yconv(a, b, convert_top, convert_yy, pt, ptlim)
++_yconv(a, b, convert_top, convert_yy, pt, ptlim, loc)
+ const int a;
+ const int b;
+ const int convert_top;
+ const int convert_yy;
+ char * pt;
+ const char * const ptlim;
++locale_t loc;
+ {
+ register int lead;
+ register int trail;
+@@ -626,9 +652,10 @@ const char * const ptlim;
+ if (convert_top) {
+ if (lead == 0 && trail < 0)
+ pt = _add("-0", pt, ptlim);
+- else pt = _conv(lead, "%02d", pt, ptlim);
++ else pt = _conv(lead, "%02d", pt, ptlim, loc);
+ }
+ if (convert_yy)
+- pt = _conv(((trail < 0) ? -trail : trail), "%02d", pt, ptlim);
++ pt = _conv(((trail < 0) ? -trail : trail), "%02d", pt, ptlim, loc);
return pt;
}
+#endif /* !BUILDING_VARIANT */