From: ian <ian>
Date: Tue, 11 Apr 2000 21:15:39 +0000 (+0000)
Subject: @@ -14,6 +14,7 @@
X-Git-Tag: wip.base.getaddrinfo~176
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=3b94f31a107140c22866dff8f7b1a8ac00f106d6;p=adns.git

@@ -14,6 +14,7 @@
   Portability fixes:
+  * adnslogres: do not call equivalent of printf("%.*s",0,(char*)0).
---

diff --git a/changelog b/changelog
index e1e36c7..10a9174 100644
--- a/changelog
+++ b/changelog
@@ -14,6 +14,7 @@ uadns (0.8) BETA; urgency=low
 
   Portability fixes:
   * install-sh (from autoconf 2.12 Debian r13) included.
+  * adnslogres: do not call equivalent of printf("%.*s",0,(char*)0).
 
   Documentation improvements:
   * Security/performance note added, about local nameservers and DNSSEC.
diff --git a/client/adnslogres.c b/client/adnslogres.c
index be6a115..c685bfa 100644
--- a/client/adnslogres.c
+++ b/client/adnslogres.c
@@ -31,7 +31,7 @@
  */
 
 static const char * const cvsid =
-	"$Id: adnslogres.c,v 1.9 2000/03/20 01:50:08 ian Exp $";
+	"$Id: adnslogres.c,v 1.10 2000/04/11 21:15:39 ian Exp $";
 
 #include <sys/types.h>
 #include <sys/time.h>
@@ -58,6 +58,7 @@ static const char * const cvsid =
 static const char *progname;
 
 #define msg(fmt, args...) fprintf(stderr, "%s: " fmt "\n", progname, ##args)
+#define guard_null(str) ((str) ? (str) : "")
 
 #define sensible_ctype(type,ch) (type((unsigned char)(ch)))
   /* isfoo() functions from ctype.h can't safely be fed char - blech ! */
@@ -133,7 +134,7 @@ static logline *readline(FILE *inf, adns_state adns, int opts) {
     strcpy(line->start, buf);
     str= ipaddr2domain(line->start, &line->addr, &line->rest);
     if (opts & OPT_DEBUG)
-      msg("submitting %.*s -> %s", line->rest-line->addr, line->addr, str);
+      msg("submitting %.*s -> %s", line->rest-line->addr, guard_null(line->addr), str);
     if (adns_submit(adns, str, adns_r_ptr,
 		    adns_qf_quoteok_cname|adns_qf_cname_loose,
 		    NULL, &line->query))
@@ -158,7 +159,7 @@ static void proclog(FILE *inf, FILE *outf, int opts) {
   while (head) {
     if (opts & OPT_DEBUG)
       msg("%d in queue; checking %.*s", len,
-	  head->rest-head->addr, head->addr);
+	  head->rest-head->addr, guard_null(head->addr));
     if (eof || len > MAXPENDING)
       if (opts & OPT_POLL)
 	err= adns_wait_poll(adns, &head->query, &answer, NULL);