mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-10 07:10:06 +00:00
933e73facc
* locale/localeinfo.h: Rewritten for new locale system, using locale data files and with <langinfo.h> interface. * locale/setlocale.c: Rewritten to use locale data files. * langinfo.h: New file. * locale/langinfo.h: New file. * locale/nl_langinfo.c: New file. * locale/loadlocale.c: New file. * locale/lc-ctype.c: New file. * locale/lc-messages.c: New file. * locale/lc-monetary.c: New file. * locale/lc-numeric.c: New file. * locale/lc-time.c: New file. * locale/categories.def: New file. * locale/Makefile (headers): Remove localeinfo.h. (distribute): New variable; put localeinfo.h here, and categories.def. (routines): Add loadlocale. (categories): New variable. (aux): Use that to get C-category and lc-category. * ctype/ctype.h (_IS*): Use independent bits for all but _ISalnum. * locale/C-ctype.c, locale/C-messages.c: New files. * locale/C-monetary.c, locale/C-numeric.c, locale/C-time.c: Default "C" locale data updated for new locale system. * locale/C-collate.c: File removed. * locale/C-ctype_ct.c: File removed. * locale/C-ctype_mb.c: File removed. * locale/C-response.c: File removed. * locale/localeconv.c: Use _NL_CURRENT macro to access locale data. * stdio/printf_fp.c, stdio/vfprintf.c, stdio/vfscanf.c, stdlib/strtod.c, time/asctime.c, time/strftime.c: Include ../locale/localeinfo.h and use _NL_CURRENT macro to access locale data. * time/localtime.c: Don't include <localeinfo.h>. * time/tzset.c: Don't use locale items for default TZ value or "GMT" string (use "UTC"). * stdio/vfprintf.c [USE_IN_LIBIO] (PAD): Only call the function if WIDTH>0; update DONE. * malloc/malloc.c (morecore): Fix last change to calculate by blocks instead of bytes.
298 lines
6.4 KiB
C
298 lines
6.4 KiB
C
/* Extensions for GNU date that are still missing here:
|
|
-
|
|
_
|
|
*/
|
|
|
|
/* Copyright (C) 1991, 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Library General Public License as
|
|
published by the Free Software Foundation; either version 2 of the
|
|
License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with the GNU C Library; see the file COPYING.LIB. If
|
|
not, write to the Free Software Foundation, Inc., 675 Mass Ave,
|
|
Cambridge, MA 02139, USA. */
|
|
|
|
#include <ansidecl.h>
|
|
#include "../locale/localeinfo.h"
|
|
#include <ctype.h>
|
|
#include <limits.h>
|
|
#include <stddef.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <time.h>
|
|
|
|
#ifndef HAVE_GNU_LD
|
|
#define __tzname tzname
|
|
#define __daylight daylight
|
|
#define __timezone timezone
|
|
#endif
|
|
|
|
|
|
#define add(n, f) \
|
|
do \
|
|
{ \
|
|
i += (n); \
|
|
if (i >= maxsize) \
|
|
return 0; \
|
|
else \
|
|
if (p != NULL) \
|
|
{ \
|
|
f; \
|
|
p += (n); \
|
|
} \
|
|
} while (0)
|
|
#define cpy(n, s) add((n), memcpy((PTR) p, (PTR) (s), (n)))
|
|
#define fmt(n, args) add((n), if (sprintf args != (n)) return 0)
|
|
|
|
/* Return the week in the year specified by TP,
|
|
with weeks starting on STARTING_DAY. */
|
|
#ifdef __GNUC__
|
|
inline
|
|
#endif
|
|
static unsigned int
|
|
DEFUN(week, (tp, starting_day),
|
|
CONST struct tm *CONST tp AND int starting_day)
|
|
{
|
|
int wday, dl;
|
|
|
|
wday = tp->tm_wday - starting_day;
|
|
if (wday < 0)
|
|
wday += 7;
|
|
|
|
/* Set DL to the day in the year of the last day of the week previous to the
|
|
one containing the day specified in TP. If DL is negative or zero, the
|
|
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;
|
|
return dl <= 0 ? 0 : ((dl / 7) + ((dl % 7) == 0 ? 0 : 1));
|
|
}
|
|
|
|
|
|
/* Write information from TP into S according to the format
|
|
string FORMAT, writing no more that MAXSIZE characters
|
|
(including the terminating '\0') and returning number of
|
|
characters written. If S is NULL, nothing will be written
|
|
anywhere, so to determine how many characters would be
|
|
written, use NULL for S and (size_t) UINT_MAX for MAXSIZE. */
|
|
size_t
|
|
DEFUN(strftime, (s, maxsize, format, tp),
|
|
char *s AND size_t maxsize AND
|
|
CONST char *format AND register CONST struct tm *tp)
|
|
{
|
|
CONST char *CONST a_wkday = _NL_CURRENT (LC_TIME, ABDAY_1 + tp->tm_wday);
|
|
CONST char *CONST f_wkday = _NL_CURRENT (LC_TIME, DAY_1 + tp->tm_wday);
|
|
CONST char *CONST a_month = _NL_CURRENT (LC_TIME, ABMON_1 + tp->tm_mon);
|
|
CONST char *CONST f_month = _NL_CURRENT (LC_TIME, MON_1 + tp->tm_mon);
|
|
size_t aw_len = strlen(a_wkday);
|
|
size_t am_len = strlen(a_month);
|
|
size_t wkday_len = strlen(f_wkday);
|
|
size_t month_len = strlen(f_month);
|
|
int hour12 = tp->tm_hour;
|
|
CONST char *CONST ampm = _NL_CURRENT (LC_TIME,
|
|
hour12 > 12 ? PM_STR : AM_STR);
|
|
size_t ap_len = strlen (ampm);
|
|
CONST unsigned int y_week0 = week (tp, 0);
|
|
CONST unsigned int y_week1 = week (tp, 1);
|
|
CONST char *zone;
|
|
size_t zonelen;
|
|
register size_t i = 0;
|
|
register char *p = s;
|
|
register CONST char *f;
|
|
|
|
if (tp->tm_isdst < 0)
|
|
{
|
|
zone = "";
|
|
zonelen = 0;
|
|
}
|
|
else
|
|
{
|
|
zone = __tzname[tp->tm_isdst];
|
|
zonelen = strlen(zone);
|
|
}
|
|
|
|
if (hour12 > 12)
|
|
hour12 -= 12;
|
|
else
|
|
if (hour12 == 0) hour12 = 12;
|
|
|
|
for (f = format; *f != '\0'; ++f)
|
|
{
|
|
CONST char *subfmt;
|
|
|
|
if (!isascii(*f))
|
|
{
|
|
/* Non-ASCII, may be a multibyte. */
|
|
int len = mblen(f, strlen(f));
|
|
if (len > 0)
|
|
{
|
|
cpy(len, f);
|
|
continue;
|
|
}
|
|
}
|
|
|
|
if (*f != '%')
|
|
{
|
|
add(1, *p = *f);
|
|
continue;
|
|
}
|
|
|
|
++f;
|
|
switch (*f)
|
|
{
|
|
case '\0':
|
|
case '%':
|
|
add(1, *p = *f);
|
|
break;
|
|
|
|
case 'a':
|
|
cpy(aw_len, a_wkday);
|
|
break;
|
|
|
|
case 'A':
|
|
cpy(wkday_len, f_wkday);
|
|
break;
|
|
|
|
case 'b':
|
|
case 'h': /* GNU extension. */
|
|
cpy(am_len, a_month);
|
|
break;
|
|
|
|
case 'B':
|
|
cpy(month_len, f_month);
|
|
break;
|
|
|
|
case 'c':
|
|
subfmt = _NL_CURRENT (LC_TIME, D_T_FMT);
|
|
subformat:
|
|
{
|
|
size_t len = strftime (p, maxsize - i, subfmt, tp);
|
|
add(len, );
|
|
}
|
|
break;
|
|
|
|
case 'C':
|
|
fmt (2, (p, "%.2d", (1900 + tp->tm_year) / 100));
|
|
break;
|
|
|
|
case 'D': /* GNU extension. */
|
|
subfmt = "%m/%d/%y";
|
|
goto subformat;
|
|
|
|
case 'd':
|
|
fmt(2, (p, "%.2d", tp->tm_mday));
|
|
break;
|
|
|
|
case 'e': /* GNU extension: %d, but blank-padded. */
|
|
fmt(2, (p, "%2d", tp->tm_mday));
|
|
break;
|
|
|
|
case 'H':
|
|
fmt(2, (p, "%.2d", tp->tm_hour));
|
|
break;
|
|
|
|
case 'I':
|
|
fmt(2, (p, "%.2d", hour12));
|
|
break;
|
|
|
|
case 'k': /* GNU extension. */
|
|
fmt(2, (p, "%2d", tp->tm_hour));
|
|
break;
|
|
|
|
case 'l': /* GNU extension. */
|
|
fmt(2, (p, "%2d", hour12));
|
|
break;
|
|
|
|
case 'j':
|
|
fmt(3, (p, "%.3d", 1 + tp->tm_yday));
|
|
break;
|
|
|
|
case 'M':
|
|
fmt(2, (p, "%.2d", tp->tm_min));
|
|
break;
|
|
|
|
case 'm':
|
|
fmt(2, (p, "%.2d", tp->tm_mon + 1));
|
|
break;
|
|
|
|
case 'n': /* GNU extension. */
|
|
add (1, *p = '\n');
|
|
break;
|
|
|
|
case 'p':
|
|
cpy(ap_len, ampm);
|
|
break;
|
|
|
|
case 'R': /* GNU extension. */
|
|
subfmt = "%H:%M";
|
|
goto subformat;
|
|
|
|
case 'r': /* GNU extension. */
|
|
subfmt = "%I:%M:%S %p";
|
|
goto subformat;
|
|
|
|
case 'S':
|
|
fmt(2, (p, "%.2d", tp->tm_sec));
|
|
break;
|
|
|
|
case 'T': /* GNU extenstion. */
|
|
subfmt = "%H:%M:%S";
|
|
goto subformat;
|
|
|
|
case 't': /* GNU extenstion. */
|
|
add (1, *p = '\t');
|
|
break;
|
|
|
|
case 'U':
|
|
fmt(2, (p, "%.2u", y_week0));
|
|
break;
|
|
|
|
case 'W':
|
|
fmt(2, (p, "%.2u", y_week1));
|
|
break;
|
|
|
|
case 'w':
|
|
fmt(2, (p, "%.2d", tp->tm_wday));
|
|
break;
|
|
|
|
case 'X':
|
|
subfmt = _NL_CURRENT (LC_TIME, T_FMT);
|
|
goto subformat;
|
|
|
|
case 'x':
|
|
subfmt = _NL_CURRENT (LC_TIME, D_FMT);
|
|
goto subformat;
|
|
|
|
case 'Y':
|
|
fmt(4, (p, "%.4d", 1900 + tp->tm_year));
|
|
break;
|
|
|
|
case 'y':
|
|
fmt(2, (p, "%.2d", tp->tm_year));
|
|
break;
|
|
|
|
case 'Z':
|
|
cpy(zonelen, zone);
|
|
break;
|
|
|
|
default:
|
|
/* Bad format. */
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (p != NULL)
|
|
*p = '\0';
|
|
return i;
|
|
}
|