Index: head/lib/libc/stdtime/Makefile.inc =================================================================== --- head/lib/libc/stdtime/Makefile.inc (revision 72405) +++ head/lib/libc/stdtime/Makefile.inc (revision 72406) @@ -1,17 +1,17 @@ # Makefile.inc,v 1.2 1994/09/13 21:26:01 wollman Exp # $FreeBSD$ -.PATH: ${.CURDIR}/../libc/stdtime +.PATH: ${.CURDIR}/../libc/stdtime ${.CURDIR}/../locale SRCS+= asctime.c difftime.c localtime.c strftime.c strptime.c timelocal.c .if ${LIB} == "c" MAN3+= ctime.3 strftime.3 strptime.3 time2posix.3 MAN5+= tzfile.5 MLINKS+=ctime.3 asctime.3 ctime.3 difftime.3 ctime.3 gmtime.3 \ ctime.3 localtime.3 ctime.3 mktime.3 ctime.3 timegm.3 \ ctime.3 ctime_r.3 ctime.3 localtime_r.3 ctime.3 gmtime_r.3 \ ctime.3 asctime_r.3 MLINKS+=time2posix.3 posix2time.3 .endif Index: head/lib/libc/stdtime/timelocal.c =================================================================== --- head/lib/libc/stdtime/timelocal.c (revision 72405) +++ head/lib/libc/stdtime/timelocal.c (revision 72406) @@ -1,254 +1,116 @@ /*- + * Copyright (c) 2001 Alexey Zelkin * Copyright (c) 1997 FreeBSD Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * * $FreeBSD$ */ -#include "namespace.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "un-namespace.h" - -#include "setlocale.h" +#include "ldpart.h" #include "timelocal.h" -static int split_lines(char *, const char *); -static void set_from_buf(const char *, int); - -static struct lc_time_T _time_localebuf; +static struct lc_time_T _time_locale; static int _time_using_locale; +static char * time_locale_buf; -#define LCTIME_SIZE_FULL (sizeof(struct lc_time_T) / sizeof(char *)) -#define LCTIME_SIZE_1 \ - (offsetof(struct lc_time_T, alt_month[0]) / sizeof(char *)) -#define LCTIME_SIZE_2 \ - (offsetof(struct lc_time_T, Ef_fmt) / sizeof(char *)) +#define LCTIME_SIZE (sizeof(struct lc_time_T) / sizeof(char *)) static const struct lc_time_T _C_time_locale = { { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" }, { "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December" }, { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" }, { "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday" }, /* X_fmt */ "%H:%M:%S", /* ** x_fmt ** Since the C language standard calls for ** "date, using locale's date format," anything goes. ** Using just numbers (as here) makes Quakers happier; ** it's also compatible with SVR4. */ "%m/%d/%y", /* ** c_fmt (ctime-compatible) */ "%a %Ef %T %Y", /* am */ "AM", /* pm */ "PM", /* date_fmt */ "%a %Ef %X %Z %Y", { "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December" }, /* Ef_fmt ** To determine short months / day order */ "%b %e", /* EF_fmt ** To determine long months / day order */ "%B %e" }; struct lc_time_T * __get_current_time_locale(void) { return (_time_using_locale - ? &_time_localebuf + ? &_time_locale : (struct lc_time_T *)&_C_time_locale); } int -__time_load_locale(const char *name) -{ - static char * locale_buf; - static char locale_buf_C[] = "C"; - static int num_lines; +__time_load_locale(const char *name) { - int fd; - char * lbuf; - char * p; - const char * plim; - char filename[PATH_MAX]; - struct stat st; - size_t namesize; - size_t bufsize; - int save_using_locale; + int ret; - save_using_locale = _time_using_locale; - _time_using_locale = 0; + ret = __part_load_locale(name, &_time_using_locale, + time_locale_buf, "LC_TIME", LCTIME_SIZE, + (const char **)&_time_locale); - if (name == NULL) - goto no_locale; - - if (!strcmp(name, "C") || !strcmp(name, "POSIX")) - return 0; - - /* - ** If the locale name is the same as our cache, use the cache. - */ - lbuf = locale_buf; - if (lbuf != NULL && strcmp(name, lbuf) == 0) { - set_from_buf(lbuf, num_lines); - _time_using_locale = 1; - return 0; - } - /* - ** Slurp the locale file into the cache. - */ - namesize = strlen(name) + 1; - - if (!_PathLocale) - goto no_locale; - /* Range checking not needed, 'name' size is limited */ - strcpy(filename, _PathLocale); - strcat(filename, "/"); - strcat(filename, name); - strcat(filename, "/LC_TIME"); - fd = _open(filename, O_RDONLY); - if (fd < 0) - goto no_locale; - if (_fstat(fd, &st) != 0) - goto bad_locale; - if (st.st_size <= 0) - goto bad_locale; - bufsize = namesize + st.st_size; - locale_buf = NULL; - lbuf = (lbuf == NULL || lbuf == locale_buf_C) ? - malloc(bufsize) : reallocf(lbuf, bufsize); - if (lbuf == NULL) - goto bad_locale; - (void) strcpy(lbuf, name); - p = lbuf + namesize; - plim = p + st.st_size; - if (_read(fd, p, (size_t) st.st_size) != st.st_size) - goto bad_lbuf; - if (_close(fd) != 0) - goto bad_lbuf; - /* - ** Parse the locale file into localebuf. - */ - if (plim[-1] != '\n') - goto bad_lbuf; - num_lines = split_lines(p, plim); - if (num_lines >= LCTIME_SIZE_FULL) - num_lines = LCTIME_SIZE_FULL; - else if (num_lines >= LCTIME_SIZE_2) - num_lines = LCTIME_SIZE_2; - else if (num_lines >= LCTIME_SIZE_1) - num_lines = LCTIME_SIZE_1; - else - goto reset_locale; - set_from_buf(lbuf, num_lines); - /* - ** Record the successful parse in the cache. - */ - locale_buf = lbuf; - - _time_using_locale = 1; - return 0; - -reset_locale: - /* - * XXX - This may not be the correct thing to do in this case. - * setlocale() assumes that we left the old locale alone. - */ - locale_buf = locale_buf_C; - _time_localebuf = _C_time_locale; - save_using_locale = 0; -bad_lbuf: - free(lbuf); -bad_locale: - (void)_close(fd); -no_locale: - _time_using_locale = save_using_locale; - return -1; -} - -static int -split_lines(char *p, const char *plim) -{ - int i; - - for (i = 0; p < plim; i++) { - p = strchr(p, '\n'); - *p++ = '\0'; - } - return i; -} - -static void -set_from_buf(const char *p, int num_lines) -{ - const char **ap; - int i; - - for (ap = (const char **) &_time_localebuf, i = 0; - i < num_lines; ++ap, ++i) - *ap = p += strlen(p) + 1; /* XXX: always overwrite for ctime format parsing compatibility */ - _time_localebuf.c_fmt = _C_time_locale.c_fmt; - if (num_lines >= LCTIME_SIZE_2) - return; - for (i = 0; i < 12; i++) - _time_localebuf.alt_month[i] = _time_localebuf.month[i]; + if (ret == 0 && _time_using_locale) + _time_locale.c_fmt = _C_time_locale.c_fmt; + return (ret); }