From: Daniel Salzman <daniel.salzman@nic.cz>
Date: Wed, 2 Jan 2019 11:10:24 +0000 (+0100)
Subject: kdig: remove boring newlines between retries
X-Git-Tag: v2.8.0~126
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=60fb34000fe2ccbecf3fd40eee85e9a46900a1b3;p=thirdparty%2Fknot-dns.git

kdig: remove boring newlines between retries
---

diff --git a/src/utils/kdig/kdig_exec.c b/src/utils/kdig/kdig_exec.c
index 0cdffe265e..2e4c066bd6 100644
--- a/src/utils/kdig/kdig_exec.c
+++ b/src/utils/kdig/kdig_exec.c
@@ -827,7 +827,7 @@ static void process_query(const query_t *query)
 				// If error try next resolved address.
 				if (ret != 0) {
 					net.srv = (net.srv)->ai_next;
-					if (net.srv != NULL) {
+					if (net.srv != NULL && query->style.show_query) {
 						printf("\n");
 					}
 
@@ -846,10 +846,13 @@ static void process_query(const query_t *query)
 			}
 
 			if (i < query->retries) {
-				printf("\n");
 				DBG("retrying server %s@%s(%s)\n",
 				    remote->name, remote->service,
 				    get_sockname(socktype));
+
+				if (query->style.show_query) {
+					printf("\n");
+				}
 			}
 
 			net_clean(&net);
@@ -859,7 +862,7 @@ static void process_query(const query_t *query)
 		     remote->name, remote->service, get_sockname(socktype));
 
 		// If not last server, print separation.
-		if (server->next->next) {
+		if (server->next->next && query->style.show_query) {
 			printf("\n");
 		}
 	}