drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* 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.
This commit is contained in:
Corinna Vinschen 2014-07-07 08:40:31 +00:00
parent e61375e471
commit f0c23915ec
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,11 @@
2014-07-07 Pierre Humblet <Pierre.Humblet@ieee.org>
Corinna Vinschen <corinna@vinschen.de>
* 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.
2014-07-03 Corinna Vinschen <corinna@vinschen.de> 2014-07-03 Corinna Vinschen <corinna@vinschen.de>
* fhandler_disk_file.cc (fhandler_disk_file::fstatvfs): Add debug * fhandler_disk_file.cc (fhandler_disk_file::fstatvfs): Add debug

7
winsup/cygwin/libc/minires.c
View File

@ -26,7 +26,7 @@ void minires_dprintf(const char * format, ...)
va_list args; va_list args;
va_start(args, format); va_start(args, format);
fprintf(stderr, "Minires: "); fprintf(stderr, "Resolv: ");
vfprintf(stderr, format, args); vfprintf(stderr, format, args);
va_end(args); va_end(args);
} }
@ -726,6 +726,9 @@ int res_nquerydomain( res_state statp, const char * Name, const char * DomName,
char fqdn[MAXDNAME], *ptr; char fqdn[MAXDNAME], *ptr;
size_t nlen; size_t nlen;
DPRINTF(statp->options & RES_DEBUG, "querydomain \"%s\" \"%s\" type %d\n",
Name, DomName, Type);
if (!DomName) if (!DomName)
ptr = (char *) Name; ptr = (char *) Name;
else if ((nlen = strlen(Name)) >= sizeof(fqdn) - 1) 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); strcpy(fqdn, Name);
ptr = &fqdn[nlen]; ptr = &fqdn[nlen];
if (nlen && *(ptr - 1) != '.') if (nlen && *(ptr - 1) != '.')
*(ptr++ - 1) = '.'; *ptr++ = '.';
fqdn[sizeof(fqdn) - 1] = 0; fqdn[sizeof(fqdn) - 1] = 0;
strncpy(ptr, DomName, sizeof(fqdn) - (ptr - fqdn)); strncpy(ptr, DomName, sizeof(fqdn) - (ptr - fqdn));
if (fqdn[sizeof(fqdn) - 1]) if (fqdn[sizeof(fqdn) - 1])