lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-05 19:35:52 +03:00
Code Activity

Mon May 6 14:53:26 1996 Ulrich Drepper <drepper@cygnus.com>

Browse Source 
* time/strftime.c (week): Add third parameter telling how
	many days must be in new year so that it is called week 1.
	(Following ISO 8601).
	Correct computation for %U and %V formats when day was first
	day of the week.
	(strftime): Implement %V format according to Spec1170.
This commit is contained in:
Roland McGrath
1996-05-06 14:31:45 +00:00
parent db2286f6d9
commit 339841f985
1 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
time/strftime.c
View File

@@ -75,7 +75,7 @@ Cambridge, MA 02139, USA. */
#endif #endif
#endif #endif
static unsigned int week __P((const struct tm *const, int)); static unsigned int week __P((const struct tm *const, int, int));
#define add(n, f) \ #define add(n, f) \
@@ -107,23 +107,37 @@ static unsigned int week __P((const struct tm *const, int));
inline inline
#endif #endif
static unsigned int static unsigned int
week (tp, starting_day) week (tp, starting_day, max_preceding)
const struct tm *const tp; const struct tm *const tp;
int starting_day; int starting_day;
int max_preceding;
{ {
int wday, dl; int wday, dl, base;
wday = tp->tm_wday - starting_day; wday = tp->tm_wday - starting_day;
if (wday < 0) if (wday < 0)
wday += 7; wday += 7;
/* Set DL to the day in the year of the last day of the week previous to the /* Set DL to the day in the year of the first day of the week
one containing the day specified in TP. If DL is negative or zero, the containing the day specified in TP. */
day specified in TP is in the first week of the year. Otherwise,
calculate the number of complete weeks before our week (DL / 7) and
add any partial week at the start of the year (DL % 7). */
dl = tp->tm_yday - wday; dl = tp->tm_yday - wday;
return dl <= 0 ? 0 : ((dl / 7) + ((dl % 7) == 0 ? 0 : 1));
/* For the computation following ISO 8601:1988 we set the number of
the week containing January 1st to 1 if this week has more than
MAX_PRECEDING days in the new year. For ISO 8601 this number is
3, for the other representation it is 7 (i.e., not to be
fulfilled). */
base = ((dl + 7) % 7) > max_preceding ? 1 : 0;
/* If DL is negative we compute the result as 0 unless we have to
compute it according ISO 8601. In this case we have to return 53
or 1 if the week containing January 1st has less than 4 days in
the new year or not. If DL is not negative we calculate the
number of complete weeks for our week (DL / 7) plus 1 (because
only for DL < 0 we are in week 0/53 and plus the number of the
first week computed in the last step. */
return dl < 0 ? (dl < -max_preceding ? 53 : base)
: base + 1 + dl / 7;
} }
#ifndef _NL_CURRENT #ifndef _NL_CURRENT
@@ -175,8 +189,9 @@ strftime (s, maxsize, format, tp)
#endif #endif
size_t wkday_len = strlen(f_wkday); size_t wkday_len = strlen(f_wkday);
size_t month_len = strlen(f_month); size_t month_len = strlen(f_month);
const unsigned int y_week0 = week (tp, 0); const unsigned int y_week0 = week (tp, 0, 7);
const unsigned int y_week1 = week (tp, 1); const unsigned int y_week1 = week (tp, 1, 7);
const unsigned int y_week2 = week (tp, 1, 3);
const char *zone; const char *zone;
size_t zonelen; size_t zonelen;
register size_t i = 0; register size_t i = 0;
@@ -340,7 +355,7 @@ strftime (s, maxsize, format, tp)
#ifdef _LIBC #ifdef _LIBC
add (maxdigits, printed = sprintf (p, number_fmt, number_value)); add (maxdigits, printed = sprintf (p, number_fmt, number_value));
#else #else
add (sprintf (p, number_fmt, number_value); add (maxdigits, sprintf (p, number_fmt, number_value);
printed = strlen (p)); printed = strlen (p));
#endif #endif
@@ -405,6 +420,9 @@ strftime (s, maxsize, format, tp)
case 'U': case 'U':
DO_NUMBER (2, y_week0); DO_NUMBER (2, y_week0);
case 'V':
DO_NUMBER (2, y_week2);
case 'W': case 'W':
DO_NUMBER (2, y_week1); DO_NUMBER (2, y_week1);