From: Juergen Perlinger <perlinger@ntp.org>
Date: Sun, 2 Dec 2018 08:05:37 +0000 (+0100)
Subject: [Bug 3555] Tidy up print alignment of debug output from ntpdate
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de33d7b9864ad35eaad6249b3be4a97f72750cb3;p=thirdparty%2Fntp.git

[Bug 3555] Tidy up print alignment of debug output from ntpdate

bk: 5c039251Qry1l2r_98AsRmF_9_TiEg
---

diff --git a/ChangeLog b/ChangeLog
index f381a093c..7139125c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+---
+* [Bug 3555] Tidy up print alignment of debug output from ntpdate <perlinger@ntp.org>
+  - applied patch by Gerry Garvey
+
 ---
 (4.2.8p12) 2018/08/14 Released by Harlan Stenn <stenn@ntp.org>
 
diff --git a/ntpdate/ntpdate.c b/ntpdate/ntpdate.c
index 03d9552dd..4cf0f6265 100644
--- a/ntpdate/ntpdate.c
+++ b/ntpdate/ntpdate.c
@@ -2176,10 +2176,11 @@ print_server(
 			str, fptoa((s_fp)pp->rootdelay, 6),
 			ufptoa(pp->rootdisp, 6));
 
-	(void) fprintf(fp, "transmitted %d, in filter %d\n",
+	if (pp->xmtcnt != pp->filter_nextpt)
+		(void) fprintf(fp, "transmitted %d, in filter %d\n",
 			   pp->xmtcnt, pp->filter_nextpt);
 
-	(void) fprintf(fp, "reference time:    %s\n",
+	(void) fprintf(fp, "reference time:      %s\n",
 			   prettydate(&pp->reftime));
 	(void) fprintf(fp, "originate timestamp: %s\n",
 			   prettydate(&pp->org));
@@ -2189,22 +2190,24 @@ print_server(
 	if (sys_samples > 1) {
 		(void) fprintf(fp, "filter delay: ");
 		for (i = 0; i < NTP_SHIFT; i++) {
-			(void) fprintf(fp, " %-8.8s", fptoa(pp->filter_delay[i], 5));
-			if (i == (NTP_SHIFT>>1)-1)
-				(void) fprintf(fp, "\n        ");
+			if (i == (NTP_SHIFT>>1))
+				(void) fprintf(fp, "\n              ");
+			(void) fprintf(fp, " %-10.10s", 
+				(i<sys_samples ? fptoa(pp->filter_delay[i], 5) : "----"));
 		}
 		(void) fprintf(fp, "\n");
 
 		(void) fprintf(fp, "filter offset:");
 		for (i = 0; i < PEER_SHIFT; i++) {
-			(void) fprintf(fp, " %-8.8s", lfptoa(&pp->filter_offset[i], 6));
-			if (i == (PEER_SHIFT>>1)-1)
-				(void) fprintf(fp, "\n        ");
+			if (i == (PEER_SHIFT>>1))
+				(void) fprintf(fp, "\n              ");
+			(void) fprintf(fp, " %-10.10s", 
+				(i<sys_samples ? lfptoa(&pp->filter_offset[i], 6): "----"));
 		}
 		(void) fprintf(fp, "\n");
 	}
 
-	(void) fprintf(fp, "delay %s, dispersion %s\n",
+	(void) fprintf(fp, "delay %s, dispersion %s, ",
 			   fptoa((s_fp)pp->delay, 5), ufptoa(pp->dispersion, 5));
 
 	(void) fprintf(fp, "offset %s\n\n",