mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-22 10:50:07 +00:00
b43b13ac25
1999-12-03 Andreas Jaeger <aj@suse.de> * nss/getXXbyYY.c: Include <resolv.h> (FUNCTION_NAME): Use res_ninit instead of res_init. * nss/getXXbyYY_r.c [NEED__RES]: Include <resolv.h> for _res declaration and prototypes. Remove extra _res declaration. (INTERNAL): Use thread aware res_ninit function. * inet/gethstbyad_r.c: Include <resolv.h>. * resolv/res_data.c: Update from Bind 8.2.2-P5. Moved res_init to res_libc.c. Disabled unneeded functions. * resolv/res_libc.c: New file. * Versions.def: Add version GLIBC_2.2 for libpthread. Add versions GLIBC_2.1 and GLIBC_2.2 for libresolv. * include/resolv.h: Add internal interfaces. * resolv/Makefile (routines): Add new files. (libresolv-routines): Likewise. (distribute): Likewise. * resolv/gethnamaddr.c: Use thread safe resolver functions. * resolv/nss_dns/dns-host.c: Likewise. * resolv/nss_dns/dns-network.c: Likewise. * resolv/arpa/nameser.h: Update from Bind 8.2.2-P5. * resolv/nsap_addr.c: Likewise. * resolv/res_comp.c: Likewise. * resolv/res_debug.c: Likewise. * resolv/res_init.c: Likewise. * resolv/res_mkquery.c: Likewise. * resolv/res_query.c: Likewise. * resolv/res_send.c: Likewise. * resolv/resolv.h: Likewise. * resolv/Versions: Add __res_state and __res_ninit with version GLIBC_2.2 to libc. Add new interfaces with version GLIBC_2.2 to libresolv. * resolv/Banner: Update. * include/arpa/nameser_compat.h: New file. * resolv/ns_name.c: New file from Bind 8.2.2-P5. * resolv/ns_netint.c: Likewise. * resolv/ns_parse.c: Likewise. * resolv/ns_print.c: Likewise. * resolv/ns_samedomain.c: Likewise. * resolv/ns_ttl.c: Likewise. * resolv/arpa/nameser_compat.h: Likewise. * resolv/res_debug.h: Likewise. Some patches are based on work done by Adam D. Bradley <artdodge@cs.bu.edu>. * sysdeps/unix/sysv/linux/configure.in: Remove check for ldconfig, set always use_ldconfig instead.
155 lines
3.0 KiB
C
155 lines
3.0 KiB
C
/*
|
|
* Copyright (c) 1996,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 INTERNET SOFTWARE CONSORTIUM DISCLAIMS
|
|
* ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
|
|
* OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
|
|
* CONSORTIUM 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.
|
|
*/
|
|
|
|
#ifndef lint
|
|
static const char rcsid[] = "$Id$";
|
|
#endif
|
|
|
|
/* Import. */
|
|
#include <arpa/nameser.h>
|
|
|
|
#include <ctype.h>
|
|
#include <errno.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
|
|
#ifdef SPRINTF_CHAR
|
|
# define SPRINTF(x) strlen(sprintf/**/x)
|
|
#else
|
|
# define SPRINTF(x) ((size_t)sprintf x)
|
|
#endif
|
|
|
|
/* Forward. */
|
|
|
|
static int fmt1(int t, char s, char **buf, size_t *buflen);
|
|
|
|
/* Macros. */
|
|
|
|
#define T(x) if ((x) < 0) return (-1); else (void)NULL
|
|
|
|
/* Public. */
|
|
|
|
int
|
|
ns_format_ttl(u_long src, char *dst, size_t dstlen) {
|
|
char *odst = dst;
|
|
int secs, mins, hours, days, weeks, x;
|
|
char *p;
|
|
|
|
secs = src % 60; src /= 60;
|
|
mins = src % 60; src /= 60;
|
|
hours = src % 24; src /= 24;
|
|
days = src % 7; src /= 7;
|
|
weeks = src; src = 0;
|
|
|
|
x = 0;
|
|
if (weeks) {
|
|
T(fmt1(weeks, 'W', &dst, &dstlen));
|
|
x++;
|
|
}
|
|
if (days) {
|
|
T(fmt1(days, 'D', &dst, &dstlen));
|
|
x++;
|
|
}
|
|
if (hours) {
|
|
T(fmt1(hours, 'H', &dst, &dstlen));
|
|
x++;
|
|
}
|
|
if (mins) {
|
|
T(fmt1(mins, 'M', &dst, &dstlen));
|
|
x++;
|
|
}
|
|
if (secs || !(weeks || days || hours || mins)) {
|
|
T(fmt1(secs, 'S', &dst, &dstlen));
|
|
x++;
|
|
}
|
|
|
|
if (x > 1) {
|
|
int ch;
|
|
|
|
for (p = odst; (ch = *p) != '\0'; p++)
|
|
if (isascii(ch) && isupper(ch))
|
|
*p = tolower(ch);
|
|
}
|
|
|
|
return (dst - odst);
|
|
}
|
|
|
|
int
|
|
ns_parse_ttl(const char *src, u_long *dst) {
|
|
u_long ttl, tmp;
|
|
int ch, digits, dirty;
|
|
|
|
ttl = 0;
|
|
tmp = 0;
|
|
digits = 0;
|
|
dirty = 0;
|
|
while ((ch = *src++) != '\0') {
|
|
if (!isascii(ch) || !isprint(ch))
|
|
goto einval;
|
|
if (isdigit(ch)) {
|
|
tmp *= 10;
|
|
tmp += (ch - '0');
|
|
digits++;
|
|
continue;
|
|
}
|
|
if (digits == 0)
|
|
goto einval;
|
|
if (islower(ch))
|
|
ch = toupper(ch);
|
|
switch (ch) {
|
|
case 'W': tmp *= 7;
|
|
case 'D': tmp *= 24;
|
|
case 'H': tmp *= 60;
|
|
case 'M': tmp *= 60;
|
|
case 'S': break;
|
|
default: goto einval;
|
|
}
|
|
ttl += tmp;
|
|
tmp = 0;
|
|
digits = 0;
|
|
dirty = 1;
|
|
}
|
|
if (digits > 0) {
|
|
if (dirty)
|
|
goto einval;
|
|
else
|
|
ttl += tmp;
|
|
}
|
|
*dst = ttl;
|
|
return (0);
|
|
|
|
einval:
|
|
__set_errno (EINVAL);
|
|
return (-1);
|
|
}
|
|
|
|
/* Private. */
|
|
|
|
static int
|
|
fmt1(int t, char s, char **buf, size_t *buflen) {
|
|
char tmp[50];
|
|
size_t len;
|
|
|
|
len = SPRINTF((tmp, "%d%c", t, s));
|
|
if (len + 1 > *buflen)
|
|
return (-1);
|
|
strcpy(*buf, tmp);
|
|
*buf += len;
|
|
*buflen -= len;
|
|
return (0);
|
|
}
|