From f0c23915ec2131b2867f04fe3e117807973a2aa1 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Mon, 7 Jul 2014 08:40:31 +0000 Subject: * libc/minires.c (minires_dprintf): Change "Minires" to "Resolv" to differ from external minres lib. (res_nquerydomain): Fix off-by-one in domain concatenation. Add debug output. --- winsup/cygwin/libc/minires.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'winsup/cygwin/libc') diff --git a/winsup/cygwin/libc/minires.c b/winsup/cygwin/libc/minires.c index b25c927c9..acd493e38 100644 --- a/winsup/cygwin/libc/minires.c +++ b/winsup/cygwin/libc/minires.c @@ -26,7 +26,7 @@ void minires_dprintf(const char * format, ...) va_list args; va_start(args, format); - fprintf(stderr, "Minires: "); + fprintf(stderr, "Resolv: "); vfprintf(stderr, format, args); va_end(args); } @@ -726,6 +726,9 @@ int res_nquerydomain( res_state statp, const char * Name, const char * DomName, char fqdn[MAXDNAME], *ptr; size_t nlen; + DPRINTF(statp->options & RES_DEBUG, "querydomain \"%s\" \"%s\" type %d\n", + Name, DomName, Type); + if (!DomName) ptr = (char *) Name; else if ((nlen = strlen(Name)) >= sizeof(fqdn) - 1) @@ -734,7 +737,7 @@ int res_nquerydomain( res_state statp, const char * Name, const char * DomName, strcpy(fqdn, Name); ptr = &fqdn[nlen]; if (nlen && *(ptr - 1) != '.') - *(ptr++ - 1) = '.'; + *ptr++ = '.'; fqdn[sizeof(fqdn) - 1] = 0; strncpy(ptr, DomName, sizeof(fqdn) - (ptr - fqdn)); if (fqdn[sizeof(fqdn) - 1]) -- cgit v1.2.3