mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-27 03:41:23 +08:00
c4563d2d66
1999-04-28 Ulrich Drepper <drepper@cygnus.com> * argp/argp-ba.c (argp_program_bug_address): Don't initialize with 0. * argp/argp-parse.c (_argp_hang): Likewise. * argp/argp-pv.c (argp_program_version): Likewise. * argp/argp-pvh.c (argp_program_version_hook): Likewise. * inet/ether_hton.c (ether_hton, startp): Likewise. * inet/ether_ntoh.c (ether_ntoh, startp): Likewise. * inet/getnetgrent_r.c (setup, startp): Likewise. * intl/loadmsgcat.c (_nl_msg_cat_cntr): Likewise. * intl/localealias.c (string_space, string_space_act, string_space_max, nmap, maxmap): Likewise. * libio/iopopen.c (proc_file_chain): Likewise. * libio/oldiopopen.c (old_proc_file_chain): Likewise. * locale/lc-collate.c (__collate_table, __collate_extra, __collate_element_hash, __collate_element_strings, __collate_element_values): Likewise. * malloc/mcheck.c (mcheck_used): Likewise. * malloc/mtrace.c (added_atexit_handler): Likewise. * malloc/set-freeres.c (already_called): Likewise. * misc/getpass.c (getpass) [buf, bufsize]: Likewise. * misc/syslog.c (LogStat, LogTag): Likewise. * nss/XXX-lookup.c (DATABASE_NAME_SYMBOL): Likewise. * nss/getXXbyYY_r.c (startp): Likewise. * posix/getopt.c (optarg, __getopt_initialized): Likewise. * posix/regex.c (init_syntax_once) [done]: Likewise. (debug): Likewise. * string/strfry.c (init): Likewise. * sunrpc/svc_run.c (svc_top): Likewise. * posix/euidaccess.c (have_ids): Likewise. * sysdeps/unix/sysv/linux/poll.c (must_emulate): Likewise. * sysdeps/unix/sysv/linux/ttyname.c (__ttyname, namelen): Likewise. * time/getdate.c (getdate_err): Likewise. * time/tzfile.c (transitions, type_idxs, types, zone_names, leaps): Likewise. * time/tzset.c (old_tz, is_initialized): Likewise. * inet/getnameinfo.c (nrl_domainname): Rewrite to allow initialization of static data with zero. * signal/allocrtsig.c (init): Likewise. * string/Makefile (routines): Add strchrnul. * string/Versions [GLIBC_2.1.1]: Add strchrnul. * string/string.c: Add strchrnul prototype. * include/string.h: Add __strchrnul prototype. * sysdeps/generic/strchrnul.c: New file. * sysdeps/i386/strchrnul.S: New file. * sysdeps/i386/bits/string.c: Add strchrnul optimization. * sysdeps/i386/i486/bits/string.c: Likewise. * argp/argp-help.c (argp_args_usage): Use __strchrnul. * inet/ether_line.c (ether_line): Likewise. * nscd/nscd_conf.c (nscd_parse_file): Likewise. * nss/nsswitch.c (nss_parse_file): Likewise. * posix/execvp.c (execvp): Likewise. * posix/fnmatch.c (internal_fnmatch): Likewise. * resolv/res_hconf.c (_res_hconv_init): Likewise. * resolv/res_init.c (res_init): Likewise. * stdlib/fmtmsg.c (init): Likewise. * stdlib/getsubopt.c (getsubopt): Likewise. * catgets/catgets.c (catopen): Only allocate one memory block. (catclose): Only one free call necessary. * catgets/open_catalog.c (__open_catalog): Simplify handling of file descriptor. * ctype/ctype-extn.c: Make __toascii_l and __isascii_l alias instead of real functions. Simplify _tolower and _toupper. * grp/initgroups.c (compat_call): Remove unnecessary use of pointer variable. * iconv/gconv.h (struct gconv_info): Change data element from pointer to array of size 0. * iconv/gconv_open.c (__gconv_open): Allocate structures accordingly. * iconv/gconv_close.c (__gconv_close): Don't free data. * iconv/gconv_conf.c (add_alias): Avoid searching in tree twice to insert new alias. * iconv/gconv_db.c (add_derivation): More efficient copying. Check for error while inserting in tree. * include/time.h: Pretty print. * inet/ruserpass.c: Rewrite use of toktab to avoid string pointers in table and lots of relocations. * posix/regex.c (regerror): Rewrite use of re_error_msgid to avoid string pointers in table and lots of relocations. * intl/finddomain.c: Remove definition of strchr macro. * io/ftw.c (nftw_arr, ftw_arr): Make const. * locale/loadlocale.c (_nl_load_locale): Optimize string copying. * locale/localeinfo.h (_nl_category_names): Change into an array with fixed width char string elements. * locale/setlocale.c (_nl_category_names): Likewise. (_nl_current): Make global. * locale/nl_langinfo.c (nldata): Removed. Use _nl_current now. * malloc/Makefile (distribute): Add stackinfo.h. * sysdeps/generic/stackinfo.h: New file. * sysdeps/i386/stackinfo.h: New file. * posix/execl.c: Use stackinfo.h in optimizing alloca use. * posix/execle.c: Likewise. * posix/execlp.c: Likewise. * nis/nis_table.c (__create_ib_request): Always use realloc. * posix/execvp.c (execute): Rename to script_execute and keep only code to execute using shell. (execvp): Call execv directly and only fall back on script_execute. * resolv/inet_net_pton.c (inet_net_pton_ipv4): Remove digits define and always use xdigits instead. * resolv/res_init.c (res_init): Use rawmemchr instead of strchr where appropriate. * stdlib/fpioconst.h (__tens): New declaration. (struct mp_power): Remove array, add arrayoff element. * stdlib/fpioconst.c: Replace definitions of _ten_p* arrays by one __tens array and add in _fpioconst_pow10 offsets into __tens. * stdio-common/printf_fp.c: Rewrite to use new __tens array. * stdlib/strtod.c: Likewise. * stdlib/a64l.c (a64l_table): Avoid unnecessary elements. * stdlib/exit.c: Rewrite to use __exit_funcs being as sign for end of the list. * stdlib/atexit.c (__exit_funcs): Don't initialize. * stdlib/fmtmsg.c (keywords): Make name element fixed width array. * sunrpc/clnt_perr.c: Rewrite clnt_sperrno and auth_errmsg to use a single and an array with offsets. * sunrpc/des_soft.c (partab): Make it const. * sunrpc/key_call.c (trytimeout, tottimeout): Make const. (__key_encryptsession_pk_LOCAL): Don't initialize with 0. (__key_decryptsession_pk_LOCAL): Likewise. (__key_gendes_LOCAL): Likewise. (MESSENGER): Mark const. (key_call_private_main): Don't initialize with 0. (use_keyenvoy): Don't initialize with 0. (key_call): Rewrite to reverse logic of use_doors variable. * sunrpc/netname.c (OPSYS): Define as array, not pointer. (startp): Don't initialize with zero. * sunrpc/openchild.c (_openchild): Make first argument const. * sunrpc/pmap_rmt.c (timeout): Mark const. * sunrpc/xcrypt.c (hex): Likewise. * sysdeps/unix/sysv/linux/getcwd.c: Rewrite to allow omitting initialization of global variables. * sysdeps/unix/sysv/linux/getpt.c: Likewise. * sysdeps/unix/sysv/linux/if_index.c: Likewise. * termios/tcgetsid.c: Likewise. * sysdeps/unix/sysv/linux/i386/dl-procinfo.h (x86_cap_flags): Change fxsr to osfxsr. * time/tzfile.c (__tzfile_read): Rewrite to allocate only one memory block. Add function to free memory if wanted. * time/tzset.c (tzset_internal): Pass extra argument to __tzfile_read. * wcsmbs/wcsmbsload.c (to_wc, to_mb): Correct initializers. * wcsmbs/wmemset.c: Little code optimization.
254 lines
6.5 KiB
C
254 lines
6.5 KiB
C
/* Convert a string representation of time to a time value.
|
|
Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Mark Kettenis <kettenis@phys.uva.nl>, 1997.
|
|
|
|
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., 59 Temple Place - Suite 330,
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
#include <limits.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <time.h>
|
|
#include <sys/stat.h>
|
|
|
|
|
|
/* Prototypes for local functions. */
|
|
static int first_wday (int year, int mon, int wday);
|
|
static int check_mday (int year, int mon, int mday);
|
|
|
|
|
|
/* Set to one of the following values to indicate an error.
|
|
1 the DATEMSK environment variable is null or undefined,
|
|
2 the template file cannot be opened for reading,
|
|
3 failed to get file status information,
|
|
4 the template file is not a regular file,
|
|
5 an error is encountered while reading the template file,
|
|
6 memory allication failed (not enough memory available),
|
|
7 there is no line in the template that matches the input,
|
|
8 invalid input specification Example: February 31 or a time is
|
|
specified that can not be represented in a time_t (representing
|
|
the time in seconds since 00:00:00 UTC, January 1, 1970) */
|
|
int getdate_err;
|
|
|
|
|
|
/* Returns the first weekday WDAY of month MON in the year YEAR. */
|
|
static int
|
|
first_wday (int year, int mon, int wday)
|
|
{
|
|
struct tm tm;
|
|
|
|
if (wday == INT_MIN)
|
|
return 1;
|
|
|
|
memset (&tm, 0, sizeof (struct tm));
|
|
tm.tm_year = year;
|
|
tm.tm_mon = mon;
|
|
tm.tm_mday = 1;
|
|
mktime (&tm);
|
|
|
|
return (1 + (wday - tm.tm_wday + 7) % 7);
|
|
}
|
|
|
|
|
|
/* Returns 1 if MDAY is a valid day of the month in month MON of year
|
|
YEAR, and 0 if it is not. */
|
|
static int
|
|
check_mday (int year, int mon, int mday)
|
|
{
|
|
switch (mon)
|
|
{
|
|
case 0:
|
|
case 2:
|
|
case 4:
|
|
case 6:
|
|
case 7:
|
|
case 9:
|
|
case 11:
|
|
if (mday >= 1 && mday <= 31)
|
|
return 1;
|
|
break;
|
|
case 3:
|
|
case 5:
|
|
case 8:
|
|
case 10:
|
|
if (mday >= 1 && mday <= 30)
|
|
return 1;
|
|
break;
|
|
case 1:
|
|
if (mday >= 1 && mday < (__isleap (year) ? 29 : 28))
|
|
return 1;
|
|
break;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
|
|
int
|
|
__getdate_r (const char *string, struct tm *tp)
|
|
{
|
|
FILE *fp;
|
|
char *line;
|
|
size_t len;
|
|
char *datemsk;
|
|
char *result = NULL;
|
|
time_t timer;
|
|
struct tm tm;
|
|
struct stat st;
|
|
int mday_ok = 0;
|
|
|
|
datemsk = getenv ("DATEMSK");
|
|
if (datemsk == NULL || *datemsk == '\0')
|
|
return 1;
|
|
|
|
if (stat (datemsk, &st) < 0)
|
|
return 3;
|
|
|
|
if (!S_ISREG (st.st_mode))
|
|
return 4;
|
|
|
|
/* Open the template file. */
|
|
fp = fopen (datemsk, "r");
|
|
if (fp == NULL)
|
|
return 2;
|
|
|
|
line = NULL;
|
|
len = 0;
|
|
do
|
|
{
|
|
ssize_t n;
|
|
|
|
n = __getline (&line, &len, fp);
|
|
if (n < 0)
|
|
break;
|
|
if (line[n - 1] == '\n')
|
|
line[n - 1] = '\0';
|
|
|
|
/* Do the conversion. */
|
|
tp->tm_year = tp->tm_mon = tp->tm_mday = tp->tm_wday = INT_MIN;
|
|
tp->tm_hour = tp->tm_sec = tp->tm_min = INT_MIN;
|
|
result = strptime (string, line, tp);
|
|
if (result && *result == '\0')
|
|
break;
|
|
}
|
|
while (!feof_unlocked (fp));
|
|
|
|
/* Free the buffer. */
|
|
free (line);
|
|
|
|
/* Check for errors. */
|
|
if (ferror_unlocked (fp))
|
|
{
|
|
fclose (fp);
|
|
return 5;
|
|
}
|
|
|
|
/* Close template file. */
|
|
fclose (fp);
|
|
|
|
if (result == NULL || *result != '\0')
|
|
return 7;
|
|
|
|
/* Get current time. */
|
|
time (&timer);
|
|
__localtime_r (&timer, &tm);
|
|
|
|
/* If only the weekday is given, today is assumed if the given day
|
|
is equal to the current day and next week if it is less. */
|
|
if (tp->tm_wday >= 0 && tp->tm_wday <= 6 && tp->tm_year == INT_MIN
|
|
&& tp->tm_mon == INT_MIN && tp->tm_mday == INT_MIN)
|
|
{
|
|
tp->tm_year = tm.tm_year;
|
|
tp->tm_mon = tm.tm_mon;
|
|
tp->tm_mday = tm.tm_mday + (tp->tm_wday - tm.tm_wday + 7) % 7;
|
|
mday_ok = 1;
|
|
}
|
|
|
|
/* If only the month is given, the current month is assumed if the
|
|
given month is equal to the current month and next year if it is
|
|
less and no year is given (the first day of month is assumed if
|
|
no day is given. */
|
|
if (tp->tm_mon >= 0 && tp->tm_mon <= 11 && tp->tm_mday == INT_MIN)
|
|
{
|
|
if (tp->tm_year == INT_MIN)
|
|
tp->tm_year = tm.tm_year + (((tp->tm_mon - tm.tm_mon) < 0) ? 1 : 0);
|
|
tp->tm_mday = first_wday (tp->tm_year, tp->tm_mon, tp->tm_wday);
|
|
mday_ok = 1;
|
|
}
|
|
|
|
/* If no hour, minute and second are given the current hour, minute
|
|
and second are assumed. */
|
|
if (tp->tm_hour == INT_MIN && tp->tm_min == INT_MIN && tp->tm_sec == INT_MIN)
|
|
{
|
|
tp->tm_hour = tm.tm_hour;
|
|
tp->tm_min = tm.tm_min;
|
|
tp->tm_sec = tm.tm_sec;
|
|
}
|
|
|
|
/* If no date is given, today is assumed if the given hour is
|
|
greater than the current hour and tomorrow is assumed if
|
|
it is less. */
|
|
if (tp->tm_hour >= 0 && tp->tm_hour <= 23
|
|
&& tp->tm_year == INT_MIN && tp->tm_mon == INT_MIN
|
|
&& tp->tm_mday == INT_MIN && tp->tm_wday == INT_MIN)
|
|
{
|
|
tp->tm_year = tm.tm_year;
|
|
tp->tm_mon = tm.tm_mon;
|
|
tp->tm_mday = tm.tm_mday + ((tp->tm_hour - tm.tm_hour) < 0 ? 1 : 0);
|
|
mday_ok = 1;
|
|
}
|
|
|
|
/* Fill in the gaps. */
|
|
if (tp->tm_year == INT_MIN)
|
|
tp->tm_year = tm.tm_year;
|
|
if (tp->tm_hour == INT_MIN)
|
|
tp->tm_hour = 0;
|
|
if (tp->tm_min == INT_MIN)
|
|
tp->tm_min = 0;
|
|
if (tp->tm_sec == INT_MIN)
|
|
tp->tm_sec = 0;
|
|
|
|
/* Check if the day of month is within range, and if the time can be
|
|
represented in a time_t. We make use of the fact that the mktime
|
|
call normalizes the struct tm. */
|
|
if ((!mday_ok && !check_mday (tp->tm_year, tp->tm_mon, tp->tm_mday))
|
|
|| mktime (tp) == (time_t) -1)
|
|
return 8;
|
|
|
|
return 0;
|
|
}
|
|
#ifdef weak_alias
|
|
weak_alias (__getdate_r, getdate_r)
|
|
#endif
|
|
|
|
|
|
struct tm *
|
|
getdate (const char *string)
|
|
{
|
|
/* Buffer returned by getdate. */
|
|
static struct tm tmbuf;
|
|
int errval = __getdate_r (string, &tmbuf);
|
|
|
|
if (errval != 0)
|
|
{
|
|
getdate_err = errval;
|
|
return NULL;
|
|
}
|
|
|
|
return &tmbuf;
|
|
}
|