xntp 3.4e from Dave Mills @ UDel

3 files changed, 56 insertions, 41 deletions

diff --git a/usr.sbin/xntpd/parse/util/dcfd.c b/usr.sbin/xntpd/parse/util/dcfd.c
index 23934a8..3f04a55 100644
--- a/usr.sbin/xntpd/parse/util/dcfd.c
+++ b/usr.sbin/xntpd/parse/util/dcfd.c
@@ -1,7 +1,7 @@
 /*
- * /src/NTP/REPOSITORY/v3/parse/util/dcfd.c,v 3.15 1994/01/25 19:05:42 kardel Exp
+ * /src/NTP/REPOSITORY/v3/parse/util/dcfd.c,v 3.18 1994/05/12 12:49:23 kardel Exp
  *  
- * dcfd.c,v 3.15 1994/01/25 19:05:42 kardel Exp
+ * dcfd.c,v 3.18 1994/05/12 12:49:23 kardel Exp
  *
  * DCF77 100/200ms pulse synchronisation daemon program (via 50Baud serial line)
  *
@@ -703,6 +703,11 @@ static unsigned long cvt_rawdcf(buffer, size, clock)
    * if everything went well so far return the result of the symbolic
    * conversion routine else just the accumulated errors
    */
+  if (rtc != CVT_NONE) 
+    {
+      PRINTF("%-30s", "*** BAD DATA");
+    }
+
   return (rtc == CVT_NONE) ? convert_rawdcf(buffer, size, clock) : rtc;
 }
 
@@ -864,9 +869,9 @@ static char * pr_timeval(val)
   static char buf[20];
 
   if (val->tv_sec == 0)
-    sprintf(buf, "%c0.%06d", (val->tv_usec < 0) ? '-' : '+', abs(val->tv_usec));
+    sprintf(buf, "%c0.%06ld", (val->tv_usec < 0) ? '-' : '+', (long int)abs(val->tv_usec));
   else
-    sprintf(buf, "%d.%06d", val->tv_sec, abs(val->tv_usec));
+    sprintf(buf, "%ld.%06ld", (long int)val->tv_sec, (long int)abs(val->tv_usec));
   return buf;
 }
 
@@ -912,7 +917,7 @@ static void adj_time(offset)
   time_offset.tv_sec  = offset / 1000000;
   time_offset.tv_usec = offset % 1000000;
 
-  LPRINTF("adj_time: %d us ", offset);
+  LPRINTF("adj_time: %ld us ", (long int)offset);
   if (adjtime(&time_offset, 0L) == -1)
     perror("adjtime()");
 }
@@ -937,7 +942,7 @@ static void read_drift(drift_file)
       drift_comp = idrift << USECSCALE;
       fdrift     = (fdrift << USECSCALE) / 1000;
       drift_comp += fdrift & (1<<USECSCALE);
-      LPRINTF("read_drift: drift_comp %d ", drift_comp);
+      LPRINTF("read_drift: drift_comp %ld ", (long int)drift_comp);
     }
 }
 
@@ -957,11 +962,11 @@ static void update_drift(drift_file, offset, reftime)
       int idrift = R_SHIFT(drift_comp, USECSCALE);
       int fdrift = drift_comp & ((1<<USECSCALE)-1);
 
-      LPRINTF("update_drift: drift_comp %d ", drift_comp);
+      LPRINTF("update_drift: drift_comp %ld ", (long int)drift_comp);
       fdrift = (fdrift * 1000) / (1<<USECSCALE);
-      fprintf(df, "%4d.%03d %c%d.%06d %.24s\n", idrift, fdrift,
-	      (offset < 0) ? '-' : '+', abs(offset) / 1000000, abs(offset) % 1000000,
-	      asctime(localtime(&reftime)));
+      fprintf(df, "%4d.%03d %c%ld.%06ld %.24s\n", idrift, fdrift,
+	      (offset < 0) ? '-' : '+', (long int)(abs(offset) / 1000000),
+	      (long int)(abs(offset) % 1000000), asctime(localtime(&reftime)));
       fclose(df);
       LPRINTF("update_drift: %d.%03d ppm ", idrift, fdrift);
     }
@@ -1023,8 +1028,9 @@ static void adjust_clock(offset, drift_file, reftime)
       drift_comp = -MAX_DRIFT;
 
   update_drift(drift_file, usecoffset, reftime);
-  LPRINTF("clock_adjust: %s, clock_adjust %d, drift_comp %d(%d) ",
-		  pr_timeval(offset), R_SHIFT(clock_adjust, USECSCALE) , R_SHIFT(drift_comp, USECSCALE), drift_comp);
+  LPRINTF("clock_adjust: %s, clock_adjust %ld, drift_comp %ld(%ld) ",
+	  pr_timeval(offset),(long int) R_SHIFT(clock_adjust, USECSCALE),
+	  (long int)R_SHIFT(drift_comp, USECSCALE), (long int)drift_comp);
 }
 
 /*-----------------------------------------------------------------------
@@ -1303,8 +1309,8 @@ main(argc, argv)
 
       memset(term.c_cc, 0, sizeof(term.c_cc));
       term.c_cc[VMIN] = 1;
-      term.c_cflag = B50|CS8|CREAD|CLOCAL;
-      term.c_iflag = 0;
+      term.c_cflag = B50|CS8|CREAD|CLOCAL|PARENB;
+      term.c_iflag = IGNPAR;
       term.c_oflag = 0;
       term.c_lflag = 0;
 
@@ -1369,7 +1375,7 @@ main(argc, argv)
       (void) alarm(1<<ADJINTERVAL);
 #endif
 
-      PRINTF("  DCF77 monitor - Copyright 1993, Frank Kardel\n\n");
+      PRINTF("  DCF77 monitor - Copyright 1993,1994, Frank Kardel\n\n");
 
       pbuf[60] = '\0';
       for ( i = 0; i < 60; i++)
@@ -1423,6 +1429,12 @@ main(argc, argv)
 			}
 		      errs++;
 		    }
+		  else
+		    if (trace)
+		      {
+			PRINTF("\r  %.*s ", 59 - offset, &buf[offset]);
+		      }
+
 
 		  buf[0] = c;
 
@@ -1491,11 +1503,6 @@ main(argc, argv)
 
 	      if (rtc == CVT_OK)
 		{
-		  if (trace && (i == 0))
-		    {
-		      PRINTF("\r  %.*s ", 59 - offset, &buf[offset]);
-		    }
-
 		  if (i == 0)
 		    {
 		      /*
diff --git a/usr.sbin/xntpd/parse/util/parsetest.c b/usr.sbin/xntpd/parse/util/parsetest.c
index 21e4128..7fa62a9 100644
--- a/usr.sbin/xntpd/parse/util/parsetest.c
+++ b/usr.sbin/xntpd/parse/util/parsetest.c
@@ -1,7 +1,7 @@
 /*
- * /src/NTP/REPOSITORY/v3/parse/util/parsetest.c,v 3.13 1994/02/20 13:04:46 kardel Exp
+ * /src/NTP/REPOSITORY/v3/parse/util/parsetest.c,v 3.14 1994/05/12 12:49:27 kardel Exp
  *
- * parsetest.c,v 3.13 1994/02/20 13:04:46 kardel Exp
+ * parsetest.c,v 3.14 1994/05/12 12:49:27 kardel Exp
  *
  * Copyright (c) 1989,1990,1991,1992,1993,1994
  * Frank Kardel Friedrich-Alexander Universitaet Erlangen-Nuernberg
@@ -10,7 +10,13 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- * parsetest.c,v
+ * $Log: parsetest.c,v $
+ * Revision 3.14  1994/05/12  12:49:27  kardel
+ * printf fmt/arg cleanup
+ *
+ * Revision 3.14  1994/05/11  09:25:43  kardel
+ * 3.3r + printf fmt/arg fixes
+ *
  * Revision 3.13  1994/02/20  13:04:46  kardel
  * parse add/delete second support
  *
@@ -59,7 +65,8 @@ static char *strstatus(buffer, state)
       { PARSEB_NOSYNC,   "TIME CODE NOT CONFIRMED" },
       { PARSEB_DST,      "DST" },
       { PARSEB_UTC,      "UTC DISPLAY" },
-      { PARSEB_LEAP,     "LEAP WARNING" },
+      { PARSEB_LEAPADD,  "LEAP ADDITION WARNING" },
+      { PARSEB_LEAPDEL,  "LEAP DELETION WARNING" },
       { PARSEB_LEAPSECOND, "LEAP SECOND" },
       { PARSEB_ALTERNATE,"ALTERNATE ANTENNA" },
       { PARSEB_TIMECODE, "TIME CODE" },
@@ -194,7 +201,7 @@ main(argc, argv)
 	  parsetime_t parsetime;
 	  struct strioctl strioc;
 	  
-	  printf("parsetest.c,v 3.13 1994/02/20 13:04:46 kardel Exp\n");
+	  printf("parsetest.c,v 3.11 1994/01/23 19:00:01 kardel Exp\n");
 	  
 	  while (ioctl(fd, I_POP, 0) == 0)
 	    ;
@@ -215,7 +222,7 @@ main(argc, argv)
 	      perror("ioctl(fd, I_STR(PARSEIOC_GETSTAT))");
 	      exit(1);
 	    }
-	  printf("parse status: %04x\n", dct.parsestatus.flags);
+	  printf("parse status: %04lx\n", (unsigned long)dct.parsestatus.flags);
 
 	  dct.parsestatus.flags |= PARSE_STAT_FILTER;
 	  strioc.ic_cmd = PARSEIOC_SETSTAT;
@@ -232,7 +239,7 @@ main(argc, argv)
 	      perror("ioctl(fd, I_STR(PARSEIOC_GETSTAT))");
 	      exit(1);
 	    }
-	  printf("parse status: %04x\n", dct.parsestatus.flags);
+	  printf("parse status: %04lx\n", (unsigned long)dct.parsestatus.flags);
 
 	  while (read(fd, &parsetime, sizeof(parsetime)) == sizeof(parsetime))
 	    {
@@ -245,15 +252,16 @@ main(argc, argv)
 	      tmp1[24] = '\0';
 	      tmp2[24] = '\0';
 
-	      printf("%s (+%06dus) %s PPS: %s (+%06dus), ", tmp1, parsetime.parse_stime.tv.tv_usec, tmp, tmp2, parsetime.parse_ptime.tv.tv_usec);
+	      printf("%s (+%06ldus) %s PPS: %s (+%06ldus), ", tmp1, (long int)parsetime.parse_stime.tv.tv_usec, tmp, tmp2,
+		     (long int)parsetime.parse_ptime.tv.tv_usec);
 
 	      strstatus(tmp, parsetime.parse_state);
-	      printf("state: 0x%x (%s) error: %dus, dispersion: %dus, Status: 0x%x (%s)\n",
-		     parsetime.parse_state,
+	      printf("state: 0x%lx (%s) error: %ldus, dispersion: %ldus, Status: 0x%lx (%s)\n",
+		     (unsigned long)parsetime.parse_state,
 		     tmp,
-		     parsetime.parse_usecerror,
-		     parsetime.parse_usecdisp,
-		     parsetime.parse_status,
+		     (long)parsetime.parse_usecerror,
+		     (long)parsetime.parse_usecdisp,
+		     (unsigned long)parsetime.parse_status,
 		     parsestatus(parsetime.parse_status, tmp1));
 	    }
 	  
diff --git a/usr.sbin/xntpd/parse/util/testdcf.c b/usr.sbin/xntpd/parse/util/testdcf.c
index 560ab27..73c8d89 100644
--- a/usr.sbin/xntpd/parse/util/testdcf.c
+++ b/usr.sbin/xntpd/parse/util/testdcf.c
@@ -1,7 +1,7 @@
 /*
- * /src/NTP/REPOSITORY/v3/parse/util/testdcf.c,v 3.11 1994/02/02 17:45:55 kardel Exp
+ * /src/NTP/REPOSITORY/v3/parse/util/testdcf.c,v 3.13 1994/05/12 12:49:31 kardel Exp
  *  
- * testdcf.c,v 3.11 1994/02/02 17:45:55 kardel Exp
+ * testdcf.c,v 3.13 1994/05/12 12:49:31 kardel Exp
  *
  * simple DCF77 100/200ms pulse test program (via 50Baud serial line)
  *
@@ -354,8 +354,8 @@ main(argc, argv)
 
 	  memset(term.c_cc, 0, sizeof(term.c_cc));
 	  term.c_cc[VMIN] = 1;
-	  term.c_cflag = B50|CS8|CREAD|CLOCAL;
-	  term.c_iflag = 0;
+	  term.c_cflag = B50|CS8|CREAD|CLOCAL|PARENB;
+	  term.c_iflag = IGNPAR;
 	  term.c_oflag = 0;
 	  term.c_lflag = 0;
 
@@ -411,8 +411,8 @@ main(argc, argv)
 		}
 
 	      if (t.tv_sec > 1 ||
-		  t.tv_sec == 1 &&
-		  t.tv_usec > 500000)
+		  (t.tv_sec == 1 &&
+		   t.tv_usec > 500000))
 		{
 	          printf("%c %.*s ", pat[i % (sizeof(pat)-1)], 59 - offset, &buf[offset]);
 
@@ -453,8 +453,8 @@ main(argc, argv)
 		{
 		  printf("%s, %2d:%02d:%02d, %d.%02d.%02d, <%s%s%s%s>",
 			wday[clock.wday],
-			clock.hour, clock.minute, i, clock.day, clock.month,
-			clock.year,
+			(int)clock.hour, (int)clock.minute, (int)i, (int)clock.day, (int)clock.month,
+			(int)clock.year,
 			(clock.flags & DCFB_ALTERNATE) ? "R" : "_",
 			(clock.flags & DCFB_ANNOUNCE) ? "A" : "_",
 			(clock.flags & DCFB_DST) ? "D" : "_",