mirror of
git://sourceware.org/git/glibc.git
synced 2024-12-27 04:41:02 +08:00
d9fee042e2
This patch changes the remaining uses of the old nonstandard u_intN_t types in glibc to use the C99 uintN_t instead, except for the definitions of those typedefs and the tests of them in the c++-types test. This follows the previous such fix for libm, and being consistent in using uintN_t makes sense as a global cleanup. Tested for x86_64, and with build-many-glibcs.py. * catgets/catgets.c (catgets): Use uintN_t instead of u_intN_t. * catgets/catgetsinfo.h (struct catalog_obj): Likewise. (struct catalog_info): Likewise. * inet/htontest.c (lo): Likewise. (foo): Likewise. * inet/inet_lnaof.c (inet_lnaof): Likewise. * inet/inet_net.c (inet_network): Likewise. * inet/inet_netof.c (inet_netof): Likewise. * inet/rcmd.c (__ivaliduser): Likewise. (iruserok): Likewise. * locale/loadlocale.c (_nl_intern_locale_data): Likewise. * locale/programs/locale-spec.c (locale_special): Likewise. * nis/nis_findserv.c (struct findserv_req): Likewise. (__nis_findfastest_with_timeout): Likewise. * nss/test-netdb.c (test_network): Likewise. * resolv/inet_neta.c (inet_neta): Likewise. * resolv/ns_date.c (ns_datetosecs): Likewise. (SECS_PER_DAY): Likewise. * resolv/nss_dns/dns-network.c (_nss_dns_getnetbyaddr_r): Likewise. * resolv/res_comp.c (__putlong): Likewise. (__putshort): Likewise. (_getlong): Likewise. (_getshort): Likewise. * resolv/res_debug.c (p_time): Likewise. (precsize_ntoa): Likewise. (precsize_aton): Likewise. (latlon2ul): Likewise. (loc_aton): Likewise. (loc_ntoa): Likewise. * resolv/res_hconf.c (struct netaddr): Likewise. (_res_hconf_reorder_addrs): Likewise. * sunrpc/clnt_tcp.c (clnttcp_call): Likewise. (clnttcp_control): Likewise. * sunrpc/clnt_udp.c (clntudp_call): Likewise. (clntudp_control): Likewise. * sunrpc/clnt_unix.c (clntunix_call): Likewise. (clntunix_control): Likewise. * sunrpc/pmap_rmt.c (clnt_broadcast): Likewise. * sunrpc/rpc/auth.h (union des_block): Likewise. * sunrpc/tst-udp-nonblocking.c (do_test): Likewise. * sunrpc/xdr_rec.c (struct rec_strm): Likewise. (xdrrec_create): Likewise. (xdrrec_endofrecord): Likewise. (flush_out): Likewise. * sunrpc/xdr_stdio.c (xdrstdio_getlong): Likewise. (xdrstdio_putlong): Likewise. * sysdeps/unix/sysv/linux/errqueue.h (struct sock_extended_err): Likewise.
118 lines
3.5 KiB
C
118 lines
3.5 KiB
C
/*
|
|
* Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
|
|
* Copyright (c) 1999 by Internet Software Consortium.
|
|
*
|
|
* Permission to use, copy, modify, and distribute this software for any
|
|
* purpose with or without fee is hereby granted, provided that the above
|
|
* copyright notice and this permission notice appear in all copies.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
|
|
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
|
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR
|
|
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
|
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
|
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
|
|
* OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
*/
|
|
|
|
/* Import. */
|
|
|
|
#include <arpa/nameser.h>
|
|
|
|
#include <ctype.h>
|
|
#include <errno.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <time.h>
|
|
|
|
#define SPRINTF(x) ((size_t)sprintf x)
|
|
|
|
/* Forward. */
|
|
|
|
static int datepart(const char *, int, int, int, int *);
|
|
|
|
/* Public. */
|
|
|
|
/*%
|
|
* Convert a date in ASCII into the number of seconds since
|
|
* 1 January 1970 (GMT assumed). Format is yyyymmddhhmmss, all
|
|
* digits required, no spaces allowed.
|
|
*/
|
|
|
|
uint32_t
|
|
ns_datetosecs(const char *cp, int *errp) {
|
|
struct tm time;
|
|
uint32_t result;
|
|
int mdays, i;
|
|
static const int days_per_month[12] =
|
|
{31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
|
|
|
|
if (strlen(cp) != 14U) {
|
|
*errp = 1;
|
|
return (0);
|
|
}
|
|
*errp = 0;
|
|
|
|
memset(&time, 0, sizeof time);
|
|
time.tm_year = datepart(cp + 0, 4, 1990, 9999, errp) - 1900;
|
|
time.tm_mon = datepart(cp + 4, 2, 01, 12, errp) - 1;
|
|
time.tm_mday = datepart(cp + 6, 2, 01, 31, errp);
|
|
time.tm_hour = datepart(cp + 8, 2, 00, 23, errp);
|
|
time.tm_min = datepart(cp + 10, 2, 00, 59, errp);
|
|
time.tm_sec = datepart(cp + 12, 2, 00, 59, errp);
|
|
if (*errp) /*%< Any parse errors? */
|
|
return (0);
|
|
|
|
/*
|
|
* OK, now because timegm() is not available in all environments,
|
|
* we will do it by hand. Roll up sleeves, curse the gods, begin!
|
|
*/
|
|
|
|
#define SECS_PER_DAY ((uint32_t)24*60*60)
|
|
#define isleap(y) ((((y) % 4) == 0 && ((y) % 100) != 0) || ((y) % 400) == 0)
|
|
|
|
result = time.tm_sec; /*%< Seconds */
|
|
result += time.tm_min * 60; /*%< Minutes */
|
|
result += time.tm_hour * (60*60); /*%< Hours */
|
|
result += (time.tm_mday - 1) * SECS_PER_DAY; /*%< Days */
|
|
/* Months are trickier. Look without leaping, then leap */
|
|
mdays = 0;
|
|
for (i = 0; i < time.tm_mon; i++)
|
|
mdays += days_per_month[i];
|
|
result += mdays * SECS_PER_DAY; /*%< Months */
|
|
if (time.tm_mon > 1 && isleap(1900+time.tm_year))
|
|
result += SECS_PER_DAY; /*%< Add leapday for this year */
|
|
/* First figure years without leapdays, then add them in. */
|
|
/* The loop is slow, FIXME, but simple and accurate. */
|
|
result += (time.tm_year - 70) * (SECS_PER_DAY*365); /*%< Years */
|
|
for (i = 70; i < time.tm_year; i++)
|
|
if (isleap(1900+i))
|
|
result += SECS_PER_DAY; /*%< Add leapday for prev year */
|
|
return (result);
|
|
}
|
|
|
|
/* Private. */
|
|
|
|
/*%
|
|
* Parse part of a date. Set error flag if any error.
|
|
* Don't reset the flag if there is no error.
|
|
*/
|
|
static int
|
|
datepart(const char *buf, int size, int min, int max, int *errp) {
|
|
int result = 0;
|
|
int i;
|
|
|
|
for (i = 0; i < size; i++) {
|
|
if (!isdigit((unsigned char)(buf[i])))
|
|
*errp = 1;
|
|
result = (result * 10) + buf[i] - '0';
|
|
}
|
|
if (result < min)
|
|
*errp = 1;
|
|
if (result > max)
|
|
*errp = 1;
|
|
return (result);
|
|
}
|
|
|
|
/*! \file */
|