Loading...
--- Libc/Libc-391.2.5/stdtime/FreeBSD/strftime.c
+++ Libc/Libc-320/stdtime/FreeBSD/strftime.c
@@ -17,7 +17,7 @@
#ifndef lint
#ifndef NOID
-static const char elsieid[] = "@(#)strftime.c 7.64";
+static const char elsieid[] = "@(#)strftime.c 7.38";
/*
** Based on the UCB version with the ID appearing below.
** This is ANSIish only when "multibyte character == plain character".
@@ -32,7 +32,7 @@
static const char sccsid[] = "@(#)strftime.c 5.4 (Berkeley) 3/14/89";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdtime/strftime.c,v 1.40 2004/06/14 10:31:52 stefanf Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdtime/strftime.c,v 1.38 2002/09/06 11:24:03 tjr Exp $");
#include "tzfile.h"
#include <fcntl.h>
@@ -42,49 +42,21 @@
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 *);
size_t strftime(char * __restrict, size_t, const char * __restrict,
const struct tm * __restrict);
extern char * tzname[];
-
-#ifndef YEAR_2000_NAME
-#define YEAR_2000_NAME "CHECK_STRFTIME_FORMATS_FOR_TWO_DIGIT_YEARS"
-#endif /* !defined YEAR_2000_NAME */
-
-
-#define IN_NONE 0
-#define IN_SOME 1
-#define IN_THIS 2
-#define IN_ALL 3
size_t
strftime(char * __restrict s, size_t maxsize, const char * __restrict format,
const struct tm * __restrict t)
{
- char * p;
- int warn;
+ char *p;
tzset();
- warn = IN_NONE;
- p = _fmt(((format == NULL) ? "%c" : format), t, s, s + maxsize, &warn);
-#ifndef NO_RUN_TIME_WARNINGS_ABOUT_YEAR_2000_PROBLEMS_THANK_YOU
- if (warn != IN_NONE && getenv(YEAR_2000_NAME) != NULL) {
- (void) fprintf(stderr, "\n");
- if (format == NULL)
- (void) fprintf(stderr, "NULL strftime format ");
- else (void) fprintf(stderr, "strftime format \"%s\" ",
- format);
- (void) fprintf(stderr, "yields only two digits of years in ");
- if (warn == IN_SOME)
- (void) fprintf(stderr, "some locales");
- else if (warn == IN_THIS)
- (void) fprintf(stderr, "the current locale");
- else (void) fprintf(stderr, "all locales");
- (void) fprintf(stderr, "\n");
- }
-#endif /* !defined NO_RUN_TIME_WARNINGS_ABOUT_YEAR_2000_PROBLEMS_THANK_YOU */
+ p = _fmt(((format == NULL) ? "%c" : format), t, s, s + maxsize);
if (p == s + maxsize)
return 0;
*p = '\0';
@@ -92,12 +64,11 @@
}
static char *
-_fmt(format, t, pt, ptlim, warnp)
-const char * format;
-const struct tm * const t;
-char * pt;
-const char * const ptlim;
-int * warnp;
+_fmt(format, t, pt, ptlim)
+ const char *format;
+ const struct tm *const t;
+ char *pt;
+ const char *const ptlim;
{
int Ealternative, Oalternative;
struct lc_time_T *tptr = __get_current_time_locale();
@@ -112,28 +83,24 @@
--format;
break;
case 'A':
- pt = _add((t->tm_wday < 0 ||
- t->tm_wday >= DAYSPERWEEK) ?
+ pt = _add((t->tm_wday < 0 || t->tm_wday > 6) ?
"?" : tptr->weekday[t->tm_wday],
pt, ptlim);
continue;
case 'a':
- pt = _add((t->tm_wday < 0 ||
- t->tm_wday >= DAYSPERWEEK) ?
+ pt = _add((t->tm_wday < 0 || t->tm_wday > 6) ?
"?" : tptr->wday[t->tm_wday],
pt, ptlim);
continue;
case 'B':
- pt = _add((t->tm_mon < 0 ||
- t->tm_mon >= MONSPERYEAR) ?
+ pt = _add((t->tm_mon < 0 || t->tm_mon > 11) ?
"?" : (Oalternative ? tptr->alt_month :
tptr->month)[t->tm_mon],
pt, ptlim);
continue;
case 'b':
case 'h':
- pt = _add((t->tm_mon < 0 ||
- t->tm_mon >= MONSPERYEAR) ?
+ pt = _add((t->tm_mon < 0 || t->tm_mon > 11) ?
"?" : tptr->mon[t->tm_mon],
pt, ptlim);
continue;
@@ -143,24 +110,16 @@
** _fmt("%a %b %e %X %Y", t);
** ...whereas now POSIX 1003.2 calls for
** something completely different.
- ** (ado, 1993-05-24)
+ ** (ado, 5/24/93)
*/
pt = _conv((t->tm_year + TM_YEAR_BASE) / 100,
"%02d", pt, ptlim);
continue;
case 'c':
- {
- int warn2 = IN_SOME;
-
- pt = _fmt(tptr->c_fmt, t, pt, ptlim, warnp);
- if (warn2 == IN_ALL)
- warn2 = IN_THIS;
- if (warn2 > *warnp)
- *warnp = warn2;
- }
+ pt = _fmt(tptr->c_fmt, t, pt, ptlim);
continue;
case 'D':
- pt = _fmt("%m/%d/%y", t, pt, ptlim, warnp);
+ pt = _fmt("%m/%d/%y", t, pt, ptlim);
continue;
case 'd':
pt = _conv(t->tm_mday, "%02d", pt, ptlim);
@@ -172,16 +131,18 @@
goto label;
case 'O':
/*
- ** C99 locale modifiers.
+ ** POSIX locale extensions, a la
+ ** Arnold Robbins' strftime version 3.0.
** The sequences
- ** %Ec %EC %Ex %EX %Ey %EY
+ ** %Ec %EC %Ex %EX %Ey %EY
** %Od %oe %OH %OI %Om %OM
** %OS %Ou %OU %OV %Ow %OW %Oy
** are supposed to provide alternate
** representations.
+ ** (ado, 5/24/93)
**
- ** FreeBSD extension
- ** %OB
+ ** FreeBSD extensions
+ ** %OB %Ef %EF
*/
if (Ealternative || Oalternative)
break;
@@ -191,7 +152,7 @@
pt = _conv(t->tm_mday, "%2d", pt, ptlim);
continue;
case 'F':
- pt = _fmt("%Y-%m-%d", t, pt, ptlim, warnp);
+ pt = _fmt("%Y-%m-%d", t, pt, ptlim);
continue;
case 'H':
pt = _conv(t->tm_hour, "%02d", pt, ptlim);
@@ -213,7 +174,7 @@
** match SunOS 4.1.1 and Arnold Robbins'
** strftime version 3.0. That is, "%k" and
** "%l" have been swapped.
- ** (ado, 1993-05-24)
+ ** (ado, 5/24/93)
*/
pt = _conv(t->tm_hour, "%2d", pt, ptlim);
continue;
@@ -233,7 +194,7 @@
** match SunOS 4.1.1 and Arnold Robbin's
** strftime version 3.0. That is, "%k" and
** "%l" have been swapped.
- ** (ado, 1993-05-24)
+ ** (ado, 5/24/93)
*/
pt = _conv((t->tm_hour % 12) ?
(t->tm_hour % 12) : 12,
@@ -249,17 +210,16 @@
pt = _add("\n", pt, ptlim);
continue;
case 'p':
- pt = _add((t->tm_hour >= (HOURSPERDAY / 2)) ?
+ pt = _add((t->tm_hour >= 12) ?
tptr->pm :
tptr->am,
pt, ptlim);
continue;
case 'R':
- pt = _fmt("%H:%M", t, pt, ptlim, warnp);
+ pt = _fmt("%H:%M", t, pt, ptlim);
continue;
case 'r':
- pt = _fmt(tptr->ampm_fmt, t, pt, ptlim,
- warnp);
+ pt = _fmt(tptr->ampm_fmt, t, pt, ptlim);
continue;
case 'S':
pt = _conv(t->tm_sec, "%02d", pt, ptlim);
@@ -282,14 +242,13 @@
}
continue;
case 'T':
- pt = _fmt("%H:%M:%S", t, pt, ptlim, warnp);
+ pt = _fmt("%H:%M:%S", t, pt, ptlim);
continue;
case 't':
pt = _add("\t", pt, ptlim);
continue;
case 'U':
- pt = _conv((t->tm_yday + DAYSPERWEEK -
- t->tm_wday) / DAYSPERWEEK,
+ pt = _conv((t->tm_yday + 7 - t->tm_wday) / 7,
"%02d", pt, ptlim);
continue;
case 'u':
@@ -297,10 +256,9 @@
** From Arnold Robbins' strftime version 3.0:
** "ISO 8601: Weekday as a decimal number
** [1 (Monday) - 7]"
- ** (ado, 1993-05-24)
- */
- pt = _conv((t->tm_wday == 0) ?
- DAYSPERWEEK : t->tm_wday,
+ ** (ado, 5/24/93)
+ */
+ pt = _conv((t->tm_wday == 0) ? 7 : t->tm_wday,
"%d", pt, ptlim);
continue;
case 'V': /* ISO 8601 week number */
@@ -382,7 +340,6 @@
pt = _conv(w, "%02d",
pt, ptlim);
else if (*format == 'g') {
- *warnp = IN_ALL;
pt = _conv(year % 100, "%02d",
pt, ptlim);
} else pt = _conv(year, "%04d",
@@ -393,36 +350,26 @@
/*
** From Arnold Robbins' strftime version 3.0:
** "date as dd-bbb-YYYY"
- ** (ado, 1993-05-24)
- */
- pt = _fmt("%e-%b-%Y", t, pt, ptlim, warnp);
+ ** (ado, 5/24/93)
+ */
+ pt = _fmt("%e-%b-%Y", t, pt, ptlim);
continue;
case 'W':
- pt = _conv((t->tm_yday + DAYSPERWEEK -
+ pt = _conv((t->tm_yday + 7 -
(t->tm_wday ?
- (t->tm_wday - 1) :
- (DAYSPERWEEK - 1))) / DAYSPERWEEK,
+ (t->tm_wday - 1) : 6)) / 7,
"%02d", pt, ptlim);
continue;
case 'w':
pt = _conv(t->tm_wday, "%d", pt, ptlim);
continue;
case 'X':
- pt = _fmt(tptr->X_fmt, t, pt, ptlim, warnp);
+ pt = _fmt(tptr->X_fmt, t, pt, ptlim);
continue;
case 'x':
- {
- int warn2 = IN_SOME;
-
- pt = _fmt(tptr->x_fmt, t, pt, ptlim, &warn2);
- if (warn2 == IN_ALL)
- warn2 = IN_THIS;
- if (warn2 > *warnp)
- *warnp = warn2;
- }
+ pt = _fmt(tptr->x_fmt, t, pt, ptlim);
continue;
case 'y':
- *warnp = IN_ALL;
pt = _conv((t->tm_year + TM_YEAR_BASE) % 100,
"%02d", pt, ptlim);
continue;
@@ -431,82 +378,39 @@
pt, ptlim);
continue;
case 'Z':
-#ifdef TM_ZONE
- if (t->TM_ZONE != NULL)
- pt = _add(t->TM_ZONE, pt, ptlim);
+ if (t->tm_zone != NULL)
+ pt = _add(t->tm_zone, pt, ptlim);
else
-#endif /* defined TM_ZONE */
- if (t->tm_isdst >= 0)
- pt = _add(tzname[t->tm_isdst != 0],
+ if (t->tm_isdst == 0 || t->tm_isdst == 1) {
+ pt = _add(tzname[t->tm_isdst],
pt, ptlim);
- /*
- ** C99 says that %Z must be replaced by the
- ** empty string if the time zone is not
- ** determinable.
- */
+ } else pt = _add("?", pt, ptlim);
continue;
case 'z':
{
- int diff;
- char const * sign;
-
- if (t->tm_isdst < 0)
- continue;
-#ifdef TM_GMTOFF
- diff = t->TM_GMTOFF;
-#else /* !defined TM_GMTOFF */
- /*
- ** C99 says that the UTC offset must
- ** be computed by looking only at
- ** tm_isdst. This requirement is
- ** incorrect, since it means the code
- ** must rely on magic (in this case
- ** altzone and timezone), and the
- ** magic might not have the correct
- ** offset. Doing things correctly is
- ** tricky and requires disobeying C99;
- ** see GNU C strftime for details.
- ** For now, punt and conform to the
- ** standard, even though it's incorrect.
- **
- ** C99 says that %z must be replaced by the
- ** empty string if the time zone is not
- ** determinable, so output nothing if the
- ** appropriate variables are not available.
- */
- if (t->tm_isdst == 0)
-#ifdef USG_COMPAT
- diff = -timezone;
-#else /* !defined USG_COMPAT */
- continue;
-#endif /* !defined USG_COMPAT */
- else
-#ifdef ALTZONE
- diff = -altzone;
-#else /* !defined ALTZONE */
- continue;
-#endif /* !defined ALTZONE */
-#endif /* !defined TM_GMTOFF */
- if (diff < 0) {
- sign = "-";
- diff = -diff;
- } else sign = "+";
- pt = _add(sign, pt, ptlim);
- diff /= 60;
- pt = _conv((diff/60)*100 + diff%60,
- "%04d", pt, ptlim);
- }
+ long absoff;
+ if (t->tm_gmtoff >= 0) {
+ absoff = t->tm_gmtoff;
+ pt = _add("+", pt, ptlim);
+ } else {
+ absoff = -t->tm_gmtoff;
+ pt = _add("-", pt, ptlim);
+ }
+ pt = _conv(absoff / 3600, "%02d",
+ pt, ptlim);
+ pt = _conv((absoff % 3600) / 60, "%02d",
+ pt, ptlim);
+ };
continue;
case '+':
- pt = _fmt(tptr->date_fmt, t, pt, ptlim,
- warnp);
+ pt = _fmt(tptr->date_fmt, t, pt, ptlim);
continue;
case '%':
/*
- ** X311J/88-090 (4.12.3.5): if conversion char is
- ** undefined, behavior is undefined. Print out the
- ** character itself as printf(3) also does.
- */
+ * X311J/88-090 (4.12.3.5): if conversion char is
+ * undefined, behavior is undefined. Print out the
+ * character itself as printf(3) also does.
+ */
default:
break;
}
@@ -520,10 +424,10 @@
static char *
_conv(n, format, pt, ptlim)
-const int n;
-const char * const format;
-char * const pt;
-const char * const ptlim;
+ const int n;
+ const char *const format;
+ char *const pt;
+ const char *const ptlim;
{
char buf[INT_STRLEN_MAXIMUM(int) + 1];
@@ -533,9 +437,9 @@
static char *
_add(str, pt, ptlim)
-const char * str;
-char * pt;
-const char * const ptlim;
+ const char *str;
+ char *pt;
+ const char *const ptlim;
{
while (pt < ptlim && (*pt = *str++) != '\0')
++pt;