Remove trailing whitespace.

12 files changed, 268 insertions, 262 deletions

diff --git a/usr.sbin/xntpd/parse/clk_dcf7000.c b/usr.sbin/xntpd/parse/clk_dcf7000.c
index 208e529..82e7915 100644
--- a/usr.sbin/xntpd/parse/clk_dcf7000.c
+++ b/usr.sbin/xntpd/parse/clk_dcf7000.c
@@ -1,14 +1,14 @@
 #if defined(REFCLOCK) && (defined(PARSE) || defined(PARSEPPS)) && defined(CLOCK_DCF7000)
 /*
  * /src/NTP/REPOSITORY/v3/parse/clk_dcf7000.c,v 3.12 1994/05/30 10:19:57 kardel Exp
- *  
+ *
  * clk_dcf7000.c,v 3.12 1994/05/30 10:19:57 kardel Exp
  *
  * ELV DCF7000 module
  *
  * Copyright (c) 1992,1993,1994
  * Frank Kardel Friedrich-Alexander Universitaet Erlangen-Nuernberg
- *                                    
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -33,7 +33,7 @@ static struct format dcf7000_fmt =
   },
   "  -  -  -  -  -  -  -  \r",
   0
-};    
+};
 
 static u_long cvt_dcf7000();
 
@@ -92,7 +92,7 @@ cvt_dcf7000(buffer, size, format, clock)
 	{
 	  char *f = &buffer[format->field_offsets[O_FLAGS].offset];
 	  long flags;
-	  
+
 	  clock->flags = 0;
 	  clock->usecond = 0;
 
diff --git a/usr.sbin/xntpd/parse/clk_meinberg.c b/usr.sbin/xntpd/parse/clk_meinberg.c
index 6e3b224..10389cf 100644
--- a/usr.sbin/xntpd/parse/clk_meinberg.c
+++ b/usr.sbin/xntpd/parse/clk_meinberg.c
@@ -1,14 +1,14 @@
 #if defined(REFCLOCK) && (defined(PARSE) || defined(PARSEPPS)) && defined(CLOCK_MEINBERG)
 /*
  * /src/NTP/REPOSITORY/v3/parse/clk_meinberg.c,v 3.15 1994/05/30 10:19:59 kardel Exp
- *  
+ *
  * clk_meinberg.c,v 3.15 1994/05/30 10:19:59 kardel Exp
  *
  * Meinberg clock support
  *
  * Copyright (c) 1992,1993,1994
  * Frank Kardel Friedrich-Alexander Universitaet Erlangen-Nuernberg
- *                                    
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -27,7 +27,7 @@
 /*
  * The Meinberg receiver every second sends a datagram of the following form
  * (Standard Format)
- * 
+ *
  *     <STX>D:<dd>.<mm>.<yy>;T:<w>;U:<hh>:<mm>:<ss>;<S><F><D><A><ETX>
  * pos:  0  00 00 0 00 0 11 111 1 111 12 2 22 2 22 2 2  2  3  3   3
  *       1  23 45 6 78 9 01 234 5 678 90 1 23 4 56 7 8  9  0  1   2
@@ -85,7 +85,7 @@
  *        123456789012345678901234567890123456789012345678901234567890123456
  *     \x0209.07.93; 5; 08:48:26; +00:00;        ; 49.5736N  11.0280E  373m\x03
  *
- * 
+ *
  * <STX>           = '\002' ASCII start of text
  * <ETX>           = '\003' ASCII end of text
  * <dd>,<mm>,<yy>  = day, month, year(2 digits!!)
@@ -227,7 +227,7 @@ cvt_meinberg(buffer, size, format, clock)
       else
 	{
 	  char *f = &buffer[format->field_offsets[O_FLAGS].offset];
-	  
+
 	  clock->flags = 0;
 	  clock->usecond = 0;
 
@@ -260,22 +260,22 @@ cvt_meinberg(buffer, size, format, clock)
 		case ' ':
 		  clock->utcoffset = -1*60*60; /* MET */
 		  break;
-		  
+
 		case 'S':
 		  clock->utcoffset = -2*60*60; /* MED */
 		  break;
-		  
+
 		default:
 		  return CVT_FAIL|CVT_BADFMT;
 		}
 	    }
-	  
+
 	  /*
 	   * gather status flags
 	   */
 	  if (buffer[format->field_offsets[O_ZONE].offset] == 'S')
 	    clock->flags    |= PARSEB_DST;
-	  
+
 	  if (f[0] == '#')
 	    clock->flags |= PARSEB_POWERUP;
 
@@ -284,12 +284,12 @@ cvt_meinberg(buffer, size, format, clock)
 
 	  if (f[3] == '!')
 	    clock->flags |= PARSEB_ANNOUNCE;
-	  
+
 	  if (format->flags & MBG_EXTENDED)
 	    {
 	      clock->flags |= PARSEB_S_LEAP;
 	      clock->flags |= PARSEB_S_ANTENNA;
-	      
+
 	      /*
 	       * DCF77 does not encode the direction -
 	       * so we take the current default -
@@ -343,9 +343,9 @@ cvt_mgps(buffer, size, format, clock)
 	{
 	  long h;
 	  char *f = &buffer[format->field_offsets[O_FLAGS].offset];
-	  
+
 	  clock->flags = PARSEB_S_LEAP|PARSEB_S_POSITION;
-	      
+
 	  clock->usecond = 0;
 
 	  /*
@@ -371,23 +371,23 @@ cvt_mgps(buffer, size, format, clock)
 		  clock->utcoffset = -clock->utcoffset;
 		}
 	    }
-	  
+
 	  /*
 	   * gather status flags
 	   */
 	  if (buffer[format->field_offsets[O_ZONE].offset] == 'S')
 	    clock->flags    |= PARSEB_DST;
-	  
+
 	  if ((f[0] == 'U') ||
 	      (clock->utcoffset == 0))
 	    clock->flags |= PARSEB_UTC;
-	  
+
 	  /*
 	   * no sv's seen - no time & position
 	   */
 	  if (f[1] == '#')
 	    clock->flags |= PARSEB_POWERUP;
-	  
+
 	  /*
 	   * at least one sv seen - time (for last position)
 	   */
@@ -396,13 +396,13 @@ cvt_mgps(buffer, size, format, clock)
 	  else
 	    if (!(clock->flags & PARSEB_POWERUP))
 	      clock->flags |= PARSEB_POSITION;
-	  
+
 	  /*
 	   * oncoming zone switch
 	   */
 	  if (f[4] == '!')
 	    clock->flags |= PARSEB_ANNOUNCE;
-	  
+
 	  /*
 	   * oncoming leap second
 	   * data format does not (yet) specify whether
@@ -411,7 +411,7 @@ cvt_mgps(buffer, size, format, clock)
 	   */
 	  if (f[5] == 'A')
 	    clock->flags |= PARSEB_LEAPADD;
-	  
+
 	  /*
 	   * this is the leap second
 	   */
diff --git a/usr.sbin/xntpd/parse/clk_rawdcf.c b/usr.sbin/xntpd/parse/clk_rawdcf.c
index 296af9e..042e5d3 100644
--- a/usr.sbin/xntpd/parse/clk_rawdcf.c
+++ b/usr.sbin/xntpd/parse/clk_rawdcf.c
@@ -1,14 +1,14 @@
 #if defined(REFCLOCK) && (defined(PARSE) || defined(PARSEPPS)) && defined(CLOCK_RAWDCF)
 /*
  * /src/NTP/REPOSITORY/v3/parse/clk_rawdcf.c,v 3.16 1994/05/31 20:02:40 kardel Exp
- *  
+ *
  * clk_rawdcf.c,v 3.16 1994/05/31 20:02:40 kardel Exp
  *
  * Raw DCF77 pulse clock support
  *
  * Copyright (c) 1992,1993,1994
  * Frank Kardel Friedrich-Alexander Universitaet Erlangen-Nuernberg
- *                                    
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -106,13 +106,13 @@ static struct dcfparam
 {
   unsigned char onebits[60];
   unsigned char zerobits[60];
-} dcfparam = 
+} dcfparam =
 {
   "###############RADMLS1248124P124812P1248121241248112481248P", /* 'ONE' representation */
   "--------------------s-------p------p----------------------p"  /* 'ZERO' representation */
 };
 
-static struct rawdcfcode 
+static struct rawdcfcode
 {
   char offset;			/* start bit */
 } rawdcfcode[] =
@@ -166,7 +166,7 @@ static u_long ext_bf(buf, idx, zero)
   register int i, first;
 
   first = rawdcfcode[idx].offset;
-  
+
   for (i = rawdcfcode[idx+1].offset - 1; i >= first; i--)
     {
       sum <<= 1;
@@ -213,7 +213,7 @@ static u_long convert_rawdcf(buffer, size, dcfparam, clock)
 #endif
 	  return CVT_NONE;
     }
-  
+
   for (i = 0; i < 58; i++)
     {
       if ((*s != *b) && (*s != *c))
@@ -232,7 +232,7 @@ static u_long convert_rawdcf(buffer, size, dcfparam, clock)
       c++;
       s++;
     }
-  
+
   /*
    * check Start and Parity bits
    */
@@ -489,7 +489,7 @@ static u_long snt_rawdcf(parseio, ptime)
   clocktime_t clock;
   u_long cvtrtc;
   time_t t;
-  
+
   /*
    * start at last sample and add second index - gross, may have to be much more careful
    */
@@ -531,7 +531,7 @@ static u_long snt_rawdcf(parseio, ptime)
 /*
  * History:
  *
- * clk_rawdcf.c,v $ 
+ * clk_rawdcf.c,v $
  * Revision 3.16  1994/05/31  20:02:40  kardel
  * sync on ONE transition
  *
diff --git a/usr.sbin/xntpd/parse/clk_schmid.c b/usr.sbin/xntpd/parse/clk_schmid.c
index d15ba90..457a659 100644
--- a/usr.sbin/xntpd/parse/clk_schmid.c
+++ b/usr.sbin/xntpd/parse/clk_schmid.c
@@ -1,14 +1,14 @@
 #if defined(REFCLOCK) && (defined(PARSE) || defined(PARSEPPS)) && defined(CLOCK_SCHMID)
 /*
  * /src/NTP/REPOSITORY/v3/parse/clk_schmid.c,v 3.16 1994/05/30 10:20:03 kardel Exp
- *  
+ *
  * clk_schmid.c,v 3.16 1994/05/30 10:20:03 kardel Exp
  *
  * Schmid clock support
  *
  * Copyright (c) 1992,1993,1994
  * Frank Kardel Friedrich-Alexander Universitaet Erlangen-Nuernberg
- *                                    
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -30,7 +30,7 @@
  * The command to Schmid's DCF77 clock is a single byte; each bit
  * allows the user to select some part of the time string, as follows (the
  * output for the lsb is sent first).
- * 
+ *
  * Bit 0:	time in MEZ, 4 bytes *binary, not BCD*; hh.mm.ss.tenths
  * Bit 1:	date 3 bytes *binary, not BCD: dd.mm.yy
  * Bit 2:	week day, 1 byte (unused here)
@@ -128,7 +128,7 @@ cvt_schmid(buffer, size, format, clock)
 	      default:
 		return CVT_FAIL|CVT_BADFMT;
 	      }
-	  
+
 	    if (!(buffer[7] & WS_TIME))
 	      {
 		clock->flags |= PARSEB_POWERUP;
@@ -158,7 +158,7 @@ cvt_schmid(buffer, size, format, clock)
 	      }
 
 	    clock->flags |= PARSEB_S_LEAP|PARSEB_S_ANTENNA;
-	  
+
 	    return CVT_OK;
 	  }
     }
diff --git a/usr.sbin/xntpd/parse/clk_trimtsip.c b/usr.sbin/xntpd/parse/clk_trimtsip.c
index f622bea..422fac1 100644
--- a/usr.sbin/xntpd/parse/clk_trimtsip.c
+++ b/usr.sbin/xntpd/parse/clk_trimtsip.c
@@ -1,6 +1,6 @@
 #if defined(REFCLOCK) && (defined(PARSE) || defined(PARSEPPS)) && defined(CLOCK_TRIMTSIP)
 /*
- * $Header: /src/NTP/REPOSITORY/v3/parse/clk_trimble.c,v 3.9 1994/02/02 17:45:27 kardel Exp $
+ * $Header: /home/ncvs/src/usr.sbin/xntpd/parse/clk_trimtsip.c,v 1.1.1.1 1994/09/29 23:01:31 wollman Exp $
  *
  * Trimble TSIP support - CURRENTLY VERY MUCH UNDER CONSTRUCTION
  */
@@ -159,7 +159,7 @@ static unsigned LONG inp_tsip(parseio, ch, ctime)
 
   return (parseio->parse_index == parseio->parse_dsize-1); /* buffer full - attempt to parse (likely to fail) */
 }
-     
+
 #define GPSORIGIN	2524953600	/* NTP origin - GPS origin in seconds */
 #define SECSPERWEEK	604800	/* seconds per week - GPS tells us about weeks */
 #define L_UF_SCALE	4294967296.0	/* scale a float fraction to l_uf units */
@@ -227,7 +227,7 @@ cvt_trimtsip(buffer, size, format, clock, t)
   else
     {
       cmd = buffer[1];
-      
+
 #ifdef DEBUG
       if (debug > 1)
       switch(cmd)
@@ -323,7 +323,7 @@ cvt_trimtsip(buffer, size, format, clock, t)
 		{
 #ifdef DEBUG
 		  if (debug)
-		    printf("sv6+ seconds <= 0 (%e), setting POWERUP\n"); 
+		    printf("sv6+ seconds <= 0 (%e), setting POWERUP\n");
 #endif
 		  clock->flags = PARSEB_POWERUP;
 		  return CVT_OK;
@@ -341,10 +341,10 @@ cvt_trimtsip(buffer, size, format, clock, t)
 
 		if (t->t_leap == ADDSECOND)
 		    clock->flags |= PARSEB_LEAPADD;
-		      
+
 		if (t->t_leap == DELSECOND)
 		    clock->flags |= PARSEB_LEAPDEL;
-	
+
 		if (t->t_operable)
 		    clock->flags &= ~(PARSEB_NOSYNC|PARSEB_POWERUP);
 		else
@@ -467,5 +467,8 @@ getint(bp)
 /*
  * History:
  *
- * $Log: clk_trimble.c,v $
+ * $Log: clk_trimtsip.c,v $
+ * Revision 1.1.1.1  1994/09/29  23:01:31  wollman
+ * xntp 3.4e from Dave Mills @ UDel
+ *
  */
diff --git a/usr.sbin/xntpd/parse/parse.c b/usr.sbin/xntpd/parse/parse.c
index 16c7813..713d3e6 100644
--- a/usr.sbin/xntpd/parse/parse.c
+++ b/usr.sbin/xntpd/parse/parse.c
@@ -1,7 +1,7 @@
 #if defined(REFCLOCK) && (defined(PARSE) || defined(PARSEPPS))
 /*
  * /src/NTP/REPOSITORY/v3/parse/parse.c,v 3.27 1994/06/01 08:18:33 kardel Exp
- *  
+ *
  * parse.c,v 3.27 1994/06/01 08:18:33 kardel Exp
  *
  * Parser module for reference clock
@@ -14,7 +14,7 @@
  *
  * Copyright (c) 1992,1993,1994
  * Frank Kardel Friedrich-Alexander Universitaet Erlangen-Nuernberg
- *                                    
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -100,7 +100,7 @@ Strcmp(s, t)
 
   while (!(c = *s++ - *t++) && *s && *t)
     /* empty loop */;
-  
+
   return c;
 }
 
@@ -165,7 +165,7 @@ setup_bitmaps(parseio, low, high)
       parseprintf(DD_PARSE, ("setup_bitmaps: failed: bounds error (low=%d, high=%d, nformats=%d)\n", low, high, nformats));
       return 0;
     }
-  
+
   bzero(parseio->parse_startsym, sizeof (parseio->parse_startsym));
   bzero(parseio->parse_endsym, sizeof (parseio->parse_endsym));
   bzero(parseio->parse_syncsym, sizeof (parseio->parse_syncsym));
@@ -175,7 +175,7 @@ setup_bitmaps(parseio, low, high)
   parseio->parse_syncflags = 0;
   parseio->parse_timeout.tv_sec = 0;
   parseio->parse_timeout.tv_usec = 0;
-  
+
   /*
    * gather bitmaps of possible start and end values
    */
@@ -189,7 +189,7 @@ setup_bitmaps(parseio, low, high)
 	  parseio->parse_dsize = fmt->length;
 	continue;
       }
-      
+
       if (fmt->flags & F_START)
 	{
 	  index = fmt->startsym >> 3;
@@ -244,7 +244,7 @@ setup_bitmaps(parseio, low, high)
 	{
 	  parseio->parse_timeout = fmt->timeout;
 	}
-      
+
       if (parseio->parse_dsize < fmt->length)
 	parseio->parse_dsize = fmt->length;
     }
@@ -299,10 +299,10 @@ parse_ioinit(parseio)
   register parse_t *parseio;
 {
   parseprintf(DD_PARSE, ("parse_iostart\n"));
-  
+
   parseio->parse_plen = 0;
   parseio->parse_pdata = (void *)0;
-  
+
   if (!setup_bitmaps(parseio, 0, nformats))
     return 0;
 
@@ -323,7 +323,7 @@ parse_ioinit(parseio)
   parseio->parse_flags     = 0;		/* true samples */
   parseio->parse_index     = 0;
   parseio->parse_ldsize    = 0;
-  
+
   return 1;
 }
 
@@ -369,7 +369,7 @@ parse_ioread(parseio, ch, ctime)
     case PARSE_IO_CS7:
       ch &= 0x7F;
       break;
-      
+
     case PARSE_IO_CS8:
       break;
     }
@@ -388,7 +388,7 @@ parse_ioread(parseio, ch, ctime)
 	{
 	  if (clockformats[parseio->parse_lformat]->input(parseio, ch, ctime))
 	    updated = timepacket(parseio); /* got a datagram - process */
-	  
+
 	  low = high = 0;	/* all done - just post processing */
 	}
       else
@@ -430,7 +430,7 @@ parse_ioread(parseio, ch, ctime)
 		}
 	    }
 	}
-		
+
       if ((((parseio->parse_syncflags & SYNC_START) &&
 	    (parseio->parse_startsym[index] & mask)) ||
 	   (parseio->parse_index == 0)) ||
@@ -525,7 +525,7 @@ parse_ioread(parseio, ch, ctime)
     {
       updated = clockformats[parseio->parse_lformat]->synth(parseio, ctime);
     }
-  
+
   /*
    * remember last character time
    */
@@ -613,13 +613,13 @@ parse_to_unixtime(clock, cvtrtc)
   register u_long *cvtrtc;
 {
 #define SETRTC(_X_)	{ if (cvtrtc) *cvtrtc = (_X_); }
-  static int days_of_month[] = 
+  static int days_of_month[] =
     {
       0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
     };
   register int i;
   time_t t;
-  
+
   if (clock->utctime)
     return clock->utctime;	/* if the conversion routine gets it right away - why not */
 
@@ -634,7 +634,7 @@ parse_to_unixtime(clock, cvtrtc)
       SETRTC(CVT_FAIL|CVT_BADDATE);
       return -1;
     }
-  
+
   /*
    * sorry, slow section here - but it's not time critical anyway
    */
@@ -683,7 +683,7 @@ parse_to_unixtime(clock, cvtrtc)
 
   t = TIMES60(t) + clock->minute;
 				/* sec */
-  
+
   if (clock->second < 0 || clock->second > 60)	/* allow for LEAPs */
     {
       SETRTC(CVT_FAIL|CVT_BADTIME);
@@ -717,7 +717,7 @@ Stoi(s, zp, cnt)
 
   while(*s == ' ')
     s++;
-  
+
   if (*s == '-')
     {
       s++;
@@ -726,7 +726,7 @@ Stoi(s, zp, cnt)
   else
     if (*s == '+')
       s++;
-  
+
   for(;;)
     {
       c = *s++;
@@ -794,14 +794,14 @@ updatetimeinfo(parseio, t, usec, flags)
     usecoff += (t - parseio->parse_dtime.parse_stime.fp.l_ui + JAN_1970) * 1000000
               + usec;
 #endif
-  
+
   /*
    * filtering (median) if requested
    */
   if (parseio->parse_flags & PARSE_STAT_FILTER)
     {
       register int n, i, s, k;
-      
+
       parseio->parse_delta[parseio->parse_dindex] = usecoff;
 
       parseio->parse_dindex = (parseio->parse_dindex + 1) % PARSE_DELTA;
@@ -810,14 +810,14 @@ updatetimeinfo(parseio, t, usec, flags)
        * sort always - thus every sample gets its data
        */
       bcopy((caddr_t)parseio->parse_delta, (caddr_t)delta, sizeof(delta));
-  
+
       for (s = 0; s < PARSE_DELTA; s++)
 	for (k = s+1; k < PARSE_DELTA; k++)
 	  {			/* Yes - it's slow sort */
-	    if (delta[s] > delta[k]) 
+	    if (delta[s] > delta[k])
 	      {
 		register long tmp;
-		
+
 		tmp      = delta[k];
 		delta[k] = delta[s];
 		delta[s] = tmp;
@@ -835,7 +835,7 @@ updatetimeinfo(parseio, t, usec, flags)
 	  register long top = delta[n-1];
 	  register long mid = delta[(n+i)>>1];
 	  register long low = delta[i];
-	  
+
 	  if ((top - mid) > (mid - low))
 	    {
 	      /*
@@ -851,7 +851,7 @@ updatetimeinfo(parseio, t, usec, flags)
 	      i++;
 	    }
 	}
-      
+
       parseio->parse_dtime.parse_usecdisp  = delta[n-1] - delta[i];
 
       if (parseio->parse_flags & PARSE_STAT_AVG)
@@ -873,7 +873,7 @@ updatetimeinfo(parseio, t, usec, flags)
 	{
 	  mean = delta[(n+i)>>1];
 	}
-      
+
       parseio->parse_dtime.parse_usecerror = mean;
     }
   else
@@ -881,26 +881,26 @@ updatetimeinfo(parseio, t, usec, flags)
       parseio->parse_dtime.parse_usecerror = usecoff;
       parseio->parse_dtime.parse_usecdisp  = 0;
     }
-  
+
   parseprintf(DD_PARSE,("parse: updatetimeinfo: T=%x+%d usec, useccoff=%d, usecerror=%d, usecdisp=%d\n",
 			(int)t, (int)usec, (int)usecoff, (int)parseio->parse_dtime.parse_usecerror,
 			(int)parseio->parse_dtime.parse_usecdisp));
-  
+
 
 #ifdef PARSEKERNEL
   {
     int s = splhigh();
 #endif
-  
+
     parseio->parse_lstate          = parseio->parse_dtime.parse_state | flags | PARSEB_TIMECODE;
-    
+
     parseio->parse_dtime.parse_state = parseio->parse_lstate;
 
 #ifdef PARSEKERNEL
     (void)splx(s);
   }
 #endif
-  
+
   return CVT_OK;		/* everything fine and dandy... */
 }
 
@@ -935,7 +935,7 @@ pps_simple(parseio, status, ptime)
 {
   parseio->parse_dtime.parse_ptime  = *ptime;
   parseio->parse_dtime.parse_state |= PARSEB_PPS|PARSEB_S_PPS;
-  
+
   return CVT_NONE;
 }
 
@@ -954,7 +954,7 @@ timepacket(parseio)
   register u_long cvtsum = 0;/* accumulated CVT_FAIL errors */
   u_long cvtrtc;		/* current conversion result */
   clocktime_t clock;
-  
+
   bzero(&clock, sizeof clock);
   format = parseio->parse_lformat;
 
@@ -967,7 +967,7 @@ timepacket(parseio)
 	case CVT_FAIL:
 	  parseio->parse_badformat++;
 	  cvtsum = cvtrtc & ~CVT_MASK;
-	      
+
 	  /*
 	   * may be too often ... but is nice to know when it happens
 	   */
@@ -977,7 +977,7 @@ timepacket(parseio)
 	  syslog(LOG_WARNING, "parse: \"%s\" failed to convert\n", clockformats[format]->name);
 #endif
 	  break;
-	  
+
 	case CVT_NONE:
 	  /*
 	   * too bad - pretend bad format
@@ -985,7 +985,7 @@ timepacket(parseio)
 	  parseio->parse_badformat++;
 	  cvtsum = CVT_BADFMT;
 	  break;
-	  
+
 	case CVT_OK:
 	  k = 1;
 	  break;
@@ -1000,7 +1000,7 @@ timepacket(parseio)
 	  printf("parse: INTERNAL error: bad return code of convert routine \"%s\"\n", clockformats[format]->name);
 #else
 	  syslog(LOG_WARNING, "parse: INTERNAL error: bad return code of convert routine \"%s\"\n", clockformats[format]->name);
-#endif	  
+#endif
 	  return CVT_FAIL|cvtrtc;
 	}
     }
@@ -1011,7 +1011,7 @@ timepacket(parseio)
        * and convert time packet
        * RR search starting at last successful conversion routine
        */
-  
+
       if (nformats)		/* very careful ... */
 	{
 	  do
@@ -1023,20 +1023,20 @@ timepacket(parseio)
 		case CVT_FAIL:
 		  parseio->parse_badformat++;
 		  cvtsum |= cvtrtc & ~CVT_MASK;
-	      
+
 		  /*
 		   * may be too often ... but is nice to know when it happens
 		   */
 #ifdef PARSEKERNEL
 		  printf("parse: \"%s\" failed to convert\n", clockformats[format]->name);
-#else		  
+#else
 		  syslog(LOG_WARNING, "parse: \"%s\" failed to convert\n", clockformats[format]->name);
 #endif
 		  /*FALLTHROUGH*/
 		case CVT_NONE:
 		  format++;
 		  break;
-	  
+
 		case CVT_OK:
 		  k = 1;
 		  break;
@@ -1066,7 +1066,7 @@ timepacket(parseio)
 #endif
       return CVT_FAIL|cvtsum;
     }
-  
+
   if (k == 2) return CVT_OK;
 
   if ((t = parse_to_unixtime(&clock, &cvtrtc)) == -1)
@@ -1078,7 +1078,7 @@ timepacket(parseio)
 #endif
       return CVT_FAIL|cvtrtc;
     }
-  
+
   parseio->parse_lformat = format;
 
   /*
@@ -1111,7 +1111,7 @@ parse_getstat(dct, parse)
   return 1;
 }
 
-		  
+
 /*ARGSUSED*/
 int
 parse_setstat(dct, parse)
@@ -1122,7 +1122,7 @@ parse_setstat(dct, parse)
   return 1;
 }
 
-		  
+
 /*ARGSUSED*/
 int
 parse_timecode(dct, parse)
@@ -1139,7 +1139,7 @@ parse_timecode(dct, parse)
    */
   dct->parsegettc.parse_badformat = parse->parse_badformat;
   parse->parse_badformat = 0;
-		  
+
   if (parse->parse_ldsize <= PARSE_TCMAX)
     {
       dct->parsegettc.parse_count = parse->parse_ldsize;
@@ -1152,7 +1152,7 @@ parse_timecode(dct, parse)
     }
 }
 
-		  
+
 /*ARGSUSED*/
 int
 parse_setfmt(dct, parse)
diff --git a/usr.sbin/xntpd/parse/parse_conf.c b/usr.sbin/xntpd/parse/parse_conf.c
index ed306d4..cc931e3 100644
--- a/usr.sbin/xntpd/parse/parse_conf.c
+++ b/usr.sbin/xntpd/parse/parse_conf.c
@@ -1,7 +1,7 @@
 #if defined(REFCLOCK) && (defined(PARSE) || defined(PARSEPPS))
 /*
  * /src/NTP/REPOSITORY/v3/parse/parse_conf.c,v 3.15 1994/02/02 17:45:32 kardel Exp
- *  
+ *
  * parse_conf.c,v 3.15 1994/02/02 17:45:32 kardel Exp
  *
  * Parser configuration module for reference clocks
@@ -14,7 +14,7 @@
  *
  * Copyright (c) 1992,1993,1994
  * Frank Kardel Friedrich-Alexander Universitaet Erlangen-Nuernberg
- *                                    
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/usr.sbin/xntpd/parse/parsesolaris.c b/usr.sbin/xntpd/parse/parsesolaris.c
index 513cd00..a67f0bf 100644
--- a/usr.sbin/xntpd/parse/parsesolaris.c
+++ b/usr.sbin/xntpd/parse/parsesolaris.c
@@ -1,6 +1,6 @@
 /*
  * /src/NTP/REPOSITORY/v3/parse/parsesolaris.c,v 3.16 1994/05/30 09:57:40 kardel Exp
- *  
+ *
  * parsesolaris.c,v 3.16 1994/05/30 09:57:40 kardel Exp
  *
  * STREAMS module for reference clocks
@@ -11,7 +11,7 @@
  * derived work from parsestreams.c ((c) 1991-1993, Frank Kardel) and
  * dcf77sync.c((c) Frank Kardel)
  * Frank Kardel, Friedrich-Alexander Universitaet Erlangen-Nuernberg
- *                                    
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -71,7 +71,7 @@ static struct fmodsw fmod_templ =
 
 extern struct mod_ops mod_strmodops;
 
-static struct modlstrmod modlstrmod = 
+static struct modlstrmod modlstrmod =
 {
   &mod_strmodops,		/* a STREAMS module */
   "PARSE      - NTP reference",	/* name this baby - keep room for revision number */
@@ -129,7 +129,7 @@ int Strcmp(s, t)
 
   while (!(c = *s++ - *t++) && *s && *t)
     /* empty loop */;
-  
+
   return c;
 }
 
@@ -141,7 +141,7 @@ int _init(void)
 {
   static char revision[] = "3.16";
   char *s, *S, *t;
-  
+
   /*
    * copy RCS revision into Drv_name
    *
@@ -160,20 +160,20 @@ int _init(void)
 	}
       if (*s == ' ') s++;
     }
-	  
-  t = modlstrmod.strmod_linkinfo; 
+
+  t = modlstrmod.strmod_linkinfo;
   while (*t && (*t != ' '))
     {
       t++;
     }
   if (*t == ' ') t++;
-	  
+
   S = s;
   while (*S && (((*S >= '0') && (*S <= '9')) || (*S == '.')))
     {
       S++;
     }
-	  
+
   if (*s && *t && (S > s))
     {
       if (Strlen(t) >= (S - s))
@@ -304,7 +304,7 @@ struct delays
   unsigned char type;		/* what to match */
   unsigned long xsdelay;	/* external status direct delay in us */
   unsigned long stdelay;	/* STREAMS message delay (M_[UN]HANGUP) */
-} isr_delays[] = 
+} isr_delays[] =
 {
   /*
    * WARNING: must still be measured - currently taken from Craig Leres ppsdev
@@ -372,7 +372,7 @@ setup_stream(queue_t *q, int mode)
     }
   else
     {
-      parseprintf(DD_OPEN,("parse: setup_stream - FAILED - no MEMORY for allocb\n")); 
+      parseprintf(DD_OPEN,("parse: setup_stream - FAILED - no MEMORY for allocb\n"));
       return 0;
     }
 }
@@ -383,33 +383,33 @@ static int parseopen(queue_t *q, dev_t *dev, int flag, int sflag, cred_t *credp)
   register mblk_t *mp;
   register parsestream_t *parse;
   static int notice = 0;
-  
-  parseprintf(DD_OPEN,("parse: OPEN - q=%x\n", q)); 
-  
+
+  parseprintf(DD_OPEN,("parse: OPEN - q=%x\n", q));
+
   if (sflag != MODOPEN)
     {			/* open only for modules */
-      parseprintf(DD_OPEN,("parse: OPEN - FAILED - not MODOPEN\n")); 
+      parseprintf(DD_OPEN,("parse: OPEN - FAILED - not MODOPEN\n"));
       return EIO;
     }
 
   if (q->q_ptr != (caddr_t)NULL)
     {
-      parseprintf(DD_OPEN,("parse: OPEN - FAILED - EXCLUSIVE ONLY\n")); 
+      parseprintf(DD_OPEN,("parse: OPEN - FAILED - EXCLUSIVE ONLY\n"));
       return EBUSY;
     }
 
   parsebusy++;
-  
+
   q->q_ptr = (caddr_t)kmem_alloc(sizeof(parsestream_t), KM_SLEEP);
   if (q->q_ptr == (caddr_t)0)
     {
       return ENOMEM;
     }
 
-  parseprintf(DD_OPEN,("parse: OPEN - parse area q=%x, q->q_ptr=%x\n", q, q->q_ptr)); 
+  parseprintf(DD_OPEN,("parse: OPEN - parse area q=%x, q->q_ptr=%x\n", q, q->q_ptr));
   SAFE_WR(q)->q_ptr = q->q_ptr;
-  parseprintf(DD_OPEN,("parse: OPEN - WQ parse area q=%x, q->q_ptr=%x\n", SAFE_WR(q), SAFE_WR(q)->q_ptr)); 
-  
+  parseprintf(DD_OPEN,("parse: OPEN - WQ parse area q=%x, q->q_ptr=%x\n", SAFE_WR(q), SAFE_WR(q)->q_ptr));
+
   parse = (parsestream_t *) q->q_ptr;
   bzero((caddr_t)parse, sizeof(*parse));
   parse->parse_queue     = q;
@@ -420,7 +420,7 @@ static int parseopen(queue_t *q, dev_t *dev, int flag, int sflag, cred_t *credp)
 
   qprocson(q);
 
-  parseprintf(DD_OPEN,("parse: OPEN - initializing io subsystem q=%x\n", q)); 
+  parseprintf(DD_OPEN,("parse: OPEN - initializing io subsystem q=%x\n", q));
 
   if (!parse_ioinit(&parse->parse_io))
     {
@@ -436,13 +436,13 @@ static int parseopen(queue_t *q, dev_t *dev, int flag, int sflag, cred_t *credp)
       return EIO;
     }
 
-  parseprintf(DD_OPEN,("parse: OPEN - initializing stream q=%x\n", q)); 
+  parseprintf(DD_OPEN,("parse: OPEN - initializing stream q=%x\n", q));
 
   if (setup_stream(q, M_PARSE))
     {
       (void) init_linemon(q);	/* hook up PPS ISR routines if possible */
       setup_delays();
-      parseprintf(DD_OPEN,("parse: OPEN - SUCCEEDED\n")); 
+      parseprintf(DD_OPEN,("parse: OPEN - SUCCEEDED\n"));
 
       /*
        * I know that you know the delete key, but you didn't write this
@@ -473,19 +473,19 @@ static int parseclose(queue_t *q, int flags)
 {
   register parsestream_t *parse = (parsestream_t *)q->q_ptr;
   register unsigned long s;
-  
+
   parseprintf(DD_CLOSE,("parse: CLOSE\n"));
-  
+
   qprocsoff(q);
 
   s = splhigh();
-  
+
   if (parse->parse_dqueue)
     close_linemon(parse->parse_dqueue, q);
   parse->parse_dqueue = (queue_t *)0;
 
   (void) splx(s);
-      
+
   parse_ioend(&parse->parse_io);
 
   kmem_free((caddr_t)parse, sizeof(parsestream_t));
@@ -502,7 +502,7 @@ static int parseclose(queue_t *q, int flags)
 static parsersvc(queue_t *q)
 {
   mblk_t *mp;
-  
+
   while (mp = getq(q))
     {
       if (canput(q->q_next) || (mp->b_datap->db_type > QPCTL))
@@ -530,15 +530,15 @@ static int parsewput(queue_t *q, mblk_t *mp)
   register mblk_t *datap;
   register struct iocblk *iocp;
   parsestream_t         *parse = (parsestream_t *)q->q_ptr;
-  
+
   parseprintf(DD_WPUT,("parse: parsewput\n"));
-  
+
   switch (mp->b_datap->db_type)
     {
     default:
       putnext(q, mp);
       break;
-      
+
     case M_IOCTL:
       iocp = (struct iocblk *)mp->b_rptr;
       switch (iocp->ioc_cmd)
@@ -571,7 +571,7 @@ static int parsewput(queue_t *q, mblk_t *mp)
 	  iocp->ioc_count = sizeof(struct ppsclockev);
 	  qreply(q, mp);
 	  break;
-	  
+
 	case PARSEIOC_ENABLE:
 	case PARSEIOC_DISABLE:
 	  {
@@ -589,7 +589,7 @@ static int parsewput(queue_t *q, mblk_t *mp)
 	      }
 	    qreply(q, mp);
 	    break;
-	  }	    
+	  }
 
 	case PARSEIOC_SETSTAT:
 	case PARSEIOC_GETSTAT:
@@ -607,17 +607,17 @@ static int parsewput(queue_t *q, mblk_t *mp)
 		  parseprintf(DD_WPUT,("parse: parsewput - PARSEIOC_GETSTAT\n"));
 		  ok = parse_getstat(dct, &parse->parse_io);
 		  break;
-		  
+
 		case PARSEIOC_SETSTAT:
 		  parseprintf(DD_WPUT,("parse: parsewput - PARSEIOC_SETSTAT\n"));
 		  ok = parse_setstat(dct, &parse->parse_io);
 		  break;
-		  
+
 		case PARSEIOC_TIMECODE:
 		  parseprintf(DD_WPUT,("parse: parsewput - PARSEIOC_TIMECODE\n"));
 		  ok = parse_timecode(dct, &parse->parse_io);
 		  break;
-		  
+
 		case PARSEIOC_SETFMT:
 		  parseprintf(DD_WPUT,("parse: parsewput - PARSEIOC_SETFMT\n"));
 		  ok = parse_setfmt(dct, &parse->parse_io);
@@ -660,7 +660,7 @@ static unsigned long rdchar(mblk_t **mp)
       else
 	{
 	  register mblk_t *mmp = *mp;
-	  
+
 	  *mp = (*mp)->b_cont;
 	  freeb(mmp);
 	}
@@ -675,7 +675,7 @@ static int parserput(queue_t *q, mblk_t *imp)
 {
   register unsigned char type;
   mblk_t *mp = imp;
-  
+
   switch (type = mp->b_datap->db_type)
     {
      default:
@@ -692,7 +692,7 @@ static int parserput(queue_t *q, mblk_t *imp)
       else
 	putq(q, mp);
       break;
-      
+
      case M_BREAK:
      case M_DATA:
       {
@@ -746,7 +746,7 @@ static int parserput(queue_t *q, mblk_t *imp)
 			  if (nmp) freemsg(nmp);
 			parse_iodone(&parse->parse_io);
 		      }
-		  }	
+		  }
 	      }
 	    else
 	      {
@@ -785,11 +785,11 @@ static int parserput(queue_t *q, mblk_t *imp)
 	register int status = cd_invert ^ (type == M_HANGUP);
 
 	SET_LED(status);
-	
+
 	uniqtime(&ctime.tv);
-	
+
 	TIMEVAL_USADD(&ctime.tv, stdelay);
-	
+
 	parseprintf(DD_RPUT,("parse: parserput - M_%sHANGUP\n", (type == M_HANGUP) ? "" : "UN"));
 
 	if ((parse->parse_status & PARSE_ENABLE) &&
@@ -814,7 +814,7 @@ static int parserput(queue_t *q, mblk_t *imp)
 	    }
 	  else
 	    putq(q, mp);
-	
+
 	if (status)
 	  {
 	    parse->parse_ppsclockev.tv = ctime.tv;
@@ -833,7 +833,7 @@ static void zs_xsisr();		/* zs external status interupt handler */
 static int init_linemon(queue_t *q)
 {
   register queue_t *dq;
-  
+
   dq = SAFE_WR(q);
   /*
    * we ARE doing very bad things down here (basically stealing ISR
@@ -935,7 +935,7 @@ static int init_zs_linemon(queue_t *q, queue_t *my_q)
   else
     {
       unsigned long s;
-      
+
       /*
        * we do a direct replacement, in case others fiddle also
        * if somebody else grabs our hook and we disconnect
@@ -961,14 +961,14 @@ static int init_zs_linemon(queue_t *q, queue_t *my_q)
 	  szs->zsops.zsop_xsint = (void (*)())zs_xsisr; /* place our bastard */
 	  szs->oldzsops         = zs->zs_ops;
 	  emergencyzs           = zs->zs_ops;
-	  
+
 	  zs->zs_ops = &szs->zsops; /* hook it up */
 	  /*
-	   * XXX: this is usually done via zsopinit() 
+	   * XXX: this is usually done via zsopinit()
 	   * - have yet to find a way to call that routine
 	   */
 	  zs->zs_xsint          = (void (*)())zs_xsisr;
-	  
+
 	  mutex_exit(zs->zs_excl);
 
           parseprintf(DD_INSTALL, ("init_zs_linemon: CD monitor installed\n"));
@@ -1010,7 +1010,7 @@ static void close_zs_linemon(queue_t *q, queue_t *my_q)
       mutex_exit(zs->zs_excl);
 
       kmem_free((caddr_t)szs, sizeof (struct savedzsops));
-      
+
       parseprintf(DD_INSTALL, ("close_zs_linemon: CD monitor deleted\n"));
       return;
     }
@@ -1041,7 +1041,7 @@ static void zs_xsisr(struct zscom *zs)
     {
       timestamp_t cdevent;
       register int status;
-      
+
       /*
        * CONDITIONAL external measurement support
        */
@@ -1051,14 +1051,14 @@ static void zs_xsisr(struct zscom *zs)
 				 * are just interested in edge delays in the
 				 * lower us range
 				 */
-      
+
       /*
        * time stamp
        */
       uniqtime(&cdevent.tv);
 
       TIMEVAL_USADD(&cdevent.tv, xsdelay);
-	
+
       q = za->za_ttycommon.t_readq;
 
       /*
@@ -1070,7 +1070,7 @@ static void zs_xsisr(struct zscom *zs)
        * ok - now the hard part - find ourself
        */
       loopcheck = MAXDEPTH;
-      
+
       while (q)
 	{
 	  if (q->q_qinfo && q->q_qinfo->qi_minfo)
@@ -1098,7 +1098,7 @@ static void zs_xsisr(struct zscom *zs)
 		       */
 		      parse_iodone(&((parsestream_t *)q->q_ptr)->parse_io);
 		    }
-		  
+
 		  if (status)
 		    {
 		      ((parsestream_t *)q->q_ptr)->parse_ppsclockev.tv = cdevent.tv;
@@ -1132,9 +1132,9 @@ static void zs_xsisr(struct zscom *zs)
 	  SCC_WRITE0(ZSWR0_RESET_STATUS); /* might kill other conditions here */
 	  return;
 	}
-    }      
+    }
 
-   parseprintf(DD_ISR, ("zs_xsisr: non CD event 0x%x for \"%s\"\n", 
+   parseprintf(DD_ISR, ("zs_xsisr: non CD event 0x%x for \"%s\"\n",
 			(za->za_rr0 ^ zsstatus) & ~ZSRR0_CD,dname));
   /*
    * we are now gathered here to process some unusual external status
@@ -1149,7 +1149,7 @@ static void zs_xsisr(struct zscom *zs)
   q = za->za_ttycommon.t_readq;
 
   loopcheck = MAXDEPTH;
-      
+
   /*
    * the real thing for everything else ...
    */
@@ -1161,7 +1161,7 @@ static void zs_xsisr(struct zscom *zs)
 	  if (!Strcmp(dname, parseinfo.st_rdinit->qi_minfo->mi_idname))
 	    {
 	      register void (*zsisr)();
-		  
+
 	      /*
 	       * back home - phew (hopping along stream queues might
 	       * prove dangerous to your health)
@@ -1170,7 +1170,7 @@ static void zs_xsisr(struct zscom *zs)
 		zsisr(zs);
 	      else
 		panic("zs_xsisr: unable to locate original ISR");
-		  
+
 	      parseprintf(DD_ISR, ("zs_xsisr: non CD event was processed for \"%s\"\n", dname));
 	      /*
 	       * now back to our program ...
@@ -1192,7 +1192,7 @@ static void zs_xsisr(struct zscom *zs)
    * corrupted TTY structures
    */
   printf("zs_zsisr: looking for \"%s\" - found \"%s\" - taking EMERGENCY path\n", parseinfo.st_rdinit->qi_minfo->mi_idname, dname ? dname : "-NIL-");
-      
+
   if (emergencyzs && emergencyzs->zsop_xsint)
     emergencyzs->zsop_xsint(zs);
   else
diff --git a/usr.sbin/xntpd/parse/parsestreams.c b/usr.sbin/xntpd/parse/parsestreams.c
index 19e5c10..990f2b3 100644
--- a/usr.sbin/xntpd/parse/parsestreams.c
+++ b/usr.sbin/xntpd/parse/parsestreams.c
@@ -1,6 +1,6 @@
 /*
  * /src/NTP/REPOSITORY/v3/parse/parsestreams.c,v 3.22 1994/06/01 10:41:16 kardel Exp
- *  
+ *
  * parsestreams.c,v 3.22 1994/06/01 10:41:16 kardel Exp
  *
  * STREAMS module for reference clocks
@@ -8,7 +8,7 @@
  *
  * Copyright (c) 1989,1990,1991,1992,1993,1994
  * Frank Kardel Friedrich-Alexander Universitaet Erlangen-Nuernberg
- *                                    
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -68,7 +68,7 @@ static unsigned int parsebusy = 0;
 
 extern struct streamtab parseinfo;
 
-struct vdldrv parsesync_vd = 
+struct vdldrv parsesync_vd =
 {
   VDMAGIC_PSEUDO,		/* nothing like a real driver - a STREAMS module */
   "PARSE        ",		/* name this baby - keep room for revision number */
@@ -118,7 +118,7 @@ static int strcmp(s, t)
 
   while (!(c = *s++ - *t++) && *s && *t)
     /* empty loop */;
-  
+
   return c;
 }
 
@@ -136,10 +136,10 @@ static int strncmp(s, t, n)
 
   while (n-- && !(c = *s++ - *t++) && *s && *t)
     /* empty loop */;
-  
+
   return c;
 }
- 
+
 /*
  * driver init routine
  * since no mechanism gets us into and out of the fmodsw, we have to
@@ -154,12 +154,12 @@ int xxxinit(fc, vdp, vdi, vds)
 {
   extern struct fmodsw fmodsw[];
   extern int fmodcnt;
-  
+
   struct fmodsw *fm    = fmodsw;
   struct fmodsw *fmend = &fmodsw[fmodcnt];
   struct fmodsw *ifm   = (struct fmodsw *)0;
   char *mname          = parseinfo.st_rdinit->qi_minfo->mi_idname;
-  
+
   switch (fc)
     {
     case VDLOAD:
@@ -176,7 +176,7 @@ int xxxinit(fc, vdp, vdi, vds)
 	      return(EBUSY);
 	    }
 	  else
-	    if ((ifm == (struct fmodsw *)0) && 
+	    if ((ifm == (struct fmodsw *)0) &&
                 (fm->f_name[0] == '\0') && (fm->f_str == (struct streamtab *)0))
 	      {
 		/*
@@ -197,7 +197,7 @@ int xxxinit(fc, vdp, vdi, vds)
         {
 	  static char revision[] = "3.22";
 	  char *s, *S, *t;
-	  
+
 	  strncpy(ifm->f_name, mname, FMNAMESZ);
 	  ifm->f_name[FMNAMESZ] = '\0';
 	  ifm->f_str = &parseinfo;
@@ -219,20 +219,20 @@ int xxxinit(fc, vdp, vdi, vds)
 		}
 	      if (*s == ' ') s++;
 	    }
-	  
-	  t = parsesync_vd.Drv_name; 
+
+	  t = parsesync_vd.Drv_name;
 	  while (*t && (*t != ' '))
 	    {
 	      t++;
 	    }
 	  if (*t == ' ') t++;
-	  
+
 	  S = s;
 	  while (*S && (((*S >= '0') && (*S <= '9')) || (*S == '.')))
 	    {
 	      S++;
 	    }
-	  
+
 	  if (*s && *t && (S > s))
 	    {
 	      if (strlen(t) >= (S - s))
@@ -241,9 +241,9 @@ int xxxinit(fc, vdp, vdi, vds)
 		}
 	    }
 	  return (0);
-        } 
+        }
       break;
-      
+
     case VDUNLOAD:
       if (parsebusy > 0)
 	{
@@ -262,7 +262,7 @@ int xxxinit(fc, vdp, vdi, vds)
 		  fm->f_name[0] = '\0';
 		  fm->f_str = (struct streamtab *)0;
 		  fm++;
-		  
+
 		  break;
 		}
 	      fm++;
@@ -275,14 +275,14 @@ int xxxinit(fc, vdp, vdi, vds)
 	  else
 	    return (0);
 	}
-      
+
 
     case VDSTAT:
       return (0);
 
     default:
       return (EIO);
-      
+
     }
   return EIO;
 }
@@ -392,7 +392,7 @@ struct delays
   unsigned char type;		/* what to match */
   unsigned long xsdelay;	/* external status direct delay in us */
   unsigned long stdelay;	/* STREAMS message delay (M_[UN]HANGUP) */
-} isr_delays[] = 
+} isr_delays[] =
 {
   /*
    * WARNING: must still be measured - currently taken from Craig Leres ppsdev
@@ -457,7 +457,7 @@ setup_stream(q, mode)
     }
   else
     {
-      parseprintf(DD_OPEN,("parse: setup_stream - FAILED - no MEMORY for allocb\n")); 
+      parseprintf(DD_OPEN,("parse: setup_stream - FAILED - no MEMORY for allocb\n"));
       return 0;
     }
 }
@@ -472,34 +472,34 @@ static int parseopen(q, dev, flag, sflag)
   register mblk_t *mp;
   register parsestream_t *parse;
   static int notice = 0;
-  
-  parseprintf(DD_OPEN,("parse: OPEN\n")); 
-  
+
+  parseprintf(DD_OPEN,("parse: OPEN\n"));
+
   if (sflag != MODOPEN)
     {			/* open only for modules */
-      parseprintf(DD_OPEN,("parse: OPEN - FAILED - not MODOPEN\n")); 
+      parseprintf(DD_OPEN,("parse: OPEN - FAILED - not MODOPEN\n"));
       return OPENFAIL;
     }
 
   if (q->q_ptr != (caddr_t)NULL)
     {
       u.u_error = EBUSY;
-      parseprintf(DD_OPEN,("parse: OPEN - FAILED - EXCLUSIVE ONLY\n")); 
+      parseprintf(DD_OPEN,("parse: OPEN - FAILED - EXCLUSIVE ONLY\n"));
       return OPENFAIL;
     }
 
 #ifdef VDDRV
   parsebusy++;
 #endif
-  
+
   q->q_ptr = (caddr_t)kmem_alloc(sizeof(parsestream_t));
   if (q->q_ptr == (caddr_t)0)
     {
-      parseprintf(DD_OPEN,("parse: OPEN - FAILED - no memory\n")); 
+      parseprintf(DD_OPEN,("parse: OPEN - FAILED - no memory\n"));
       return OPENFAIL;
     }
   WR(q)->q_ptr = q->q_ptr;
-  
+
   parse = (parsestream_t *) q->q_ptr;
   bzero((caddr_t)parse, sizeof(*parse));
   parse->parse_queue     = q;
@@ -524,7 +524,7 @@ static int parseopen(q, dev, flag, sflag)
     {
       (void) init_linemon(q);	/* hook up PPS ISR routines if possible */
       setup_delays();
-      parseprintf(DD_OPEN,("parse: OPEN - SUCCEEDED\n")); 
+      parseprintf(DD_OPEN,("parse: OPEN - SUCCEEDED\n"));
 
       /*
        * I know that you know the delete key, but you didn't write this
@@ -556,17 +556,17 @@ static int parseclose(q, flags)
 {
   register parsestream_t *parse = (parsestream_t *)q->q_ptr;
   register unsigned long s;
-  
+
   parseprintf(DD_CLOSE,("parse: CLOSE\n"));
-  
+
   s = splhigh();
-  
+
   if (parse->parse_dqueue)
     close_linemon(parse->parse_dqueue, q);
   parse->parse_dqueue = (queue_t *)0;
 
   (void) splx(s);
-      
+
   parse_ioend(&parse->parse_io);
 
   kmem_free((caddr_t)parse, sizeof(parsestream_t));
@@ -586,7 +586,7 @@ static parsersvc(q)
   queue_t *q;
 {
   mblk_t *mp;
-  
+
   while (mp = getq(q))
     {
       if (canput(q->q_next) || (mp->b_datap->db_type > QPCTL))
@@ -616,15 +616,15 @@ static int parsewput(q, mp)
   register mblk_t *datap;
   register struct iocblk *iocp;
   parsestream_t         *parse = (parsestream_t *)q->q_ptr;
-  
+
   parseprintf(DD_WPUT,("parse: parsewput\n"));
-  
+
   switch (mp->b_datap->db_type)
     {
     default:
       putnext(q, mp);
       break;
-      
+
     case M_IOCTL:
       iocp = (struct iocblk *)mp->b_rptr;
       switch (iocp->ioc_cmd)
@@ -657,7 +657,7 @@ static int parsewput(q, mp)
 	  iocp->ioc_count = sizeof(struct ppsclockev);
 	  qreply(q, mp);
 	  break;
-	  
+
 	case PARSEIOC_ENABLE:
 	case PARSEIOC_DISABLE:
 	  {
@@ -675,7 +675,7 @@ static int parsewput(q, mp)
 	      }
 	    qreply(q, mp);
 	    break;
-	  }	    
+	  }
 
 	case PARSEIOC_SETSTAT:
 	case PARSEIOC_GETSTAT:
@@ -693,17 +693,17 @@ static int parsewput(q, mp)
 		  parseprintf(DD_WPUT,("parse: parsewput - PARSEIOC_GETSTAT\n"));
 		  ok = parse_getstat(dct, &parse->parse_io);
 		  break;
-		  
+
 		case PARSEIOC_SETSTAT:
 		  parseprintf(DD_WPUT,("parse: parsewput - PARSEIOC_SETSTAT\n"));
 		  ok = parse_setstat(dct, &parse->parse_io);
 		  break;
-		  
+
 		case PARSEIOC_TIMECODE:
 		  parseprintf(DD_WPUT,("parse: parsewput - PARSEIOC_TIMECODE\n"));
 		  ok = parse_timecode(dct, &parse->parse_io);
 		  break;
-		  
+
 		case PARSEIOC_SETFMT:
 		  parseprintf(DD_WPUT,("parse: parsewput - PARSEIOC_SETFMT\n"));
 		  ok = parse_setfmt(dct, &parse->parse_io);
@@ -747,7 +747,7 @@ static unsigned long rdchar(mp)
       else
 	{
 	  register mblk_t *mmp = *mp;
-	  
+
 	  *mp = (*mp)->b_cont;
 	  freeb(mmp);
 	}
@@ -763,7 +763,7 @@ static int parserput(q, mp)
   mblk_t *mp;
 {
   unsigned char type;
-  
+
   switch (type = mp->b_datap->db_type)
     {
      default:
@@ -779,7 +779,7 @@ static int parserput(q, mp)
       else
 	putq(q, mp);
       break;
-      
+
      case M_BREAK:
      case M_DATA:
       {
@@ -832,7 +832,7 @@ static int parserput(q, mp)
 			  if (nmp) freemsg(nmp);
 			parse_iodone(&parse->parse_io);
 		      }
-		  }	
+		  }
 	      }
 	    else
 	      {
@@ -871,11 +871,11 @@ static int parserput(q, mp)
 	register int status = cd_invert ^ (type == M_HANGUP);
 
 	SET_LED(status);
-	
+
 	uniqtime(&ctime.tv);
-	
+
 	TIMEVAL_USADD(&ctime.tv, stdelay);
-	
+
 	parseprintf(DD_RPUT,("parse: parserput - M_%sHANGUP\n", (type == M_HANGUP) ? "" : "UN"));
 
 	if ((parse->parse_status & PARSE_ENABLE) &&
@@ -900,7 +900,7 @@ static int parserput(q, mp)
 	    }
 	  else
 	    putq(q, mp);
-	
+
 	if (status)
 	  {
 	    parse->parse_ppsclockev.tv = ctime.tv;
@@ -920,7 +920,7 @@ static int init_linemon(q)
   register queue_t *q;
 {
   register queue_t *dq;
-  
+
   dq = WR(q);
   /*
    * we ARE doing very bad things down here (basically stealing ISR
@@ -1019,7 +1019,7 @@ static int init_zs_linemon(q, my_q)
   else
     {
       unsigned long s;
-      
+
       /*
        * we do a direct replacement, in case others fiddle also
        * if somebody else grabs our hook and we disconnect
@@ -1045,9 +1045,9 @@ static int init_zs_linemon(q, my_q)
 	  szs->zsops.zsop_xsint = (int (*)())zs_xsisr; /* place our bastard */
 	  szs->oldzsops         = zs->zs_ops;
 	  emergencyzs           = zs->zs_ops;
-	  
+
 	  zsopinit(zs, &szs->zsops); /* hook it up */
-	  
+
 	  (void) splx(s);
 
 	  parseprintf(DD_INSTALL, ("init_zs_linemon: CD monitor installed\n"));
@@ -1078,11 +1078,11 @@ static void close_zs_linemon(q, my_q)
   else
     {
       register struct savedzsops *szs = (struct savedzsops *)parsestream->parse_data;
-      
+
       zsopinit(zs, szs->oldzsops); /* reset to previous handler functions */
 
       kmem_free((caddr_t)szs, sizeof (struct savedzsops));
-      
+
       parseprintf(DD_INSTALL, ("close_zs_linemon: CD monitor deleted\n"));
       return;
     }
@@ -1121,7 +1121,7 @@ static void zs_xsisr(zs)
     {
       timestamp_t cdevent;
       register int status;
-      
+
       /*
        * CONDITIONAL external measurement support
        */
@@ -1139,7 +1139,7 @@ static void zs_xsisr(zs)
        * time stamp
        */
       uniqtime(&cdevent.tv);
-      
+
 #ifdef PPS_SYNC
       splx(s);
 #endif
@@ -1161,14 +1161,14 @@ static void zs_xsisr(zs)
 #endif
 
       TIMEVAL_USADD(&cdevent.tv, xsdelay);
-	
+
       q = za->za_ttycommon.t_readq;
 
       /*
        * ok - now the hard part - find ourself
        */
       loopcheck = MAXDEPTH;
-      
+
       while (q)
 	{
 	  if (q->q_qinfo && q->q_qinfo->qi_minfo)
@@ -1196,7 +1196,7 @@ static void zs_xsisr(zs)
 		       */
 		      parse_iodone(&((parsestream_t *)q->q_ptr)->parse_io);
 		    }
-		  
+
 		  if (status)
 		    {
 		      ((parsestream_t *)q->q_ptr)->parse_ppsclockev.tv = cdevent.tv;
@@ -1230,7 +1230,7 @@ static void zs_xsisr(zs)
 	  zsaddr->zscc_control = ZSWR0_RESET_STATUS; /* might kill other conditions here */
 	  return;
 	}
-    }      
+    }
 
   /*
    * we are now gathered here to process some unusual external status
@@ -1245,7 +1245,7 @@ static void zs_xsisr(zs)
   q = za->za_ttycommon.t_readq;
 
   loopcheck = MAXDEPTH;
-      
+
   /*
    * the real thing for everything else ...
    */
@@ -1257,7 +1257,7 @@ static void zs_xsisr(zs)
 	  if (!strcmp(dname, parseinfo.st_rdinit->qi_minfo->mi_idname))
 	    {
 	      register int (*zsisr)();
-		  
+
 	      /*
 	       * back home - phew (hopping along stream queues might
 	       * prove dangerous to your health)
@@ -1266,7 +1266,7 @@ static void zs_xsisr(zs)
 		(void)zsisr(zs);
 	      else
 		panic("zs_xsisr: unable to locate original ISR");
-		  
+
 	      parseprintf(DD_ISR, ("zs_xsisr: non CD event was processed for \"%s\"\n", dname));
 	      /*
 	       * now back to our program ...
@@ -1288,7 +1288,7 @@ static void zs_xsisr(zs)
    * corrupted TTY structures
    */
   printf("zs_zsisr: looking for \"%s\" - found \"%s\" - taking EMERGENCY path\n", parseinfo.st_rdinit->qi_minfo->mi_idname, dname ? dname : "-NIL-");
-      
+
   if (emergencyzs && emergencyzs->zsop_xsint)
     emergencyzs->zsop_xsint(zs);
   else
diff --git a/usr.sbin/xntpd/parse/util/dcfd.c b/usr.sbin/xntpd/parse/util/dcfd.c
index cc338cb..e8103d4 100644
--- a/usr.sbin/xntpd/parse/util/dcfd.c
+++ b/usr.sbin/xntpd/parse/util/dcfd.c
@@ -1,8 +1,8 @@
 /*
  * /src/NTP/REPOSITORY/v3/parse/util/dcfd.c,v 3.18 1994/05/12 12:49:23 kardel Exp
- *  
+ *
  * dcfd.c,v 3.18 1994/05/12 12:49:23 kardel Exp
- * 
+ *
  * Ported to FreeBSD 2.0 1995/03/20 by Vincenzo Capuano
  *
  * DCF77 100/200ms pulse synchronisation daemon program (via 50Baud serial line)
@@ -17,7 +17,7 @@
  *
  * Copyright (c) 1993,1994
  * Frank Kardel, Friedrich-Alexander Universitaet Erlangen-Nuernberg
- *                                    
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -269,7 +269,7 @@ typedef struct clocktime clocktime_t;
  *   while the length is given as the difference between the start index and
  *   the start index of the following field.
  */
-static struct rawdcfcode 
+static struct rawdcfcode
 {
   char offset;			/* start bit */
 } rawdcfcode[] =
@@ -336,7 +336,7 @@ static struct dcfparam
 {
   unsigned char onebits[60];
   unsigned char zerobits[60];
-} dcfparam = 
+} dcfparam =
 {
   "###############RADMLS1248124P124812P1248121241248112481248P", /* 'ONE' representation */
   "--------------------s-------p------p----------------------p"  /* 'ZERO' representation */
@@ -357,7 +357,7 @@ static unsigned long ext_bf(buf, idx)
   register int i, first;
 
   first = rawdcfcode[idx].offset;
-  
+
   for (i = rawdcfcode[idx+1].offset - 1; i >= first; i--)
     {
       sum <<= 1;
@@ -407,7 +407,7 @@ static unsigned long convert_rawdcf(buffer, size, clock)
       PRINTF("%-30s", "*** INCOMPLETE");
       return CVT_NONE;
     }
-  
+
   /*
    * check Start and Parity bits
    */
@@ -705,7 +705,7 @@ 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) 
+  if (rtc != CVT_NONE)
     {
       PRINTF("%-30s", "*** BAD DATA");
     }
@@ -723,13 +723,13 @@ dcf_to_unixtime(clock, cvtrtc)
   register unsigned long *cvtrtc;
 {
 #define SETRTC(_X_)	{ if (cvtrtc) *cvtrtc = (_X_); }
-  static int days_of_month[] = 
+  static int days_of_month[] =
     {
       0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
     };
   register int i;
   time_t t;
-  
+
   /*
    * map 2 digit years to 19xx (DCF77 is a 20th century item)
    */
@@ -751,7 +751,7 @@ dcf_to_unixtime(clock, cvtrtc)
       SETRTC(CVT_FAIL|CVT_BADDATE);
       return -1;
     }
-  
+
   /*
    * sorry, slow section here - but it's not time critical anyway
    */
@@ -817,7 +817,7 @@ dcf_to_unixtime(clock, cvtrtc)
    */
   t = TIMES60(t) + clock->minute;
 				/* sec */
-  
+
   /*
    * calculate UTC in minutes
    */
@@ -1219,7 +1219,7 @@ main(argc, argv)
 			errs=1;
 		      }
 		    break;
-	      
+
 	      case 'd':
 		    if (ac > 1)
 		      {
@@ -1232,7 +1232,7 @@ main(argc, argv)
 			errs=1;
 		      }
 		    break;
-	      
+
 	      default:
 		    fprintf(stderr, "%s: unknown option -%c\n", argv[0], c);
 		    errs=1;
@@ -1340,7 +1340,7 @@ main(argc, argv)
        */
       if (!interactive)
 	detach();
-      
+
       /*
        * get syslog() initialized
        */
@@ -1379,7 +1379,7 @@ main(argc, argv)
 	it.it_interval.tv_usec = 0;
 	it.it_value.tv_sec     = 1<<ADJINTERVAL;
 	it.it_value.tv_usec    = 0;
-	
+
       if (setitimer(ITIMER_REAL, &it, (struct itimerval *)0) == -1)
 	{
 	  syslog(LOG_ERR, "setitimer: %m");
@@ -1392,7 +1392,7 @@ main(argc, argv)
 #if defined(SYS_FREEBSD) && defined(BOEDER)
       if (fcntl(fd, F_SETFL, fcntl(fd, F_GETFL, 0) & ~O_NONBLOCK) == -1)
 	perror("F_SETFL");
-      
+
       if (ioctl(fd, TIOCCDTR, 0) == -1)
 	perror("TIOCCDTR");
 #endif
@@ -1603,7 +1603,7 @@ main(argc, argv)
 		fflush(stdout);
 	    }
 	} while ((rrc == -1) && (errno == EINTR));
-      
+
       /*
        * lost IO - sorry guys
        */
@@ -1613,6 +1613,6 @@ main(argc, argv)
     }
 
   closelog();
-  
+
   return 0;
 }
diff --git a/usr.sbin/xntpd/parse/util/parsetest.c b/usr.sbin/xntpd/parse/util/parsetest.c
index 7fa62a9..33f3d9c 100644
--- a/usr.sbin/xntpd/parse/util/parsetest.c
+++ b/usr.sbin/xntpd/parse/util/parsetest.c
@@ -5,12 +5,15 @@
  *
  * Copyright (c) 1989,1990,1991,1992,1993,1994
  * Frank Kardel Friedrich-Alexander Universitaet Erlangen-Nuernberg
- *                                    
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
  * $Log: parsetest.c,v $
+ * Revision 1.1.1.4  1994/09/29  23:01:34  wollman
+ * xntp 3.4e from Dave Mills @ UDel
+ *
  * Revision 3.14  1994/05/12  12:49:27  kardel
  * printf fmt/arg cleanup
  *
@@ -90,7 +93,7 @@ static char *strstatus(buffer, state)
   int i;
 
   *buffer = '\0';
-  
+
   i = 0;
   while (flagstrings[i].bit)
     {
@@ -102,18 +105,18 @@ static char *strstatus(buffer, state)
 	}
       i++;
     }
-  
+
   if (state & (PARSEB_S_LEAP|PARSEB_S_ANTENNA|PARSEB_S_PPS|PARSEB_S_POSITION))
     {
       register char *s, *t;
-      
+
       if (buffer[0])
 	strcat(buffer, "; ");
 
       strcat(buffer, "(");
 
       t = s = buffer + strlen(buffer);
-      
+
       i = 0;
       while (sflagstrings[i].bit)
 	{
@@ -124,7 +127,7 @@ static char *strstatus(buffer, state)
 		  strcpy(t, "; ");
 		  t += 2;
 		}
-	      
+
 	      strcpy(t, sflagstrings[i].name);
 	      t += strlen(t);
 	    }
@@ -159,7 +162,7 @@ static char *parsestatus(state, buffer)
   int i;
 
   *buffer = '\0';
-  
+
   i = 0;
   while (flagstrings[i].bit)
     {
@@ -171,7 +174,7 @@ static char *parsestatus(state, buffer)
 	}
       i++;
     }
-  
+
   return buffer;
 }
 
@@ -188,7 +191,7 @@ main(argc, argv)
   else
     {
       int fd;
-      
+
       fd = open(argv[1], O_RDWR);
       if (fd == -1)
 	{
@@ -200,9 +203,9 @@ main(argc, argv)
 	  parsectl_t  dct;
 	  parsetime_t parsetime;
 	  struct strioctl strioc;
-	  
+
 	  printf("parsetest.c,v 3.11 1994/01/23 19:00:01 kardel Exp\n");
-	  
+
 	  while (ioctl(fd, I_POP, 0) == 0)
 	    ;
 
@@ -226,14 +229,14 @@ main(argc, argv)
 
 	  dct.parsestatus.flags |= PARSE_STAT_FILTER;
 	  strioc.ic_cmd = PARSEIOC_SETSTAT;
-	  
+
 	  if (ioctl(fd, I_STR, &strioc) == -1)
 	    {
 	      perror("ioctl(fd, I_STR(PARSEIOC_SETSTAT))");
 	      exit(1);
 	    }
 	  printf("PARSE clock FILTERMODE\n");
-	  
+
 	  if (ioctl(fd, I_STR, &strioc) == -1)
 	    {
 	      perror("ioctl(fd, I_STR(PARSEIOC_GETSTAT))");
@@ -264,7 +267,7 @@ main(argc, argv)
 		     (unsigned long)parsetime.parse_status,
 		     parsestatus(parsetime.parse_status, tmp1));
 	    }
-	  
+
 	  close(fd);
 	}
     }
diff --git a/usr.sbin/xntpd/parse/util/testdcf.c b/usr.sbin/xntpd/parse/util/testdcf.c
index 73c8d89..219b7c3 100644
--- a/usr.sbin/xntpd/parse/util/testdcf.c
+++ b/usr.sbin/xntpd/parse/util/testdcf.c
@@ -1,13 +1,13 @@
 /*
  * /src/NTP/REPOSITORY/v3/parse/util/testdcf.c,v 3.13 1994/05/12 12:49:31 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)
  *
  * Copyright (c) 1993,1994
  * Frank Kardel, Friedrich-Alexander Universitaet Erlangen-Nuernberg
- *                                    
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -112,7 +112,7 @@ typedef struct clocktime clocktime_t;
  * 59		      - usually missing (minute indication), except for leap insertion
  */
 
-static struct rawdcfcode 
+static struct rawdcfcode
 {
   char offset;			/* start bit */
 } rawdcfcode[] =
@@ -165,7 +165,7 @@ static unsigned long ext_bf(buf, idx)
   register int i, first;
 
   first = rawdcfcode[idx].offset;
-  
+
   for (i = rawdcfcode[idx+1].offset - 1; i >= first; i--)
     {
       sum <<= 1;
@@ -199,7 +199,7 @@ static unsigned long convert_rawdcf(buffer, size, clock)
       printf("%-30s", "*** INCOMPLETE");
       return CVT_NONE;
     }
-  
+
   /*
    * check Start and Parity bits
    */