Remove trailing whitespace.

82 files changed, 488 insertions, 485 deletions

diff --git a/gnu/libexec/uucp/common_sources/chat.c b/gnu/libexec/uucp/common_sources/chat.c
index 2fbea0a05587..f35e2e0fbedb 100644
--- a/gnu/libexec/uucp/common_sources/chat.c
+++ b/gnu/libexec/uucp/common_sources/chat.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char chat_rcsid[] = "$Id: chat.c,v 1.42 1994/01/30 21:02:56 ian Rel $";
+const char chat_rcsid[] = "$Id: chat.c,v 1.2 1994/05/07 18:08:33 ache Exp $";
 #endif
 
 #include <ctype.h>
@@ -926,7 +926,7 @@ fcsend (qconn, puuconf, z, qsys, qdial, zphone, ftranslate, fstrip)
 	  break;
 #endif
 	}
-      
+
       if (fsend)
 	{
 	  fquote = fcsend_debug (fquote, (size_t) 1, &bsend);
@@ -1190,7 +1190,7 @@ fcprogram (qconn, puuconf, pzprogram, qsys, qdial, zphone, zport, ibaud)
 	  *pzarg = zbufcpy (*pz);
 	  continue;
 	}
-      
+
       *pzarg = NULL;
       zto = NULL;
       calc = 0;
diff --git a/gnu/libexec/uucp/common_sources/conn.c b/gnu/libexec/uucp/common_sources/conn.c
index 6598f1093ee8..f3ae8e4fdede 100644
--- a/gnu/libexec/uucp/common_sources/conn.c
+++ b/gnu/libexec/uucp/common_sources/conn.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char conn_rcsid[] = "$Id: conn.c,v 1.13 1994/03/24 01:41:02 ian Rel $";
+const char conn_rcsid[] = "$Id: conn.c,v 1.2 1994/05/07 18:08:38 ache Exp $";
 #endif
 
 #include <ctype.h>
@@ -234,7 +234,7 @@ fconn_dial (qconn, puuconf, qsys, zphone, qdialer, ptdialerfound)
     qdialer = &sdialer;
   if (ptdialerfound == NULL)
     ptdialerfound = &tfound;
-      
+
   qdialer->uuconf_zname = NULL;
   *ptdialerfound = DIALERFOUND_FALSE;
 
diff --git a/gnu/libexec/uucp/common_sources/getopt.h b/gnu/libexec/uucp/common_sources/getopt.h
index 1a70e027714e..d9f87a5c5189 100644
--- a/gnu/libexec/uucp/common_sources/getopt.h
+++ b/gnu/libexec/uucp/common_sources/getopt.h
@@ -5,12 +5,12 @@
    under the terms of the GNU General Public License as published by the
    Free Software Foundation; either version 2, or (at your option) any
    later version.
-   
+
    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.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
diff --git a/gnu/libexec/uucp/common_sources/log.c b/gnu/libexec/uucp/common_sources/log.c
index 1544bc93d292..261163a2559b 100644
--- a/gnu/libexec/uucp/common_sources/log.c
+++ b/gnu/libexec/uucp/common_sources/log.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char log_rcsid[] = "$Id: log.c,v 1.54 1994/04/17 02:28:24 ian Rel $";
+const char log_rcsid[] = "$Id: log.c,v 1.2 1994/05/07 18:08:47 ache Exp $";
 #endif
 
 #include <ctype.h>
@@ -199,7 +199,7 @@ ulog_system (zsystem)
     {
       ubuffree (zLsystem);
       zLsystem = zbufcpy (zsystem);
-#if HAVE_HDB_LOGGING      
+#if HAVE_HDB_LOGGING
       /* Under HDB logging we now must write to a different log file.  */
       ulog_close ();
 #endif /* HAVE_HDB_LOGGING */
@@ -331,7 +331,7 @@ ulog (ttype, zmsg, a, b, c, d, f, g, h, i, j)
 	    char *zlower;
 	    char *zfile;
 
-	    /* We want to write to .Log/program/system, e.g.  	
+	    /* We want to write to .Log/program/system, e.g.
 	       .Log/uucico/uunet.  The system name may not be set.  */
 	    if (zLsystem == NULL)
 	      zsys = "ANY";
@@ -633,7 +633,7 @@ ustats (fsucceeded, zuser, zsystem, fsent, cbytes, csecs, cmicros, fmaster)
     {
       csecs += cmicros / 10000000L;
       cmicros = cmicros % 1000000L;
-    }      
+    }
 
   /* On a system which can determine microseconds we might very well
      have both csecs == 0 and cmicros == 0.  */
diff --git a/gnu/libexec/uucp/common_sources/tcp.c b/gnu/libexec/uucp/common_sources/tcp.c
index 4efded948c29..161e5f9ed466 100644
--- a/gnu/libexec/uucp/common_sources/tcp.c
+++ b/gnu/libexec/uucp/common_sources/tcp.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char tcp_rcsid[] = "$Id: tcp.c,v 1.34 1994/01/30 21:01:46 ian Rel $";
+const char tcp_rcsid[] = "$Id: tcp.c,v 1.2 1994/05/07 18:09:01 ache Exp $";
 #endif
 
 #if HAVE_TCP
@@ -308,7 +308,7 @@ ftcp_open (qconn, ibaud, fwait)
 	      ulog (LOG_ERROR, "fork: %s", strerror (errno));
 	      _exit (EXIT_FAILURE);
 	    }
-	      
+
 	  if (ipid != 0)
 	    _exit (EXIT_SUCCESS);
 
diff --git a/gnu/libexec/uucp/common_sources/tli.c b/gnu/libexec/uucp/common_sources/tli.c
index c36399853046..db3491a20ac7 100644
--- a/gnu/libexec/uucp/common_sources/tli.c
+++ b/gnu/libexec/uucp/common_sources/tli.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char tli_rcsid[] = "$Id: tli.c,v 1.15 1994/01/30 20:59:40 ian Rel $";
+const char tli_rcsid[] = "$Id: tli.c,v 1.2 1994/05/07 18:09:03 ache Exp $";
 #endif
 
 #if HAVE_TLI
@@ -147,7 +147,7 @@ ztlierror ()
   if (t_errno < 0 || t_errno >= t_nerr)
     return "Unknown TLI error";
   return t_errlist[t_errno];
-} 
+}
 
 /* Initialize a TLI connection.  This may be called with qconn->qport
    NULL, when opening standard input as a TLI connection.  */
@@ -230,7 +230,7 @@ ftli_push (qconn)
     qsysdep->ftli = FALSE;
 
 #endif /* defined (I_PUSH) */
-  
+
   return TRUE;
 }
 
@@ -330,7 +330,7 @@ ftli_open (qconn, ibaud, fwait)
   zservaddr = qconn->qport->uuconf_u.uuconf_stli.uuconf_zservaddr;
   if (zservaddr == NULL)
     ulog (LOG_FATAL, "Can't run as TLI server; no server address");
-      
+
   zfreeaddr = zbufcpy (zservaddr);
   qtbind->addr.len = cescape (zfreeaddr);
   if (qtbind->addr.len > qtbind->addr.maxlen)
@@ -364,7 +364,7 @@ ftli_open (qconn, ibaud, fwait)
       onew = t_open (zdevice, O_RDWR, (struct t_info *) NULL);
       if (onew < 0)
 	ulog (LOG_FATAL, "t_open (%s): %s", zdevice, ztlierror ());
-	  
+
       if (fcntl (onew, F_SETFD,
 		 fcntl (onew, F_GETFD, 0) | FD_CLOEXEC) < 0)
 	ulog (LOG_FATAL, "fcntl (FD_CLOEXEC): %s", strerror (errno));
@@ -410,7 +410,7 @@ ftli_open (qconn, ibaud, fwait)
 	      ulog (LOG_ERROR, "fork: %s", strerror (errno));
 	      _exit (EXIT_FAILURE);
 	    }
-	      
+
 	  if (ipid != 0)
 	    _exit (EXIT_SUCCESS);
 
@@ -524,7 +524,7 @@ ftli_dial (qconn, puuconf, qsys, zphone, qdialer, ptdialerfound)
 	  pzdialer += 2;
 	}
     }
-  
+
   if (zaddr == NULL)
     {
       ulog (LOG_ERROR, "No address for TLI connection");
@@ -566,7 +566,7 @@ ftli_dial (qconn, puuconf, qsys, zphone, qdialer, ptdialerfound)
 
   /* We've connected to the remote.  Push any desired modules.  */
   if (! ftli_push (qconn))
-    return FALSE;      
+    return FALSE;
 
   /* Handle the rest of the dialer sequence.  */
   if (pzdialer != NULL && *pzdialer != NULL)
diff --git a/gnu/libexec/uucp/contrib/amiga.c b/gnu/libexec/uucp/contrib/amiga.c
index d982364cfd57..ef2a5cbdc3f5 100644
--- a/gnu/libexec/uucp/contrib/amiga.c
+++ b/gnu/libexec/uucp/contrib/amiga.c
@@ -1,10 +1,10 @@
 /* Wrapper code for Taylor UUCP on Amiga Unix (SVR4) for cron invoked UUCP */
 /* processes.                                                              */
 
-/* The problem:  Cron is not a "licensed" process. any process that grabs a 
+/* The problem:  Cron is not a "licensed" process. any process that grabs a
    controlling terminal needs to be licensed.  Taylor UUCP needs controlling
-   terminals.  Taylor UUCP does relinquish the controlling terminal before 
-   fork(), so the "UUCP" license is appropriate. 
+   terminals.  Taylor UUCP does relinquish the controlling terminal before
+   fork(), so the "UUCP" license is appropriate.
    This simple program does the "right" thing, but *MUST* be SETUID ROOT */
 
 /* Written by: Lawrence E. Rosenman <ler@lerami.lerctr.org> */
@@ -36,7 +36,7 @@ int main(int argc,char *argv[],char *envp)
 	 exit(1);
   }
   setgid(pw->pw_gid); /* set gid to uucp */
-  setuid(pw->pw_uid); /* set uid to uucp */ 
+  setuid(pw->pw_uid); /* set uid to uucp */
   argv[0]=name; /* have PS not lie... */
   execv("/usr/local/lib/uucp/uucico",argv); /* go to the real program */
   exit(errno);
diff --git a/gnu/libexec/uucp/contrib/dialHDB.c b/gnu/libexec/uucp/contrib/dialHDB.c
index cb2662134af6..8650ff023b65 100644
--- a/gnu/libexec/uucp/contrib/dialHDB.c
+++ b/gnu/libexec/uucp/contrib/dialHDB.c
@@ -86,7 +86,7 @@ main(int argc,char *argv[])
   int child;			/* pid of child process */
   int stat;			/* exit status of child process */
   char *temp;			/* used to get basename of dialer */
-  
+
   if(argc!=5)
   {
     fprintf(stderr,kUsage,argv[0],argv[0]);
@@ -95,9 +95,9 @@ main(int argc,char *argv[])
 
   dialerPath=argv[1];
   dialerName= (temp=strrchr(argv[1],'/'))!=NULL ? temp+1 : argv[1];
-  
+
   parent=getpid();
-  
+
   signal(SIGUSR1,badExec);	/* set up for possible failed exec */
 
   if((child=fork())<0)
@@ -111,7 +111,7 @@ main(int argc,char *argv[])
     signal(SIGHUP,SIG_IGN);
     signal(SIGINT,SIG_IGN);
     signal(SIGTERM,SIG_IGN);
-    
+
     wait(&stat);		/* wait for child to exit */
     exit(figureStat(stat));	/* figure out our exit code and die */
   }
@@ -125,7 +125,7 @@ main(int argc,char *argv[])
       kill(parent,SIGUSR1);
       exit(0);
     }
-  }  
+  }
   exit(0);
 }
 
@@ -136,7 +136,7 @@ int figureStat(int stat)
   int exit;
   int errFlag;
   int error;
-  
+
   if(WIFSIGNALED(stat))		/* determine if exit was from signal or what */
   {
     fprintf(stderr,"Error: Dialer %s recieved signal %d.\n",dialerName,
diff --git a/gnu/libexec/uucp/contrib/uurate.c b/gnu/libexec/uucp/contrib/uurate.c
index 1ff9afb829b8..c625d4b4fbaf 100644
--- a/gnu/libexec/uucp/contrib/uurate.c
+++ b/gnu/libexec/uucp/contrib/uurate.c
@@ -44,7 +44,7 @@
  *      - redesigned the printed layout (sticked to those 80 column tubes).
  *      - 'Retry time not ...' and ' ERROR: All matching ports ...' will now be
  *        counted as calls and will raise the failed-call counter.
- *      - times now shown as hh:mm:ss; the fields may hold up to 999 hrs  
+ *      - times now shown as hh:mm:ss; the fields may hold up to 999 hrs
  *        (a month equals 744 hrs at max). Printing will be as follows:
  *
  *         hrs > 0  hh:mm:ss
@@ -52,7 +52,7 @@
  *         sec > 0        ss
  *         leading zeroes are suppressed.
  *
- *      - the bytes xfered will be given in thousands only (we're counting 
+ *      - the bytes xfered will be given in thousands only (we're counting
  *        so 1K is 1000 bytes!). Sums up to 9,999,999.9 thousand can be shown.
  *      - dropped the fractions of a byte in columns: bytes/second (avg cps).
  *      - File statistic changed to display in/out in one row instead of 2
@@ -60,7 +60,7 @@
  *      - eliminated the goto in command report and tightened the code; also
  *        the 'goto usage' has been replaced by a call to void usage() with no
  *        return (exit 1).
- *      - a totaling is done for all reports now; the total values are held 
+ *      - a totaling is done for all reports now; the total values are held
  *        within the structure; after finishing read there will be an alloc
  *        for a site named 'Total' so that the totals line will be printed
  *        more or less automatically.
@@ -84,6 +84,9 @@
  *        get knowledge of
  */
 /* $Log: uurate.c,v $
+ * Revision 1.2  1994/05/07  18:09:35  ache
+ * Upgrade to version 1.05
+ *
  * Revision 1.15  1994/04/07  21:47:11  kdburg
  * printed 'no data avail' while there was data; layout chnaged
  * (cosmetic only)
@@ -139,7 +142,7 @@
  * */
 
 char version[] = "@(#) Taylor UUCP Log File Summary Filter, Version 1.2.2";
-static char rcsid[] = "$Id: uurate.c,v 1.15 1994/04/07 21:47:11 kdburg Rel $";
+static char rcsid[] = "$Id: uurate.c,v 1.2 1994/05/07 18:09:35 ache Exp $";
 #include <ctype.h>            /* Character Classification      */
 #include <math.h>
 #include "uucp.h"
@@ -288,7 +291,7 @@ int main(argc, argv)
          char *argv[];
 {
   FILE *Log = NULL;
-  int c; 
+  int c;
   char *p, *s, *stt, *flq = NULL;
   char Hostname[MAXHOSTNAMELEN]; /* def taken from <sys/param.h> */
   char Filename[15];             /* filename to be printed */
@@ -318,7 +321,7 @@ int main(argc, argv)
    else
       strcpy(Pgm_name,argv[0]);
    def_logs[0] = Pgm_name;
-   
+
   /*
    * I wish the compiler had the #error directive!
    */
@@ -345,7 +348,7 @@ int main(argc, argv)
   Tstat  = (char *)getmem(sizeof(STATFILE));
   Tlog   = LOGFILE;
   Tstat  = STATFILE;
-  
+
   /*
    * Process the command line arguments
    */
@@ -423,8 +426,8 @@ int main(argc, argv)
   /*
    * If further args present, Assume rest are logfiles for us to process
    * which should be given in pairs (log plus stat) otherwise the results may
-   * not come out as expected! If no further args are present take input from 
-   * Log and Stat files provided in the compilation environment of Taylor UUCP. 
+   * not come out as expected! If no further args are present take input from
+   * Log and Stat files provided in the compilation environment of Taylor UUCP.
    * If -i was given, Log already points to stdin and no file args are accepted.
    */
 
@@ -454,7 +457,7 @@ int main(argc, argv)
       else                            /* Read from current logs */
       {
          def_logs[1] = Tlog;      /* prime the */
-         def_logs[2] = Tstat;     /*   file names */   
+         def_logs[2] = Tstat;     /*   file names */
          if (! be_quiet)
             printf("   Config for this run: ");
 
@@ -480,7 +483,7 @@ int main(argc, argv)
                  printf("%s\n",noConf);
          }
          def_logs[1] = Tlog;      /* final setting of */
-         def_logs[2] = Tstat;     /*   file names */   
+         def_logs[2] = Tstat;     /*   file names */
          argv = def_logs;            /* Bash argvec to log/stat files */
          argc = sizeof(def_logs) / sizeof(def_logs[0]);
        }
@@ -514,7 +517,7 @@ int main(argc, argv)
        strncpy(Filename,argv[1],sizeof(Filename)-1);
     else
        strncpy(Filename,++flq,sizeof(Filename)-1);
-       
+
     strcpy(in_date,"   n/a");
     strcpy(in_time,"   n/a");
     p_done = FALSE;             /* no info printed yet */
@@ -543,7 +546,7 @@ int main(argc, argv)
       if (NULL != (stt = strchr(p, '(')))
       {
          if (! p_done && ! use_stdin && ! be_quiet)
-         {  
+         {
 
 #if HAVE_TAYLOR_LOGGING
          sscanf(++stt,"%s%*c%[^.]",in_date,in_time);
@@ -586,7 +589,7 @@ int main(argc, argv)
          * transfer record, determine the direction. If not then
          * skip the line if it is not interesting.
          */
-      
+
       if ((s = strchr(++s, ')')) == NULL)
          continue;
 
@@ -596,7 +599,7 @@ int main(argc, argv)
          if ((s = strchr(++s, ')')) == NULL)
             continue;                     /* yes but strange layout */
 #endif /* HAVE_V2_LOGGING */
-#endif /* ! HAVE_TAYLOR_LOGGING  */ 
+#endif /* ! HAVE_TAYLOR_LOGGING  */
 
        logmsg = s + 2;            /* Message is 2 characters after ')' */
        if ((0 != strncmp(logmsg, "Call complete", 13)) &&
@@ -651,8 +654,8 @@ int main(argc, argv)
                                 last->next = cur;
                              break;
                           }
-                     }   /*  while (e != NULL) */ 
-                 }    /*  hosts == NULL  */ 
+                     }   /*  while (e != NULL) */
+                 }    /*  hosts == NULL  */
               }   /* cur == NULL */
        }
 
@@ -768,7 +771,7 @@ int main(argc, argv)
         /*
          * Handle end of call. Pick up the connect time.
          * position is on the closing paren of date/time info
-         * i.e: ) text....  
+         * i.e: ) text....
          */
 
         if (0 == strncmp(logmsg, "Call complete", 13))
@@ -795,7 +798,7 @@ int main(argc, argv)
         if (0 == strncmp(logmsg, "failed after ",13))
            logmsg += 13;        /* the transmission failed for any reason */
                                 /* so advance pointer */
-        if (0 == strncmp(logmsg, "sent", 4)) 
+        if (0 == strncmp(logmsg, "sent", 4))
            sent = OUT;
         else if (0 == strncmp(logmsg, "received", 8))
                 sent = IN;
@@ -821,7 +824,7 @@ int main(argc, argv)
     }   /* end of while (fgets(logline...)) */
 
     if (stt != NULL && ! use_stdin && ! be_quiet && ! no_records)
-    {  
+    {
 
 #if HAVE_TAYLOR_LOGGING
          sscanf(dt_info,"%s%*c%[^.]",in_date,in_time);
@@ -848,7 +851,7 @@ int main(argc, argv)
        {
           if (! be_quiet && no_records)
              printf("   %-14s %10s\n",Filename, " is empty ");
-       }         
+       }
      }
      fclose(Log);
 
@@ -895,11 +898,11 @@ int main(argc, argv)
               tot->call[OUT].flow[IN].files += cur->call[OUT].flow[IN].files;
               tot->call[IN].flow[OUT].files  += cur->call[IN].flow[OUT].files;
               tot->call[OUT].flow[OUT].files += cur->call[OUT].flow[OUT].files;
-              tot->call[OUT].succs += cur->call[OUT].succs; 
-              tot->call[OUT].calls += cur->call[OUT].calls; 
+              tot->call[OUT].succs += cur->call[OUT].succs;
+              tot->call[OUT].calls += cur->call[OUT].calls;
               tot->call[OUT].connect_time += cur->call[OUT].connect_time;
-              tot->call[IN].succs += cur->call[IN].succs; 
-              tot->call[IN].calls += cur->call[IN].calls; 
+              tot->call[IN].succs += cur->call[IN].succs;
+              tot->call[IN].calls += cur->call[IN].calls;
               tot->call[IN].connect_time += cur->call[IN].connect_time;
            }
          }
@@ -981,7 +984,7 @@ int main(argc, argv)
                    cur->Hostname, rf, sf,
                    t1, t2, t3, t4, t5,
                    ir, or);
-        } 
+        }
         if (! hdr_done)
         {
             puts("\n(I) No data found to print Compact summary report");
@@ -1077,7 +1080,7 @@ int main(argc, argv)
                                     prot->pr_eorder,
                                     prot->pr_ereject);
                       type = NULL;
-                   } 
+                   }
                 }
             }
         }
@@ -1171,7 +1174,7 @@ int main(argc, argv)
      {
         char t1[32], t2[32];
         double rate = 0, time = 0;
-        int b = 0; 
+        int b = 0;
         int lineOut = 0;
 
         hdr_done = FALSE;
@@ -1179,7 +1182,7 @@ int main(argc, argv)
         {
             lineOut = 0;
             for (sent= IN; sent <= OUT; ++sent)
-            {  
+            {
                 b    = cur->call[IN].flow[sent].bytes +
                        cur->call[OUT].flow[sent].bytes;
                 time = cur->call[IN].flow[sent].time +
@@ -1215,7 +1218,7 @@ int main(argc, argv)
                           t1, t2, rate);
                     lineOut = 1;
                  }
-            }    /* end:  for (sent ... ) */  
+            }    /* end:  for (sent ... ) */
             if (lineOut)
                 printf("\n");
         }    /* end:  for (cur= ... ) */
@@ -1263,7 +1266,7 @@ int main(argc, argv)
                hdr_done = TRUE;
             }
 
-            flow = cur->call[IN].flow[IN].time + 
+            flow = cur->call[IN].flow[IN].time +
                    cur->call[IN].flow[OUT].time +
                    cur->call[OUT].flow[IN].time +
                    cur->call[OUT].flow[OUT].time;
@@ -1296,12 +1299,12 @@ int main(argc, argv)
    */
 
   if (show_commands || show_all)
-  { 
+  {
      if (have_commands)
      {
         int ncmds, i, match;
 
-        /* 
+        /*
          *  layout the header line. The column's header is the command name
          */
 
@@ -1331,7 +1334,7 @@ int main(argc, argv)
                fputs("  ------", stdout);
            putchar('\n');
 
-        /* 
+        /*
          *  print out the number of executions for each host/command
          */
 
@@ -1353,7 +1356,7 @@ int main(argc, argv)
                   for(ec= cur->cmds; ec != NULL; ec= ec->next)
                   {
                      if ( 0 == strcmp(cmd->Commandname, ec->Commandname) )
-                     { 
+                     {
                         printf(" %7d", ec->count);
                         match = TRUE;
                         break;
@@ -1366,7 +1369,7 @@ int main(argc, argv)
             }
 
          /*
-          *  print the totals line 
+          *  print the totals line
           */
 
             fputs("   --------", stdout);
@@ -1402,7 +1405,7 @@ int main(argc, argv)
    */
 
   /* ------------------------------------------------------------------
-   *                    display the help 
+   *                    display the help
    * ------------------------------------------------------------------
    */
 
@@ -1644,7 +1647,7 @@ int chk_config(char *T_conf,int be_quiet, int type)
             fprintf(stderr,"%s (C) ended due to errors\n",
                                                Pgm_name);
             return (8);
-         } 
+         }
       }
    }
    else
diff --git a/gnu/libexec/uucp/contrib/uusnap.c b/gnu/libexec/uucp/contrib/uusnap.c
index 123741cbff28..f94078b5fded 100644
--- a/gnu/libexec/uucp/contrib/uusnap.c
+++ b/gnu/libexec/uucp/contrib/uusnap.c
@@ -12,7 +12,7 @@
 
    compile it form the Makefile or:
    cc -c -g -pipe -O  -I. -I. -DNEWCONFIGLIB=\"/usr/local/lib/uucp\" uusnap.c
-   cc  -o uusnap uusnap.o 
+   cc  -o uusnap uusnap.o
    For this, uusnap.[ch] must be in the same directory as uucp.h and so.
 
    uusnap must have read access to SPOOLDIR/.Status in order to work.
@@ -25,7 +25,7 @@
 
 #include "uucp.h"
 #if USE_RCS_ID
-char uusnap_rcsid[] = "$Id: uusnap.c,v 1.9 92/05/05 22:51:50 hwr Exp Locker: hwr $";
+char uusnap_rcsid[] = "$Id: uusnap.c,v 1.2 1994/05/07 18:09:40 ache Exp $";
 #endif
 
 #include <ctype.h>
@@ -50,7 +50,7 @@ struct sysInfo  {
     int num_retries;		/* number of retries */
 };
 
-struct sysInfo Systems[MAXSYS];    
+struct sysInfo Systems[MAXSYS];
 
 
 /*  I have extend the system status. If time for the specified system
@@ -77,7 +77,7 @@ main()
     int i;
     i=get_systems();
     display_info(i);
-    
+
     exit(0);
 }
 
@@ -115,7 +115,7 @@ get_systems()
 	    get_stat_for_system(i);    	/* now get the system status */
 	    get_inq_num(i,TRUE);	/* number of unprocessed files */
 	    get_outq_num(i,TRUE);       /* number of files to send */
-	    i++;	
+	    i++;
 	}
 	fclose(fp);
     }
@@ -126,7 +126,7 @@ get_systems()
     return i;
 }
 
-	    
+
 
 display_info(int numSys)
 {
@@ -144,7 +144,7 @@ display_info(int numSys)
 	fprintf(stderr, "Can't malloc 1024 bytes");
 	exit(1);
     }
-	
+
     while(TRUE) {
 	display_headline();
 	for (sysnum=0;sysnum<numSys;sysnum++) {
@@ -170,21 +170,21 @@ int
 display_status_line(int sn)
 {
     char *time_s;
-    
+
     int sys_stat,num_retries,wait;
     int i;
     time_t last_time;
     time_t next_time;
-     
+
     struct sysInfo sys;
-    
+
     sys = Systems[sn];
 
     printf("%10s  ",sys.sysname);
     get_inq_num(sn);
     if (sys.in==0)
 	printf("     ");
-    else 
+    else
 	printf("%3d  ",sys.in);
     get_outq_num(sn);
     if (sys.out==0)
@@ -198,13 +198,13 @@ display_status_line(int sn)
     time_s = ctime(&sys.next);
     time_s = time_s + 11;
     *(time_s+8)='\0';
-    if (sys.last == sys.next) 
+    if (sys.last == sys.next)
 	printf("           ");
     else
 	printf("%8s   ",time_s);	/* time of next poll */
-    if (sys.num_retries==0) 
+    if (sys.num_retries==0)
 	printf("   ");
-    else 
+    else
 	printf("%2d ",sys.num_retries);
     if (sys_stat==6) 		/* system is talking */
 	printf("\E[7m");	/* reverse video on */
@@ -234,7 +234,7 @@ get_inq_num(int num,char firstTime)
     char filename[1024];
     struct stat stbuf;
     DIR *dirp;
-    
+
     strcpy(filename,Systems[num].spooldir);
     strcat(filename,"/X./.");
     stat(filename,&stbuf);
@@ -263,7 +263,7 @@ get_outq_num(int sys,char firstTime)
     char filename[1024];
     struct stat stbuf;
     DIR *dirp;
-    
+
     strcpy(filename,Systems[sys].spooldir);
     strcat(filename,"/C./.");
     stat(filename,&stbuf);
diff --git a/gnu/libexec/uucp/contrib/xchat.c b/gnu/libexec/uucp/contrib/xchat.c
index b44549e53ed4..9e87f7c67be0 100644
--- a/gnu/libexec/uucp/contrib/xchat.c
+++ b/gnu/libexec/uucp/contrib/xchat.c
@@ -21,7 +21,7 @@
  *            for timed reads. Use Taylor UUCP "conf.h" file to set
  *            configuration for this program. Add defaulting of script
  *            and log file paths.
- *   
+ *
  *   Daniel Hagerty - Mon Nov 22 18:17:38 1993
  *     V1.2 - Added a new opcode to xchat. "expectstr" is a cross between
  *            sendstr and expect, looking for a parameter supplied string.
@@ -43,7 +43,7 @@
 
 #include "xc-conf.h"
 
-/* 
+/*
  * Pick a timing routine to use, as done in Taylor UUCP.
  */
 #if HAVE_USLEEP || HAVE_NAP || HAVE_NAPMS || HAVE_POLL
@@ -279,7 +279,7 @@ extern void *malloc();
  * arguments in argc/argv, and stdin/stdout mapped to the
  * tty device, and stderr mapped to the Taylor logfile, where
  * anything written to stdout will be logged as an error.
- * 
+ *
  */
 int main(argc, argv)
 int argc;
@@ -312,7 +312,7 @@ char *argv[];
 
   /*
    * If the script file argument begins with '/', then we assume
-   * it is an absolute pathname, otherwise, we prepend the 
+   * it is an absolute pathname, otherwise, we prepend the
    * SCRIPT_DIR path.
    */
   *sfname = '\0';		/* Empty name string */
@@ -375,7 +375,7 @@ char *argv[];
   exit(stat);
 }
 
-/* 
+/*
  * deal_script - deallocate a script and all strings it points to
  */
 int deal_script(loc)
@@ -386,34 +386,34 @@ struct script *loc;
    */
   if (loc == (struct script *)NULL)
     return SUCCESS;
-  
+
   /*
    * Deallocate the rest of the script
    */
   deal_script(loc->next);
-  
+
   /*
    * Deallocate the string parameter, if any
    */
   if (loc->strprm != (char *)NULL)
     free(loc->strprm);
-  
+
   /*
    * Deallocate the new state name parameter, if any
    */
   if (loc->newstate != (char *)NULL)
     free(loc->newstate);
-  
+
   /*
    * Deallocate this entry
    */
   free(loc);
-  
+
   return SUCCESS;
 }
 
 
-/* 
+/*
  * read_script
  *
  * Read & compile a script, return pointer to first entry, or null if bad
@@ -428,10 +428,10 @@ struct script *read_script(fd)
   char inpline[MAX_SCLINE];
   char inpcopy[MAX_SCLINE];
   char *c, *cln, *opc, *cp;
-  
+
   /*
    * MAIN COMPILATION LOOP
-   */  
+   */
   while ((c = fgets(inpline, (sizeof inpline - 1), fd)) != (char *)NULL)
     {
       /*
@@ -439,13 +439,13 @@ struct script *read_script(fd)
        */
       if (*c == '#' || *c == '\n')
 	continue;
-      
-      /* 
+
+      /*
        * Get rid of the trailing newline, and copy the string
        */
       inpline[strlen(inpline)-1] = '\0';
       strcpy(inpcopy, inpline);
-      
+
       /*
        * Look for text starting in the first col (a label)
        */
@@ -467,7 +467,7 @@ struct script *read_script(fd)
 	this->newstate = (char *)NULL;
 	c = cln + 1;
       }
-      
+
       /*
        * Now handle the opcode. Fold it to lower case.
        */
@@ -477,14 +477,14 @@ struct script *read_script(fd)
       cp = opc;
       while(*cp)
 	tolower(*cp++);
-      
-      /* 
+
+      /*
        * If we have an opcode but we haven't seen anything
        * else (like a label) yet, i.e., this is the first
-       * entry, and there was no label.  We need to 
+       * entry, and there was no label.  We need to
        * cobble up a label so that read_script is happy
        */
-      if (first == (struct script *)NULL) 
+      if (first == (struct script *)NULL)
 	{
 	  this = (struct script *)malloc (sizeof (struct script));
 	  prev = this;
@@ -496,12 +496,12 @@ struct script *read_script(fd)
 	  this->intprm = 0;
 	  this->newstate = (char *)NULL;
 	}
-      
-      /* 
+
+      /*
        * Find opcode - ndex through the opcode definition table
        */
       for (i=1; sc_opdef[i].opcode != SC_END; i++)
-	if (strcmp(opc, sc_opdef[i].opname) == SAME) 
+	if (strcmp(opc, sc_opdef[i].opname) == SAME)
 	  break;
       if ((sc_opdef[i].opcode) == SC_END)
 	{
@@ -509,7 +509,7 @@ struct script *read_script(fd)
 	  deal_script(first);
 	  return (struct script *)NULL;
         }
-      
+
       /*
        * Found opcode. Allocate a new command node and initialize
        */
@@ -521,8 +521,8 @@ struct script *read_script(fd)
       this->strprm = (char *)NULL;
       this->intprm = 0;
       this->newstate = (char *)NULL;
-      
-      /* 
+
+      /*
        * Pick up new state parameter, if any
        */
       if (sc_opdef[i].newstate == SC_NWST)
@@ -540,7 +540,7 @@ struct script *read_script(fd)
 	      strcpy(this->newstate, c);
 	    }
 	}
-      
+
       /*
        * Pick up the string or integer parameter. Handle missing
        * parameter gracefully.
@@ -572,8 +572,8 @@ struct script *read_script(fd)
 	/*
 	 * STR/XSTR strings.
 	 */
-	case SC_STR:		
-	case SC_XSTR:		
+	case SC_STR:
+	case SC_XSTR:
 	  c = strtok((char *)NULL, CTL_DELIM);
 	  if (c == (char *)NULL)
 	    {
@@ -597,9 +597,9 @@ struct script *read_script(fd)
 
 	  /*
 	   * For XSTR, Translate the string and store its
-	   * length. Note that, after escape sequences are 
-	   * compressed, the resulting string may well be a 
-	   * few bytes shorter than the input string (whose 
+	   * length. Note that, after escape sequences are
+	   * compressed, the resulting string may well be a
+	   * few bytes shorter than the input string (whose
 	   * length was the basis for the malloc above),
 	   * but it will never be longer.
 	   */
@@ -611,10 +611,10 @@ struct script *read_script(fd)
 	  else
 	    strcpy(this->strprm, c);
 	  break;
-	  
+
 	}
     }
-  
+
   /*
    * EOF
    */
@@ -630,23 +630,23 @@ struct script *read_script(fd)
  * Called by read_script(), above.
  *
  * Returns the actual length of the resulting string.  Note that imbedded
- * nulls (specified by \000 in the input) ARE allowed in the result.  
+ * nulls (specified by \000 in the input) ARE allowed in the result.
  */
 xlat_str(out, in)
      char *out, *in;
 {
   register int i = 0, j = 0;
   int byte, k;
-  
-  while (in[i]) 
+
+  while (in[i])
     {
-      if (in[i] != '\\') 
+      if (in[i] != '\\')
 	{
 	  out[j++] = in[i++];
 	}
-      else 
+      else
 	{
-	  switch (in[++i]) 
+	  switch (in[++i])
 	    {
 	    case 'd':		/* EOT */
 	      out[j++] = 0x04;
@@ -682,11 +682,11 @@ xlat_str(out, in)
 	    case '7':
 	      byte = in[i] - '0';
 	      k = 0;
-	      
-	      while (3 > ++k)	
+
+	      while (3 > ++k)
 		if ((in[i+1] < '0') || (in[i+1] > '7'))
 		  break;
-		else 
+		else
 		  {
 		    byte = (byte<<3) + in[i+1] - '0';
 		    ++i;
@@ -698,7 +698,7 @@ xlat_str(out, in)
 	    }
 	  ++i;
 	}
-    } 
+    }
   return j;
 }
 
@@ -711,9 +711,9 @@ struct script *begin;
 char *newstate;
 {
   struct script *here;
-  
+
   for (here=begin; here != (struct script *)NULL; here=here->next) {
-    if (here->opcode == SC_LABEL && 
+    if (here->opcode == SC_LABEL &&
 	strcmp(here->strprm, newstate) == SAME)
       return here;
   }
@@ -721,8 +721,8 @@ char *newstate;
 }
 
 
-/* 
- * do_script() - execute a script 
+/*
+ * do_script() - execute a script
  */
 int do_script(begin)
      struct script *begin;
@@ -734,7 +734,7 @@ int do_script(begin)
   char	*c, chr;
   int	 prmlen;
   int    dbfd;
-  
+
   time_t sc_carrtime = 45000;	/* time to wf carr after dial */
   time_t sc_chrdly   = 100;	/* delay time for ttoslow */
   time_t sc_ptime    = 2000;	/* time to allow for pause char */
@@ -746,118 +746,118 @@ int do_script(begin)
   char   sc_wchar    = 'W';	/* modem wait-for-dialtone character */
   time_t sc_begwait;		/* time at beg of wait */
   time_t sc_secs;		/* timeout period */
-  
+
   int    expcnt;
   int    expin;
   static char expbuf[MAX_EXPCT];
-  
+
   dbgsave = Debug;
   curstate = begin;
-  
-  if (curstate == (struct script *)NULL) 
+
+  if (curstate == (struct script *)NULL)
     return SUCCESS;
-  
+
   _newstate:
-  /* 
+  /*
    * do all of curstate's actions.  Enter with curstate pointing
    * to a label entry
    */
   expin = 0;
-  
+
   for (curscr = curstate->next; /* point to 1st scr after label */
        (curscr != (struct script *)NULL) &&  /* do until end of scr */
        (curscr->opcode != SC_LABEL);		/* or next label */
-       curscr = curscr->next) 
+       curscr = curscr->next)
     {
       expcnt = 0;
-      switch (curscr->opcode) 
+      switch (curscr->opcode)
 	{
 	case SC_LABEL:
 	  logit("Script proc err", curstate->strprm);
 	  return FAIL;
-	  
+
 	case SC_FLSH:
 	  DEBUG(DB_LGII, "Flushing typeahead buffer\n", 0);
 	  ttflui();
 	  break;
-	  
+
 	case SC_CDLY:
 	  sc_chrdly = curscr->intprm;
 	  DEBUG(DB_LGII, "Set chrdly to %d\n", sc_chrdly);
 	  break;
-	  
+
 	case SC_PCHR:
 	  sc_pchar = *(curscr->strprm);
 	  DEBUG(DB_LGII, "Set pause char to %c\n", sc_pchar);
 	  break;
-	  
+
 	case SC_PTIM:
 	  sc_ptime = curscr->intprm;
 	  DEBUG(DB_LGII, "Set pause time to %d\n", sc_ptime);
 	  break;
-	  
+
 	case SC_WCHR:
 	  sc_wchar = *(curscr->strprm);
 	  DEBUG(DB_LGII, "Set wait char to %c\n", sc_wchar);
 	  break;
-	  
+
 	case SC_WTIM:
 	  sc_wtime = curscr->intprm;
 	  DEBUG(DB_LGII, "Set wait time to %d\n", sc_wtime);
 	  break;
-	  
+
 	case SC_ZERO:
 	  sc_counter = 0;
 	  DEBUG(DB_LGII, "Set counter to %d\n", sc_counter);
 	  break;
-	  
+
 	case SC_INCR:
 	  sc_counter++;
 	  DEBUG(DB_LGII, "Incr counter to %d\n", sc_counter);
 	  break;
-	  
+
 	case SC_WAIT:
 	  DEBUG(DB_LGII, "Sleeping %d tenth-secs\n", curscr->intprm);
 	  msleep(curscr->intprm);
 	  break;
-	  
+
 	case SC_DTIM:
 	  sc_dtime = curscr->intprm;
 	  DEBUG(DB_LGII, "Digit time is %d\n", sc_dtime);
 	  break;
-	  
+
 	case SC_CTIM:
 	  sc_carrtime = curscr->intprm;
 	  DEBUG(DB_LGII, "Carrier time is %d\n", sc_carrtime);
 	  break;
-	  
+
 	case SC_EXIT:
 	  Debug = dbgsave;
 	  DEBUG(DB_LGI, "Script ended successfully\n", 0);
 	  return SUCCESS;
-	  
+
 	case SC_FAIL:
 	  Debug = dbgsave;
 	  if (DEBUG_LEVEL(DB_LGI) && dbf != NULL)
 	    fprintf(dbf, "Script failed\n");
 	  else if (expin)
-	    charlog(expbuf, expin, DB_LOG, 
+	    charlog(expbuf, expin, DB_LOG,
 		    "Script failed.  Last received data");
 	  return FAIL;
-	  
+
 	case SC_LOG:
 	  logit(curscr->strprm, "");
 	  break;
-	  
+
 	case SC_LOGE:
 	  logit("ERROR: ", curscr->strprm);
 	  break;
-	  
+
 	case SC_DBOF:
 	  /*
 	   * If the debug file name does not begin with "/", then
 	   * we prepend the LOG_DIR to the string. Then CREATE the
-	   * file. This WIPES OUT previous logs. 
+	   * file. This WIPES OUT previous logs.
 	   */
 	  *dfname = '\0';	/* Zero name string */
 	  if(curscr->strprm[0] != '/')
@@ -877,102 +877,102 @@ int do_script(begin)
 	      return FAIL;
 	    }
 	  break;
-	  
+
 	case SC_DBG:
 	  DEBUG(DB_LGI, "<%s>\n", curscr->strprm);
 	  break;
-	  
+
 	case SC_DBGE:
 	  DEBUG(DB_LGIE, "ERROR: <%s>\n", curscr->strprm);
 	  break;
-	  
+
 	case SC_DBST:
 	  Debug |= curscr->intprm;
 	  DEBUG(DB_LGII, "Debug mask set to %04o (octal)\n", Debug);
 	  break;
-	  
+
 	case SC_DBCL:
 	  Debug &= ~(curscr->intprm);
 	  DEBUG(DB_LGII, "Debug mask set to %04o (octal)\n", Debug);
 	  break;
-	  
+
 	case SC_BRK:
 	  DEBUG(DB_LGI, "Sending break\n", 0);
 	  ttbreak();
 	  break;
-	  
+
 	case SC_HANG:
 	  DEBUG(DB_LGI, "Dropping DTR\n", 0);
 	  tthang();
 	  break;
-	  
+
 	case SC_7BIT:
 	  DEBUG(DB_LGI, "Enabling 7-bit stripping\n", 0);
 	  tt7bit(TRUE);
 	  break;
-	  
+
 	case SC_8BIT:
 	  DEBUG(DB_LGI, "Disabling 7-bit stripping\n", 0);
 	  tt7bit(FALSE);
 	  break;
-	  
+
 	case SC_PNON:
 	  DEBUG(DB_LGI, "Setting 8-bit, no parity\n", 0);
 	  ttpar(NONE);
 	  break;
-	  
+
 	case SC_PEVN:
 	  DEBUG(DB_LGI, "Setting 7-bit, even parity\n", 0);
 	  ttpar(EVEN);
 	  break;
-	  
+
 	case SC_PODD:
 	  DEBUG(DB_LGI, "Setting 7-bit, odd parity\n", 0);
 	  ttpar(ODD);
 	  break;
-	  
+
 	case SC_IFBL:
-	  if (ttblind()) 
+	  if (ttblind())
 	    {
 	      DEBUG(DB_LGI, "Blind mux,\n", 0);
 	      goto _chgstate;
 	    }
 	  break;
-	  
+
 	case SC_IFBG:
-	  if (ttblind() && sc_counter > curscr->intprm) 
+	  if (ttblind() && sc_counter > curscr->intprm)
 	    {
-	      DEBUG(DB_LGI, "Blind mux & ctr > %d\n", 
+	      DEBUG(DB_LGI, "Blind mux & ctr > %d\n",
 		    curscr->intprm);
 	      goto _chgstate;
 	    }
 	  break;
-	  
+
 	case SC_IFGT:
-	  if (sc_counter > curscr->intprm) 
+	  if (sc_counter > curscr->intprm)
 	    {
 	      DEBUG(DB_LGI, "Counter > %d\n", curscr->intprm);
 	      goto _chgstate;
 	    }
 	  break;
-	  
+
 	case SC_GOTO:
 	  _chgstate:
 	  DEBUG(DB_LGI, "Changing to state %s\n",
 		curscr->newstate);
 	  curstate = find_state(begin, curscr->newstate);
-	  if (curstate == NULL) 
+	  if (curstate == NULL)
 	    {
 	      logit("New state not found",
 		    curscr->newstate);
 	      return FAIL;
 	    }
 	  goto _newstate;
-	  
+
 	case SC_SEND:
 	  ttoslow(curscr->strprm, curscr->intprm, sc_chrdly);
 	  break;
-	  
+
 	case SC_TELN:
 	  if (curscr->intprm > paramc - 1)
 	    {
@@ -983,7 +983,7 @@ int do_script(begin)
 	  strcpy(telno, paramv[curscr->intprm]);
 	  DEBUG(DB_LGII, "telno set to %s\n", telno);
 	  break;
-	  
+
 	case SC_SNDP:
 	  if (curscr->intprm > paramc - 1)
 	    {
@@ -994,17 +994,17 @@ int do_script(begin)
 	  prmlen = xlat_str(tempstr, paramv[curscr->intprm]);
 	  ttoslow(tempstr, prmlen, sc_chrdly);
 	  break;
-	  
+
 	case SC_IF1P:
 	  if (curscr->intprm < paramc)
 	    goto _chgstate;
 	  break;
-	  
+
 	case SC_IF0P:
 	  if (curscr->intprm >= paramc)
 	    goto _chgstate;
 	  break;
-	  
+
 	case SC_DIAL:
 	  if(telno[0] == '\0')
 	    {
@@ -1017,17 +1017,17 @@ int do_script(begin)
 	   * changed by the script. See the man page xchat(8) for
 	   * details.
 	   */
-	  sc_dtmo = (sc_dtime+sc_chrdly)*strlen(telno) 
+	  sc_dtmo = (sc_dtime+sc_chrdly)*strlen(telno)
 	    + sc_carrtime;
 	  c=strcpy(tempstr, telno);
-	  for (; *c!='\0'; c++) 
+	  for (; *c!='\0'; c++)
 	    {
-	      if (*c == 'W') 
+	      if (*c == 'W')
 		{
 		  *c = sc_wchar;
 		  sc_dtmo += sc_wtime;
 		}
-	      else if (*c == 'P') 
+	      else if (*c == 'P')
 		{
 		  *c = sc_pchar;
 		  sc_dtmo += sc_ptime;
@@ -1036,7 +1036,7 @@ int do_script(begin)
 	  DEBUG(DB_LGI, "Dialing, default timeout is %d millisecs\n", sc_dtmo);
 	  ttoslow(tempstr, 0, sc_chrdly);
 	  break;
-	  
+
 	case SC_TIMO:	/* these are "expects", don't bother */
 	case SC_XPCT:	/* with them yet, other than noting that */
 	case SC_CARR:	/* they exist */
@@ -1044,107 +1044,107 @@ int do_script(begin)
 	  expcnt++;
 	  break;
 	}
-      
+
     }
-  
+
   /* we've done the current state's actions, now do its expects, if any */
-  
-  if (expcnt == 0) 
+
+  if (expcnt == 0)
     {
-      if (curscr != (struct script *)NULL &&  
-	  (curscr->opcode == SC_LABEL)) 
+      if (curscr != (struct script *)NULL &&
+	  (curscr->opcode == SC_LABEL))
 	{
 	  curstate = curscr;
 	  DEBUG(DB_LGI, "Fell through to state %s\n",
 		curstate->strprm);
 	  goto _newstate;
 	}
-      else 
+      else
 	{
 	  logit("No way out of state", curstate->strprm);
 	  return FAIL;
 	}
     }
-  
+
   time(&sc_begwait);	/* log time at beg of expect */
   DEBUG(DB_LGI, "Doing expects for state %s\n", curstate->strprm);
   charlog((char *)NULL, 0, DB_LGI, "Received");
-  
-  while (1) 
+
+  while (1)
     {
       chr = xgetc(1);		/* Returns upon char input or 1 sec. tmo */
-      
+
       charlog(&chr, 1, DB_LGI, (char *)NULL);
-      
-      if (chr != EOF) 
+
+      if (chr != EOF)
 	{
-	  if (expin < MAX_EXPCT) 
+	  if (expin < MAX_EXPCT)
 	    {
 	      expbuf[expin++] = chr & 0x7f;
 	    }
-	  else 
+	  else
 	    {
 	      strncpy(expbuf, &expbuf[1], MAX_EXPCT-1);
 	      expbuf[MAX_EXPCT-1] = chr & 0x7f;
 	    }
 	}
-      
+
       /* for each entry in the current state... */
-      
-      for (curscr = curstate->next; 
+
+      for (curscr = curstate->next;
 	   (curscr != (struct script *)NULL) &&
 	   (curscr->opcode != SC_LABEL);
-	   curscr = curscr->next) 
+	   curscr = curscr->next)
 	{
-	  
-	  switch (curscr->opcode) 
+
+	  switch (curscr->opcode)
 	    {
 	    case SC_TIMO:
 	      sc_secs = curscr->intprm;
 	      if (sc_secs == 0)
 		sc_secs = sc_dtmo;
 	      sc_secs /= 1000;
-	      if (time(NULL)-sc_begwait > sc_secs) 
+	      if (time(NULL)-sc_begwait > sc_secs)
 		{
 		  DEBUG(DB_LGI,
 			"\nTimed out (%d secs)\n", sc_secs);
 		  goto _chgstate;
 		}
 	      break;
-	      
+
 	    case SC_CARR:
-	      if (ttcd()) 
+	      if (ttcd())
 		{
 		  DEBUG(DB_LGI, "\nGot carrier\n", 0);
 		  goto _chgstate;
 		}
 	      break;
-	      
+
 	    case SC_HUPS:
-	      if (fShangup) 
+	      if (fShangup)
 		{
 		  DEBUG(DB_LGI, "\nGot data set hangup\n", 0);
 		  goto _chgstate;
 		}
 	      break;
-	      
+
 	    case SC_XPCT:
 	      if ((expin >= curscr->intprm) &&
-		  (strncmp(curscr->strprm, 
+		  (strncmp(curscr->strprm,
 			   &expbuf[expin - curscr->intprm],
-			   curscr->intprm) == SAME)) 
+			   curscr->intprm) == SAME))
 		{
 		  charlog(curscr->strprm, curscr->intprm,
 			  DB_LGI, "Matched");
 		  goto _chgstate;
 		}
 	      break;
-	      
+
 	    }
 	}
     }
 }
-	      /* New opcode added by hag@eddie.mit.edu for expecting a 
+	      /* New opcode added by hag@eddie.mit.edu for expecting a
 		 parameter supplied string */
 	     case SC_XPST:
 	      if(curscr->intprm >paramc-1)
@@ -1194,8 +1194,8 @@ static int uhup(isig)
 /*
  * xgetc - get a character with timeout
  *
- * Assumes that stdin is opened on a terminal or TCP socket 
- * with O_NONBLOCK. 
+ * Assumes that stdin is opened on a terminal or TCP socket
+ * with O_NONBLOCK.
  */
 static char xgetc(tmo)
 int tmo;			/* Timeout, seconds */
@@ -1218,7 +1218,7 @@ int tmo;			/* Timeout, seconds */
   return(c);
 }
 
-/* 
+/*
  * Pause for an interval in milliseconds
  */
 void msleep(msec)
@@ -1248,7 +1248,7 @@ long msec;
 
   if(msec == 0)
     return;
-  /* 
+  /*
    * We need to pass an unused pollfd structure because poll checks
    * the address before checking the number of elements.
    */
@@ -1289,7 +1289,7 @@ char *msg1, *msg2;
  *
  * SPECIAL CASE: msg=NULL, len=1 and msg[0]='\377' gets logged
  *               when read does its 1 sec. timeout. Log "<1 sec.>"
- *               so user can see elapsed time 
+ *               so user can see elapsed time
  */
 static void charlog(buf, len, mask, msg)
 char *buf;
@@ -1344,21 +1344,21 @@ int sig;
   return;
 }
 
-/* 
+/*
  * ttoslow() - Send characters with pacing delays
  */
 static void ttoslow(s, len, delay)
-     char *s; 
+     char *s;
      int len;
-     time_t delay; 
+     time_t delay;
 {
   int i;
-  
+
   if (len == 0)
     len = strlen(s);
-  
+
   charlog (s, len, DB_LGI, "Sending slowly");
-  
+
   for (i = 0; i < len; i++, s++)
     {
       write(1, s, 1);
diff --git a/gnu/libexec/uucp/cu/cu.c b/gnu/libexec/uucp/cu/cu.c
index 54516b62dd34..bc318c69ff43 100644
--- a/gnu/libexec/uucp/cu/cu.c
+++ b/gnu/libexec/uucp/cu/cu.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char cu_rcsid[] = "$Id: cu.c,v 1.2 1994/05/07 18:09:54 ache Exp $";
+const char cu_rcsid[] = "$Id: cu.c,v 1.3 1994/10/02 23:10:39 ache Exp $";
 #endif
 
 #include "cu.h"
@@ -1047,7 +1047,7 @@ fcudo_cmd (puuconf, qconn, bcmd)
 	  case '|': t = SHELL_STDIN_FROM_PORT; break;
 	  case '+': t = SHELL_STDIO_ON_PORT; break;
 	  }
-	  
+
 	(void) fsysdep_shell (qconn, zline, t);
       }
       if (! fsysdep_cu_copy (TRUE)
@@ -1098,7 +1098,7 @@ fcudo_cmd (puuconf, qconn, bcmd)
 	ucuabort ();
       fCurestore_terminal = TRUE;
       return TRUE;
-      
+
     case 's':
       fret = fcuset_var (puuconf, zline);
       ubuffree (zline);
@@ -1883,7 +1883,7 @@ icutake (puuconf, argc, argv, pvar, pinfo)
 	     the future.  */
 	  afSignal[INDEXSIG_SIGINT] = FALSE;
 	  break;
-	}	
+	}
 
       b = breceive_char (qconn, cCuvar_timeout, TRUE);
       if (b == -2)
@@ -2055,7 +2055,7 @@ fcusend_buf (qconn, zbufarg, cbufarg)
 	      *zput++ = *zget;
 	    }
 	}
-		
+
       zbuf += csend;
       cbuf -= csend;
 
diff --git a/gnu/libexec/uucp/libunix/cohtty.c b/gnu/libexec/uucp/libunix/cohtty.c
index 5a52df91e57c..5db3fe7b0657 100644
--- a/gnu/libexec/uucp/libunix/cohtty.c
+++ b/gnu/libexec/uucp/libunix/cohtty.c
@@ -3,7 +3,7 @@
    lightly edited by Ian Lance Taylor.  */
 
 /* The bottom part of this file is lock.c.
- * This is a hacked lock.c. A full lock.c can be found in the libmisc sources 
+ * This is a hacked lock.c. A full lock.c can be found in the libmisc sources
  * under /usr/src/misc.tar.Z.
  *
  * These are for checking for the existence of locks:
@@ -146,7 +146,7 @@ char enable_device[16];			/* this will hold our device name
 				return TRUE;
 			}else{
 				/* device not enabled */
-				return TRUE;	
+				return TRUE;
 			}
 		}
 	}
@@ -192,7 +192,7 @@ char *buff;
 {
 	struct stat sbuf;
 	int status;
-	
+
 	if (0 != (status = stat(path, &sbuf))) {
 		/* Can't stat the file.  */
 		return (NULL);
diff --git a/gnu/libexec/uucp/libunix/cusub.c b/gnu/libexec/uucp/libunix/cusub.c
index bf947a8ee8ef..3486c710f08f 100644
--- a/gnu/libexec/uucp/libunix/cusub.c
+++ b/gnu/libexec/uucp/libunix/cusub.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char cusub_rcsid[] = "$Id: cusub.c,v 1.19 1994/01/30 21:09:20 ian Rel $";
+const char cusub_rcsid[] = "$Id: cusub.c,v 1.2 1994/05/07 18:10:14 ache Exp $";
 #endif
 
 #include "uudefs.h"
@@ -410,7 +410,7 @@ cscu_escape (pbcmd, zlocalname)
       usysdep_start_catch ();
       alarm (1);
     }
-      
+
   c = 0;
 
   while (TRUE)
@@ -426,7 +426,7 @@ cscu_escape (pbcmd, zlocalname)
 	  b = ']';
 	  write (1, &b, 1);
 	}
-	  
+
       if (c <= 0)
 	c = read (0, pbcmd, 1);
       if (c >= 0 || errno != EINTR)
@@ -437,7 +437,7 @@ cscu_escape (pbcmd, zlocalname)
 	  return c;
 	}
     }
-}  
+}
 
 /* A SIGALRM handler which does nothing but send a signal to the child
    process and schedule another alarm.  POSIX.1 permits kill and alarm
@@ -715,7 +715,7 @@ uscu_child (qconn, opipe)
 	      cwrite -= c;
 	      zbuf += c;
 	    }
-	}	    
+	}
       else
 	{
 	  /* On some systems apparently read will return 0 until
@@ -788,7 +788,7 @@ fsysdep_terminal_raw (flocalecho)
     }
 
   fSterm = TRUE;
-  
+
   sSterm_new = sSterm_orig;
 
 #if HAVE_BSD_TTY
@@ -1158,7 +1158,7 @@ fsysdep_shell (qconn, zcmd, tcmd)
     aidescs[0] = oread;
   if (tcmd == SHELL_STDOUT_TO_PORT || tcmd == SHELL_STDIO_ON_PORT)
     aidescs[1] = owrite;
-    
+
   ipid = ixsspawn (azargs, aidescs, FALSE, TRUE, (const char *) NULL,
 		   FALSE, FALSE, (const char *) NULL,
 		   (const char *) NULL, (const char *) NULL);
diff --git a/gnu/libexec/uucp/libunix/cwd.c b/gnu/libexec/uucp/libunix/cwd.c
index 71d05d11f545..486105a8da1f 100644
--- a/gnu/libexec/uucp/libunix/cwd.c
+++ b/gnu/libexec/uucp/libunix/cwd.c
@@ -37,7 +37,7 @@ zsysdep_local_file_cwd (zfile, zpubdir, pfbadname)
     return zsysdep_local_file (zfile, zpubdir, pfbadname);
   else
     return zsysdep_add_cwd (zfile);
-}      
+}
 
 /* Add the current working directory to a remote file name.  */
 
diff --git a/gnu/libexec/uucp/libunix/detach.c b/gnu/libexec/uucp/libunix/detach.c
index 9b505af499cc..3a21b8a4d23c 100644
--- a/gnu/libexec/uucp/libunix/detach.c
+++ b/gnu/libexec/uucp/libunix/detach.c
@@ -38,7 +38,7 @@
 #ifdef TIOCNOTTY
 #define HAVE_TIOCNOTTY 1
 #else
-#define HAVE_TIOCNOTTY 0 
+#define HAVE_TIOCNOTTY 0
 #endif
 
 #if HAVE_FCNTL_H
diff --git a/gnu/libexec/uucp/libunix/dup2.c b/gnu/libexec/uucp/libunix/dup2.c
index d1454205125b..8446163992c8 100644
--- a/gnu/libexec/uucp/libunix/dup2.c
+++ b/gnu/libexec/uucp/libunix/dup2.c
@@ -47,7 +47,7 @@ dup2 (oold, onew)
   if (oold == onew)
     return onew;
   (void) close (onew);
-  
+
 #ifdef F_DUPFD
   return fcntl (oold, F_DUPFD, onew);
 #else
diff --git a/gnu/libexec/uucp/libunix/epopen.c b/gnu/libexec/uucp/libunix/epopen.c
index 8c1f5cd0d854..0ab9725f4014 100644
--- a/gnu/libexec/uucp/libunix/epopen.c
+++ b/gnu/libexec/uucp/libunix/epopen.c
@@ -78,7 +78,7 @@ espopen (pazargs, frd, pipid)
       errno = ierr;
       return NULL;
     }
-    
+
   *pipid = ipid;
 
   return eret;
diff --git a/gnu/libexec/uucp/libunix/filnam.c b/gnu/libexec/uucp/libunix/filnam.c
index 0b234c06dcca..7dd6626cbbb6 100644
--- a/gnu/libexec/uucp/libunix/filnam.c
+++ b/gnu/libexec/uucp/libunix/filnam.c
@@ -329,7 +329,7 @@ zsysdep_data_file_name (qsys, zlocalname, bgrade, fxqt, ztname, zdname,
      char *zdname;
      char *zxname;
 {
-  return zsfile_name ('D', qsys->uuconf_zname, zlocalname, bgrade, fxqt, 
+  return zsfile_name ('D', qsys->uuconf_zname, zlocalname, bgrade, fxqt,
 		      ztname, zdname, zxname);
 }
 
diff --git a/gnu/libexec/uucp/libunix/fsusg.c b/gnu/libexec/uucp/libunix/fsusg.c
index 50c155336754..cee1ff0036ce 100644
--- a/gnu/libexec/uucp/libunix/fsusg.c
+++ b/gnu/libexec/uucp/libunix/fsusg.c
@@ -188,7 +188,7 @@ get_fs_usage (path, disk, fsp)
   long cfree_blocks, ctotal_blocks;
   char *zpath;
   char *zslash;
-    
+
   zpath = zbufcpy (path);
   while ((o = open (zpath, O_RDONLY, 0)) == -1
 	 && errno == ENOENT)
@@ -247,7 +247,7 @@ get_fs_usage (path, disk, fsp)
   fsp->fsu_blocks = ctotal_blocks;
   fsp->fsu_bfree = cfree_blocks;
   fsp->fsu_bavail = cfree_blocks;
-    
+
   /* QNX has no limit on the number of inodes.  Most inodes are stored
      directly in the directory entry. */
   fsp->fsu_files = -1;
diff --git a/gnu/libexec/uucp/libunix/getcwd.c b/gnu/libexec/uucp/libunix/getcwd.c
index d3623bd2cd82..da53b566ebea 100644
--- a/gnu/libexec/uucp/libunix/getcwd.c
+++ b/gnu/libexec/uucp/libunix/getcwd.c
@@ -48,7 +48,7 @@ getcwd (zbuf, cbuf)
 	  cread = 0;
 	}
     }
-  
+
   if (cread == 0)
     {
       errno = ierr;
diff --git a/gnu/libexec/uucp/libunix/isfork.c b/gnu/libexec/uucp/libunix/isfork.c
index f067d07552cd..f28d65ff1679 100644
--- a/gnu/libexec/uucp/libunix/isfork.c
+++ b/gnu/libexec/uucp/libunix/isfork.c
@@ -1,4 +1,4 @@
-/* isfork.c 
+/* isfork.c
    Retry fork several times before giving up.  */
 
 #include "uucp.h"
diff --git a/gnu/libexec/uucp/libunix/iswait.c b/gnu/libexec/uucp/libunix/iswait.c
index aa855151c926..361443ad9420 100644
--- a/gnu/libexec/uucp/libunix/iswait.c
+++ b/gnu/libexec/uucp/libunix/iswait.c
@@ -134,7 +134,7 @@ ixswait (ipid, zreport)
 	}
     }
 #endif /* ! HAVE_WAIT4 */
-#endif /* ! HAVE_WAITPID */  
+#endif /* ! HAVE_WAITPID */
 
   DEBUG_MESSAGE2 (DEBUG_EXECUTE, "%s %d",
 		  WIFEXITED (istat) ? "Exit status" : "Signal",
diff --git a/gnu/libexec/uucp/libunix/locfil.c b/gnu/libexec/uucp/libunix/locfil.c
index 1c4db66520a6..4e0a5f9b8eb8 100644
--- a/gnu/libexec/uucp/libunix/locfil.c
+++ b/gnu/libexec/uucp/libunix/locfil.c
@@ -77,7 +77,7 @@ zsysdep_local_file (zfile, zpubdir, pfbadname)
 	  zcopy = zbufalc (cuserlen + 1);
 	  memcpy (zcopy, zfile, cuserlen);
 	  zcopy[cuserlen] = '\0';
-      
+
 	  q = getpwnam (zcopy);
 	  if (q == NULL)
 	    {
diff --git a/gnu/libexec/uucp/libunix/lock.c b/gnu/libexec/uucp/libunix/lock.c
index 73ce976feda6..ad52af83953f 100644
--- a/gnu/libexec/uucp/libunix/lock.c
+++ b/gnu/libexec/uucp/libunix/lock.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char lock_rcsid[] = "$Id: lock.c,v 1.15 1994/01/30 21:09:20 ian Rel $";
+const char lock_rcsid[] = "$Id: lock.c,v 1.2 1994/05/07 18:10:40 ache Exp $";
 #endif
 
 #include "uudefs.h"
@@ -620,7 +620,7 @@ fsqnx_stale (ipid, inme, inid, pferr)
       /* Use the local pid of the local process manager. */
       ivid = PROC_PID;
     }
-        
+
   /* Request the process information. */
   ifound_pid = qnx_psinfo (ivid /* process manager handling request */,
 			   ipid /* get info on this process */,
@@ -636,7 +636,7 @@ fsqnx_stale (ipid, inme, inid, pferr)
 	    strerror (errno));
     errno = isaved_errno;
   }
-          
+
   /* If the returned pid matches then the process still holds the lock. */
   if ((ifound_pid == ipid) && (spsdata.pid == ipid))
     return FALSE;
diff --git a/gnu/libexec/uucp/libunix/opensr.c b/gnu/libexec/uucp/libunix/opensr.c
index 15cd5cd13601..c9e531af4724 100644
--- a/gnu/libexec/uucp/libunix/opensr.c
+++ b/gnu/libexec/uucp/libunix/opensr.c
@@ -75,7 +75,7 @@ esysdep_open_send (qsys, zfile, fcheck, zuser)
   struct stat s;
   openfile_t e;
   int o;
-  
+
   if (fsysdep_directory (zfile))
     {
       ulog (LOG_ERROR, "%s: is a directory", zfile);
@@ -148,7 +148,7 @@ zsysdep_receive_temp (qsys, zto, ztemp, frestart)
     return zsappend3 (".Temp", qsys->uuconf_zname, ztemp);
   else
     return zstemp_file (qsys);
-}  
+}
 
 /* The number of seconds in one week.  We must cast to long for this
    to be calculated correctly on a machine with 16 bit ints.  */
diff --git a/gnu/libexec/uucp/libunix/picksb.c b/gnu/libexec/uucp/libunix/picksb.c
index 4fbd965968b5..25b1c4e8d6a6 100644
--- a/gnu/libexec/uucp/libunix/picksb.c
+++ b/gnu/libexec/uucp/libunix/picksb.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char picksb_rcsid[] = "$Id: picksb.c,v 1.8 1994/01/30 21:09:20 ian Rel $";
+const char picksb_rcsid[] = "$Id: picksb.c,v 1.2 1994/05/07 18:10:54 ache Exp $";
 #endif
 
 #include "uudefs.h"
@@ -219,7 +219,7 @@ zsysdep_uupick_local_file (zfile, pfbadname)
   if (zfile[0] != '~'
       || (zfile[1] != '/' && zfile[1] != '\0'))
     return zsysdep_local_file_cwd (zfile, (const char *) NULL, pfbadname);
-  
+
   q = getpwuid (getuid ());
   if (q == NULL)
     {
diff --git a/gnu/libexec/uucp/libunix/seq.c b/gnu/libexec/uucp/libunix/seq.c
index 5188510b6128..bd2cef82f92b 100644
--- a/gnu/libexec/uucp/libunix/seq.c
+++ b/gnu/libexec/uucp/libunix/seq.c
@@ -68,7 +68,7 @@ ixsysdep_get_sequence (qsys)
 	  ubuffree (zname);
 	  return -1;
 	}
-    
+
       e = fopen (zname, "r+");
       if (e == NULL)
 	{
diff --git a/gnu/libexec/uucp/libunix/serial.c b/gnu/libexec/uucp/libunix/serial.c
index 4bee3bf4d7fb..ae0a943bcb2a 100644
--- a/gnu/libexec/uucp/libunix/serial.c
+++ b/gnu/libexec/uucp/libunix/serial.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char serial_rcsid[] = "$Id: serial.c,v 1.56 1994/04/13 01:57:05 ian Rel $";
+const char serial_rcsid[] = "$Id: serial.c,v 1.4 1994/05/07 18:11:09 ache Exp $";
 #endif
 
 #include "uudefs.h"
@@ -860,7 +860,7 @@ fsserial_unlock (qconn)
 	}
       qsysdep->o = -1;
     }
-    
+
   if (! fsserial_lockfile (FALSE, qconn))
     fret = FALSE;
 
@@ -1748,7 +1748,7 @@ fsmodem_carrier (qconn, fcarrier)
 	return FALSE;
 
 #ifdef TIOCNCAR
-      /* Tell the modem to ignore carrier.  */ 
+      /* Tell the modem to ignore carrier.  */
       if (ioctl (q->o, TIOCNCAR, 0) < 0)
 	{
 	  ulog (LOG_ERROR, "ioctl (TIOCNCAR): %s", strerror (errno));
@@ -1782,19 +1782,19 @@ fsmodem_carrier (qconn, fcarrier)
 	  ulog (LOG_ERROR, "Can't set CLOCAL: %s", strerror (errno));
 	  return FALSE;
 	}
-  
+
 #if HAVE_CLOCAL_BUG
       /* On SCO and AT&T UNIX PC you have to reopen the port.  */
       {
 	int onew;
- 
+
 	onew = open (q->zdevice, O_RDWR);
 	if (onew < 0)
 	  {
 	    ulog (LOG_ERROR, "open (%s): %s", q->zdevice, strerror (errno));
 	    return FALSE;
 	  }
- 
+
 	if (fcntl (onew, F_SETFD,
 		   fcntl (onew, F_GETFD, 0) | FD_CLOEXEC) < 0)
 	  {
@@ -2001,7 +2001,7 @@ fsysdep_modem_end_dial (qconn, qdial)
 	 errors.  */
       {
 	int onew;
- 
+
 	onew = open (q->zdevice, O_RDWR);
 	if (onew >= 0)
 	  {
@@ -2039,7 +2039,7 @@ fsysdep_modem_end_dial (qconn, qdial)
 #endif /* ! defined (TIOCWONLINE) */
     }
 
-  return TRUE; 
+  return TRUE;
 }
 
 /* Read data from a connection, with a timeout.  This routine handles
@@ -2768,7 +2768,7 @@ fsysdep_conn_io (qconn, zwrite, pcwrite, zread, pcread)
 	      /* We got interrupted by a signal.  Log it.  */
 	      ulog (LOG_ERROR, (const char *) NULL);
 	    }
-	  
+
 	  if (cdid < 0)
 	    {
 	      ulog (LOG_ERROR, "write: %s", strerror (errno));
@@ -2937,7 +2937,7 @@ fsserial_set (qconn, tparity, tstrip, txonxoff)
       /* Not supported.  */
       break;
     }
-	  
+
   if (fdo)
     {
       if ((q->snew.c_cflag & iset) != iset
@@ -2973,7 +2973,7 @@ fsserial_set (qconn, tparity, tstrip, txonxoff)
   }
 #endif
 
-#else /* ! HAVE_BSD_TTY */      
+#else /* ! HAVE_BSD_TTY */
 
   fdo = FALSE;
   switch (tstrip)
diff --git a/gnu/libexec/uucp/libunix/spawn.c b/gnu/libexec/uucp/libunix/spawn.c
index 67b915fc66a1..a56fd84ebe3f 100644
--- a/gnu/libexec/uucp/libunix/spawn.c
+++ b/gnu/libexec/uucp/libunix/spawn.c
@@ -147,7 +147,7 @@ ixsspawn (pazargs, aidescs, fkeepuid, fkeepenv, zchdir, fnosigs, fshell,
       zspace = azenv[0] + sizeof "PATH=" - 1;
       while ((zspace = strchr (zspace, ' ')) != NULL)
 	*zspace = ':';
-    
+
       azenv[1] = zbufalc (sizeof "HOME=" + strlen (zSspooldir));
       sprintf (azenv[1], "HOME=%s", zSspooldir);
 
@@ -158,7 +158,7 @@ ixsspawn (pazargs, aidescs, fkeepuid, fkeepenv, zchdir, fnosigs, fshell,
       sprintf (azenv[2], "TERM=%s", zterm);
 
       azenv[3] = zbufcpy ("SHELL=/bin/sh");
-  
+
       azenv[4] = zbufalc (sizeof "USER=" + strlen (OWNER));
       sprintf (azenv[4], "USER=%s", OWNER);
 
@@ -275,7 +275,7 @@ ixsspawn (pazargs, aidescs, fkeepuid, fkeepenv, zchdir, fnosigs, fshell,
 	      ierr = errno;
 	      ferr = TRUE;
 	      break;
-	    }	      
+	    }
 	}
     }
 
@@ -406,7 +406,7 @@ ixsspawn (pazargs, aidescs, fkeepuid, fkeepenv, zchdir, fnosigs, fshell,
     {
       char *zto;
       const char *azshargs[4];
-      
+
       pazargs[0] = zcmd;
       zto = zshcmd;
       for (i = 0; pazargs[i] != NULL; i++)
diff --git a/gnu/libexec/uucp/libunix/spool.c b/gnu/libexec/uucp/libunix/spool.c
index 2244f0365613..4eb37029dee3 100644
--- a/gnu/libexec/uucp/libunix/spool.c
+++ b/gnu/libexec/uucp/libunix/spool.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char spool_rcsid[] = "$Id: spool.c,v 1.8 1994/01/30 21:09:20 ian Rel $";
+const char spool_rcsid[] = "$Id: spool.c,v 1.2 1994/05/07 18:11:24 ache Exp $";
 #endif
 
 #include "uudefs.h"
@@ -287,7 +287,7 @@ zsfind_file (zsimple, zsystem, bgrade)
       {
 	size_t c;
 	boolean ftruncated;
-      
+
 	/* D.LOCAL in D.LOCAL/, others in D./.  If BSD43, D.LOCALX in
 	   D.LOCALX/.  */
 	ftruncated = TRUE;
@@ -336,7 +336,7 @@ zsfind_file (zsimple, zsystem, bgrade)
 	char *zfree;
 	const char *zdir;
 	char *zret;
-      
+
 	/* D.LOCALX in D.LOCALX/, D.LOCAL in D.LOCAL/, others in D./.  */
 	ftruncated = TRUE;
 	if (strncmp (zsimple + 2, zSlocalname, strlen (zSlocalname)) == 0)
@@ -380,7 +380,7 @@ zsfind_file (zsimple, zsystem, bgrade)
 	    zfree = NULL;
 	    zdir = "D.";
 	  }
-      
+
 	zret = zsappend4 ("sys",
 			  (fsultrix_has_spool (zsystem)
 			   ? zsystem
diff --git a/gnu/libexec/uucp/libunix/srmdir.c b/gnu/libexec/uucp/libunix/srmdir.c
index 6110b003fc25..7dcaa0715413 100644
--- a/gnu/libexec/uucp/libunix/srmdir.c
+++ b/gnu/libexec/uucp/libunix/srmdir.c
@@ -69,7 +69,7 @@ fsysdep_rmdir (zdir)
   while (q != NULL)
     {
       struct sdirlist *qnext;
-      
+
       if (rmdir (q->zdir) != 0)
 	{
 	  ulog (LOG_ERROR, "rmdir (%s): %s", q->zdir, strerror (errno));
diff --git a/gnu/libexec/uucp/libunix/wldcrd.c b/gnu/libexec/uucp/libunix/wldcrd.c
index 13faa29b9c43..961ea31dd80e 100644
--- a/gnu/libexec/uucp/libunix/wldcrd.c
+++ b/gnu/libexec/uucp/libunix/wldcrd.c
@@ -167,7 +167,7 @@ zsysdep_wildcard (zfile)
   zret = zbufcpy (sSglob.gl_pathv[iSglob]);
   ++iSglob;
   return zret;
-  
+
 #else /* ! HAVE_GLOB */
 
   char *zret;
diff --git a/gnu/libexec/uucp/libunix/work.c b/gnu/libexec/uucp/libunix/work.c
index 0381c20d6601..04a036ccaab6 100644
--- a/gnu/libexec/uucp/libunix/work.c
+++ b/gnu/libexec/uucp/libunix/work.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char work_rcsid[] = "$Id: work.c,v 1.15 1994/01/30 21:09:20 ian Rel $";
+const char work_rcsid[] = "$Id: work.c,v 1.2 1994/05/07 18:11:41 ache Exp $";
 #endif
 
 #include "uudefs.h"
@@ -506,7 +506,7 @@ fsysdep_get_work (qsys, bgrade, qcmd)
 		}
 	    }
 	  while (e == NULL);
-	  
+
 	  qfile = (struct ssfile *) xmalloc (sizeof (struct ssfile));
 	  callocated = CFILELINES;
 	  iline = 0;
@@ -561,7 +561,7 @@ fsysdep_get_work (qsys, bgrade, qcmd)
       while (TRUE)
 	{
 	  int iline;
-	  
+
 	  if (qSwork_file->cdid >= qSwork_file->clines)
 	    {
 	      /* We don't want to free qSwork_file here, since it must
@@ -628,7 +628,7 @@ fsysdep_did_work (pseq)
   struct ssfile *qfile;
   struct ssline *qline;
   int i;
-  
+
   qline = (struct ssline *) pseq;
 
   ubuffree (qline->zline);
@@ -745,7 +745,7 @@ zsysdep_save_temp_file (pseq)
       ubuffree (zto);
       return "Could not move file to preservation directory";
     }
-    
+
   cwant = sizeof "File saved as\n\t/" + strlen (zSspooldir) + strlen (zto);
   if (cwant > cbuf)
     {
diff --git a/gnu/libexec/uucp/libunix/xqtfil.c b/gnu/libexec/uucp/libunix/xqtfil.c
index d0ca75779326..69e70db8323a 100644
--- a/gnu/libexec/uucp/libunix/xqtfil.c
+++ b/gnu/libexec/uucp/libunix/xqtfil.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char xqtfil_rcsid[] = "$Id: xqtfil.c,v 1.7 1994/01/30 21:09:20 ian Rel $";
+const char xqtfil_rcsid[] = "$Id: xqtfil.c,v 1.2 1994/05/07 18:11:42 ache Exp $";
 #endif
 
 #include "uudefs.h"
@@ -220,7 +220,7 @@ zsysdep_get_xqt (pzsystem, pferr)
 #endif
 	  return zret;
 	}
-	    
+
       /* If we've reached the end of the directory, then if we are
 	 using subdirectories loop around to read the next one,
 	 otherwise we are finished.  */
diff --git a/gnu/libexec/uucp/libunix/xqtsub.c b/gnu/libexec/uucp/libunix/xqtsub.c
index 62f4e8937702..df84654ecb10 100644
--- a/gnu/libexec/uucp/libunix/xqtsub.c
+++ b/gnu/libexec/uucp/libunix/xqtsub.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char xqtsub_rcsid[] = "$Id: xqtsub.c,v 1.14 1994/01/30 21:09:20 ian Rel $";
+const char xqtsub_rcsid[] = "$Id: xqtsub.c,v 1.2 1994/05/07 18:11:43 ache Exp $";
 #endif
 
 #include "uudefs.h"
@@ -263,9 +263,9 @@ fsysdep_execute (qsys, zuser, pazargs, zfullcmd, zinput, zoutput,
 	{
 	  ulog (LOG_ERROR, "fcntl (FD_CLOEXEC): %s", strerror (errno));
 	  ferr = TRUE;
-	}	
+	}
     }
-  
+
   if (! ferr && zoutput != NULL)
     {
       aidescs[1] = creat ((char *) zoutput, IPRIVATE_FILE_MODE);
@@ -280,7 +280,7 @@ fsysdep_execute (qsys, zuser, pazargs, zfullcmd, zinput, zoutput,
 	{
 	  ulog (LOG_ERROR, "fcntl (FD_CLOEXEC): %s", strerror (errno));
 	  ferr = TRUE;
-	}	
+	}
     }
 
   if (! ferr)
@@ -312,7 +312,7 @@ fsysdep_execute (qsys, zuser, pazargs, zfullcmd, zinput, zoutput,
 	{
 	  ulog (LOG_ERROR, "fcntl (FD_CLOEXEC): %s", strerror (errno));
 	  ferr = TRUE;
-	}	
+	}
     }
 
   if (iseq == 0)
@@ -658,7 +658,7 @@ fsysdep_move_uuxqt_files (cfiles, pzfrom, pzto, fto, iseq, pzinput)
       if (! fto)
 	{
 	  const char *ztemp;
-	  
+
 	  ztemp = zfrom;
 	  zfrom = zto;
 	  zto = ztemp;
diff --git a/gnu/libexec/uucp/libuuconf/bool.c b/gnu/libexec/uucp/libuuconf/bool.c
index 73072a3e6c6f..f05c0fa411cf 100644
--- a/gnu/libexec/uucp/libuuconf/bool.c
+++ b/gnu/libexec/uucp/libuuconf/bool.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_bool_rcsid[] = "$Id: bool.c,v 1.3 1994/01/30 21:14:29 ian Rel $";
+const char _uuconf_bool_rcsid[] = "$Id: bool.c,v 1.2 1994/05/07 18:11:58 ache Exp $";
 #endif
 
 /* Parse a boolean string into a variable.  This is called by
@@ -61,4 +61,4 @@ _uuconf_iboolean (qglobal, zval, pi)
     }
 
   return UUCONF_CMDTABRET_CONTINUE;
-}		    
+}
diff --git a/gnu/libexec/uucp/libuuconf/callin.c b/gnu/libexec/uucp/libuuconf/callin.c
index fd58b18f98ff..017a0bb9a319 100644
--- a/gnu/libexec/uucp/libuuconf/callin.c
+++ b/gnu/libexec/uucp/libuuconf/callin.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_callin_rcsid[] = "$Id: callin.c,v 1.8 1994/03/29 01:18:20 ian Rel $";
+const char _uuconf_callin_rcsid[] = "$Id: callin.c,v 1.2 1994/05/07 18:11:58 ache Exp $";
 #endif
 
 #include <errno.h>
@@ -122,7 +122,7 @@ uuconf_callin (pglobal, pcmpfn, pinfo)
 	      zcolon = strchr (zcolon, ':');
 	      if (zcolon != NULL)
 		*zcolon = ' ';
-	    }		  
+	    }
 	  iret = uuconf_cmd_line (pglobal, zline, as, (pointer) &s,
 				  ipcheck, 0, (pointer) NULL);
 	  if ((iret & UUCONF_CMDTABRET_EXIT) != 0)
diff --git a/gnu/libexec/uucp/libuuconf/calout.c b/gnu/libexec/uucp/libuuconf/calout.c
index 4f893946f336..0cfb302674b4 100644
--- a/gnu/libexec/uucp/libuuconf/calout.c
+++ b/gnu/libexec/uucp/libuuconf/calout.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_calout_rcsid[] = "$Id: calout.c,v 1.4 1994/01/30 21:14:29 ian Rel $";
+const char _uuconf_calout_rcsid[] = "$Id: calout.c,v 1.2 1994/05/07 18:12:00 ache Exp $";
 #endif
 
 #include <errno.h>
@@ -61,7 +61,7 @@ uuconf_callout (pglobal, qsys, pzlog, pzpass)
       || (qsys->uuconf_zcall_password != NULL
 	  && strcmp (qsys->uuconf_zcall_password, "*") == 0))
     return UUCONF_NOT_FOUND;
-      
+
   if (qsys->uuconf_zcall_login != NULL)
     {
       *pzlog = strdup (qsys->uuconf_zcall_login);
diff --git a/gnu/libexec/uucp/libuuconf/cmdarg.c b/gnu/libexec/uucp/libuuconf/cmdarg.c
index e08c499c73fa..ff4a80ee0e9f 100644
--- a/gnu/libexec/uucp/libuuconf/cmdarg.c
+++ b/gnu/libexec/uucp/libuuconf/cmdarg.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_cmdarg_rcsid[] = "$Id: cmdarg.c,v 1.4 1994/01/30 21:14:29 ian Rel $";
+const char _uuconf_cmdarg_rcsid[] = "$Id: cmdarg.c,v 1.2 1994/05/07 18:12:02 ache Exp $";
 #endif
 
 #include <ctype.h>
@@ -141,7 +141,7 @@ uuconf_cmd_args (pglobal, cargs, pzargs, qtab, pinfo, pfiunknown, iflags,
 	{
 	  char ***ppz = (char ***) q->uuconf_pvar;
 	  int iret;
-	  
+
 	  *ppz = NULL;
 	  iret = _uuconf_iadd_string (qglobal, (char *) NULL, FALSE, FALSE,
 				      ppz, pblock);
diff --git a/gnu/libexec/uucp/libuuconf/errstr.c b/gnu/libexec/uucp/libuuconf/errstr.c
index 40c97e81b95b..94e179e9b172 100644
--- a/gnu/libexec/uucp/libuuconf/errstr.c
+++ b/gnu/libexec/uucp/libuuconf/errstr.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_errstr_rcsid[] = "$Id: errstr.c,v 1.3 1994/01/30 21:14:29 ian Rel $";
+const char _uuconf_errstr_rcsid[] = "$Id: errstr.c,v 1.2 1994/05/07 18:12:12 ache Exp $";
 #endif
 
 static char *zeprint_num P((char *zbuf, size_t cbuf, int ival));
@@ -177,7 +177,7 @@ uuconf_error_string (pglobal, ierr, zbuf, cbuf)
 	  --cbuf;
 	}
     }
-      
+
   if (cbuf > 0 && cfile > 0)
     {
       *zbuf++ = ' ';
diff --git a/gnu/libexec/uucp/libuuconf/hdial.c b/gnu/libexec/uucp/libuuconf/hdial.c
index 909bdb222219..85777d7b379e 100644
--- a/gnu/libexec/uucp/libuuconf/hdial.c
+++ b/gnu/libexec/uucp/libuuconf/hdial.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_hdial_rcsid[] = "$Id: hdial.c,v 1.4 1994/01/30 21:14:29 ian Rel $";
+const char _uuconf_hdial_rcsid[] = "$Id: hdial.c,v 1.2 1994/05/07 18:12:20 ache Exp $";
 #endif
 
 #include <errno.h>
@@ -133,7 +133,7 @@ uuconf_hdb_dialer_info (pglobal, zname, qdialer)
 		  bnext = *zsubs;
 		  while (bnext != '\0')
 		    {
-		      if (bnext == '=') 
+		      if (bnext == '=')
 			qdialer->uuconf_zdialtone = zsubs + 1;
 		      else if (bnext == '-')
 			qdialer->uuconf_zpause = zsubs + 1;
diff --git a/gnu/libexec/uucp/libuuconf/hdnams.c b/gnu/libexec/uucp/libuuconf/hdnams.c
index 5051a7fbe9c8..480c50da1d50 100644
--- a/gnu/libexec/uucp/libuuconf/hdnams.c
+++ b/gnu/libexec/uucp/libuuconf/hdnams.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_hdnams_rcsid[] = "$Id: hdnams.c,v 1.4 1994/01/30 21:14:29 ian Rel $";
+const char _uuconf_hdnams_rcsid[] = "$Id: hdnams.c,v 1.2 1994/05/07 18:12:21 ache Exp $";
 #endif
 
 #include <errno.h>
@@ -65,7 +65,7 @@ uuconf_hdb_dialer_names (pglobal, ppzdialers)
 	  iret = UUCONF_FOPEN_FAILED | UUCONF_ERROR_ERRNO;
 	  break;
 	}
-      
+
       qglobal->ilineno = 0;
 
       while (_uuconf_getline (qglobal, &zline, &cline, e) > 0)
diff --git a/gnu/libexec/uucp/libuuconf/hinit.c b/gnu/libexec/uucp/libuuconf/hinit.c
index 06155d9c5d67..5fbb6658dcc1 100644
--- a/gnu/libexec/uucp/libuuconf/hinit.c
+++ b/gnu/libexec/uucp/libuuconf/hinit.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_hinit_rcsid[] = "$Id: hinit.c,v 1.6 1994/01/30 21:14:29 ian Rel $";
+const char _uuconf_hinit_rcsid[] = "$Id: hinit.c,v 1.2 1994/05/07 18:12:23 ache Exp $";
 #endif
 
 #include <errno.h>
@@ -165,7 +165,7 @@ uuconf_hdb_init (ppglobal, zprogram)
 	    {
 	      char ***ppz;
 	      int cfiles, ifile;
-	      
+
 	      if (strncmp (pzargs[i], "systems=", sizeof "systems=" - 1)
 		  == 0)
 		{
diff --git a/gnu/libexec/uucp/libuuconf/hsinfo.c b/gnu/libexec/uucp/libuuconf/hsinfo.c
index 6c92b3b8317a..d9ad790de80a 100644
--- a/gnu/libexec/uucp/libuuconf/hsinfo.c
+++ b/gnu/libexec/uucp/libuuconf/hsinfo.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_hsinfo_rcsid[] = "$Id: hsinfo.c,v 1.10 1994/01/30 21:14:29 ian Rel $";
+const char _uuconf_hsinfo_rcsid[] = "$Id: hsinfo.c,v 1.2 1994/05/07 18:12:27 ache Exp $";
 #endif
 
 #include <errno.h>
@@ -343,7 +343,7 @@ _uuconf_ihdb_system_internal (qglobal, zsystem, qsys)
 	  if (iret != UUCONF_SUCCESS)
 	    break;
 	}
-  
+
       (void) fclose (e);
 
       if (iret != UUCONF_SUCCESS)
diff --git a/gnu/libexec/uucp/libuuconf/hsnams.c b/gnu/libexec/uucp/libuuconf/hsnams.c
index 73f3dbb2ab27..476835ec0d10 100644
--- a/gnu/libexec/uucp/libuuconf/hsnams.c
+++ b/gnu/libexec/uucp/libuuconf/hsnams.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_hsnams_rcsid[] = "$Id: hsnams.c,v 1.4 1994/01/30 21:14:29 ian Rel $";
+const char _uuconf_hsnams_rcsid[] = "$Id: hsnams.c,v 1.2 1994/05/07 18:12:28 ache Exp $";
 #endif
 
 #include <errno.h>
@@ -67,7 +67,7 @@ uuconf_hdb_system_names (pglobal, ppzsystems, falias)
 	  iret = UUCONF_FOPEN_FAILED | UUCONF_ERROR_ERRNO;
 	  break;
 	}
-      
+
       qglobal->ilineno = 0;
 
       while (_uuconf_getline (qglobal, &zline, &cline, e) > 0)
diff --git a/gnu/libexec/uucp/libuuconf/rdlocs.c b/gnu/libexec/uucp/libuuconf/rdlocs.c
index 4393cc8c6f61..cf6e1b066690 100644
--- a/gnu/libexec/uucp/libuuconf/rdlocs.c
+++ b/gnu/libexec/uucp/libuuconf/rdlocs.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_rdlocs_rcsid[] = "$Id: rdlocs.c,v 1.5 1994/01/30 21:14:29 ian Rel $";
+const char _uuconf_rdlocs_rcsid[] = "$Id: rdlocs.c,v 1.2 1994/05/07 18:12:46 ache Exp $";
 #endif
 
 #include <errno.h>
@@ -174,7 +174,7 @@ _uuconf_iread_locations (qglobal)
       qglobal->qprocess->qsyslocs = si.qlocs;
       qglobal->qprocess->qvalidate = si.qvals;
       qglobal->qprocess->fread_syslocs = TRUE;
-    }	
+    }
 
   return iret;
 }
diff --git a/gnu/libexec/uucp/libuuconf/syssub.c b/gnu/libexec/uucp/libuuconf/syssub.c
index 4a209d8fc72c..97b5f32c064b 100644
--- a/gnu/libexec/uucp/libuuconf/syssub.c
+++ b/gnu/libexec/uucp/libuuconf/syssub.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_syssub_rcsid[] = "$Id: syssub.c,v 1.11 1994/01/30 21:14:29 ian Rel $";
+const char _uuconf_syssub_rcsid[] = "$Id: syssub.c,v 1.2 1994/05/07 18:12:59 ache Exp $";
 #endif
 
 #include <errno.h>
@@ -451,7 +451,7 @@ _uuconf_isystem_basic_default (qglobal, q)
 	      qglobal->ierrno = errno;
 	      return UUCONF_MALLOC_FAILED | UUCONF_ERROR_ERRNO;
 	    }
-		  
+
 	  memcpy ((pointer) zdup, (pointer) CMDPATH, sizeof CMDPATH);
 	  pz = NULL;
 	  csplit = 0;
diff --git a/gnu/libexec/uucp/libuuconf/tdialc.c b/gnu/libexec/uucp/libuuconf/tdialc.c
index 02063b2180d3..bac29e406196 100644
--- a/gnu/libexec/uucp/libuuconf/tdialc.c
+++ b/gnu/libexec/uucp/libuuconf/tdialc.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_tdialc_rcsid[] = "$Id: tdialc.c,v 1.4 1994/01/30 21:14:29 ian Rel $";
+const char _uuconf_tdialc_rcsid[] = "$Id: tdialc.c,v 1.2 1994/05/07 18:13:02 ache Exp $";
 #endif
 
 static int idchat P((pointer pglobal, int argc, char **argv, pointer pvar,
@@ -157,7 +157,7 @@ iddtr_toggle (pglobal, argc, argv, pvar, pinfo)
    string into a trivial chat script.  */
 
 /*ARGSUSED*/
-static int 
+static int
 idcomplete (pglobal, argc, argv, pvar, pinfo)
      pointer pglobal;
      int argc;
@@ -192,7 +192,7 @@ idproto_param (pglobal, argc, argv, pvar, pinfo)
   struct uuconf_proto_param **pqparam = (struct uuconf_proto_param **) pvar;
   struct uuconf_dialer *qdialer = (struct uuconf_dialer *) pinfo;
 
-  return _uuconf_iadd_proto_param (qglobal, argc - 1, argv + 1, pqparam, 
+  return _uuconf_iadd_proto_param (qglobal, argc - 1, argv + 1, pqparam,
 				   qdialer->uuconf_palloc);
 }
 
diff --git a/gnu/libexec/uucp/libuuconf/tdnams.c b/gnu/libexec/uucp/libuuconf/tdnams.c
index fa55a1f121e6..191e9937f9df 100644
--- a/gnu/libexec/uucp/libuuconf/tdnams.c
+++ b/gnu/libexec/uucp/libuuconf/tdnams.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_tdnams_rcsid[] = "$Id: tdnams.c,v 1.4 1994/01/30 21:14:29 ian Rel $";
+const char _uuconf_tdnams_rcsid[] = "$Id: tdnams.c,v 1.2 1994/05/07 18:13:03 ache Exp $";
 #endif
 
 #include <errno.h>
@@ -46,7 +46,7 @@ uuconf_taylor_dialer_names (pglobal, ppzdialers)
   struct uuconf_cmdtab as[2];
   char **pz;
   int iret;
-  
+
   *ppzdialers = NULL;
 
   as[0].uuconf_zcmd = "dialer";
diff --git a/gnu/libexec/uucp/libuuconf/tportc.c b/gnu/libexec/uucp/libuuconf/tportc.c
index ec15cdfc9a6d..0a7b0fbc893a 100644
--- a/gnu/libexec/uucp/libuuconf/tportc.c
+++ b/gnu/libexec/uucp/libuuconf/tportc.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_tportc_rcsid[] = "$Id: tportc.c,v 1.12 1994/01/30 21:14:29 ian Rel $";
+const char _uuconf_tportc_rcsid[] = "$Id: tportc.c,v 1.2 1994/05/07 18:13:11 ache Exp $";
 #endif
 
 #include <errno.h>
@@ -249,7 +249,7 @@ _uuconf_iport_cmd (qglobal, argc, argv, qport)
 
 	  if (i >= CPORT_TYPES)
 	    return UUCONF_SYNTAX_ERROR;
-	  
+
 	  ttype = (enum uuconf_porttype) i;
 	}
 
diff --git a/gnu/libexec/uucp/libuuconf/uucnfi.h b/gnu/libexec/uucp/libuuconf/uucnfi.h
index 98122794f104..3bab167171ca 100644
--- a/gnu/libexec/uucp/libuuconf/uucnfi.h
+++ b/gnu/libexec/uucp/libuuconf/uucnfi.h
@@ -150,7 +150,7 @@ struct sunknown
   int cargs;
   /* Arguments.  */
   char **pzargs;
-};     
+};
 
 /* This structure is used to hold the locations of systems within the
    Taylor UUCP sys files.  */
diff --git a/gnu/libexec/uucp/libuuconf/vport.c b/gnu/libexec/uucp/libuuconf/vport.c
index 5ce283903f00..5aac38248936 100644
--- a/gnu/libexec/uucp/libuuconf/vport.c
+++ b/gnu/libexec/uucp/libuuconf/vport.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_vport_rcsid[] = "$Id: vport.c,v 1.7 1994/01/30 21:14:29 ian Rel $";
+const char _uuconf_vport_rcsid[] = "$Id: vport.c,v 1.2 1994/05/07 18:13:22 ache Exp $";
 #endif
 
 #include <errno.h>
@@ -100,9 +100,9 @@ uuconf_v2_find_port (pglobal, zname, ibaud, ihighbaud, pifn, pinfo, qport)
 	}
 
       /* An entry in L-devices is
-	 
+
 	 type device dial-device baud dialer
-	 
+
 	 The type (normally "ACU") is treated as the name.  */
 
       /* If there aren't enough entries, ignore the line; this
diff --git a/gnu/libexec/uucp/libuuconf/vsinfo.c b/gnu/libexec/uucp/libuuconf/vsinfo.c
index ac6d3f253768..005efedd605a 100644
--- a/gnu/libexec/uucp/libuuconf/vsinfo.c
+++ b/gnu/libexec/uucp/libuuconf/vsinfo.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_vsinfo_rcsid[] = "$Id: vsinfo.c,v 1.10 1994/01/30 21:14:29 ian Rel $";
+const char _uuconf_vsinfo_rcsid[] = "$Id: vsinfo.c,v 1.2 1994/05/07 18:13:23 ache Exp $";
 #endif
 
 #include <errno.h>
@@ -531,7 +531,7 @@ _uuconf_iv2_system_internal (qglobal, zsystem, qsys)
 		    qsys->uuconf_pzpath = pznew;
 		    zline = NULL;
 		    cline = 0;
-		  }      
+		  }
 
 		if (getline (&zline, &cline, e) < 0)
 		  {
diff --git a/gnu/libexec/uucp/libuucp/crc.c b/gnu/libexec/uucp/libuucp/crc.c
index fc9687b57cf8..323adcb1408c 100644
--- a/gnu/libexec/uucp/libuucp/crc.c
+++ b/gnu/libexec/uucp/libuucp/crc.c
@@ -78,14 +78,14 @@ static const unsigned long aicrc32tab[] = { /* CRC polynomial 0xedb88320 */
 };
 
 /*
- * IUPDC32 macro derived from article Copyright (C) 1986 Stephen Satchell. 
+ * IUPDC32 macro derived from article Copyright (C) 1986 Stephen Satchell.
  *  NOTE: First argument must be in range 0 to 255.
  *        Second argument is referenced twice.
- * 
- * Programmers may incorporate any or all code into their programs, 
- * giving proper credit within the source. Publication of the 
- * source routines is permitted so long as proper credit is given 
- * to Stephen Satchell, Satchell Evaluations and Chuck Forsberg, 
+ *
+ * Programmers may incorporate any or all code into their programs,
+ * giving proper credit within the source. Publication of the
+ * source routines is permitted so long as proper credit is given
+ * to Stephen Satchell, Satchell Evaluations and Chuck Forsberg,
  * Omen Technology.
  */
 
diff --git a/gnu/libexec/uucp/libuucp/debug.c b/gnu/libexec/uucp/libuucp/debug.c
index 16c1b54891a8..e722e2ce8de9 100644
--- a/gnu/libexec/uucp/libuucp/debug.c
+++ b/gnu/libexec/uucp/libuucp/debug.c
@@ -137,7 +137,7 @@ cdebug_char (z, ichar)
   *z++ = b;
   *z = '\0';
   return 2;
-}      
+}
 
 /* Display a buffer when debugging.  */
 
@@ -162,7 +162,7 @@ udebug_buffer (zhdr, zbuf, clen)
       *z++ = '.';
     }
   *z = '\0';
-  
+
   ulog (LOG_DEBUG, "%s %lu \"%s\"", zhdr, (unsigned long) clen, zalc);
 
   ubuffree (zalc);
diff --git a/gnu/libexec/uucp/libuucp/escape.c b/gnu/libexec/uucp/libuucp/escape.c
index 646b787d6e43..261accb513df 100644
--- a/gnu/libexec/uucp/libuucp/escape.c
+++ b/gnu/libexec/uucp/libuucp/escape.c
@@ -12,7 +12,7 @@ cescape (z)
      char *z;
 {
   char *zto, *zfrom;
-  
+
   zto = z;
   zfrom = z;
   while (*zfrom != '\0')
diff --git a/gnu/libexec/uucp/libuucp/getop1.c b/gnu/libexec/uucp/libuucp/getop1.c
index c3ebc08bb3f3..41b9bb47b032 100644
--- a/gnu/libexec/uucp/libuucp/getop1.c
+++ b/gnu/libexec/uucp/libuucp/getop1.c
@@ -5,12 +5,12 @@
    under the terms of the GNU General Public License as published by the
    Free Software Foundation; either version 2, or (at your option) any
    later version.
-   
+
    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.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
@@ -38,7 +38,7 @@ getopt_long (argc, argv, options, long_options, opt_index)
    but does match a short option, it is parsed as a short option
    instead.  */
 
-int 
+int
 getopt_long_only (argc, argv, options, long_options, opt_index)
      int argc;
      char *const *argv;
diff --git a/gnu/libexec/uucp/libuucp/getopt.c b/gnu/libexec/uucp/libuucp/getopt.c
index f97c64eda545..8c35f8468650 100644
--- a/gnu/libexec/uucp/libuucp/getopt.c
+++ b/gnu/libexec/uucp/libuucp/getopt.c
@@ -9,12 +9,12 @@
    under the terms of the GNU General Public License as published by the
    Free Software Foundation; either version 2, or (at your option) any
    later version.
-   
+
    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.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
diff --git a/gnu/libexec/uucp/libuucp/memchr.c b/gnu/libexec/uucp/libuucp/memchr.c
index e1f399afeb36..fd6eb8335793 100644
--- a/gnu/libexec/uucp/libuucp/memchr.c
+++ b/gnu/libexec/uucp/libuucp/memchr.c
@@ -53,9 +53,9 @@ memchr (s, c, n)
   /* Bits 31, 24, 16, and 8 of this number are zero.  Call these bits
      the "holes."  Note that there is a hole just to the left of
      each byte, with an extra at the end:
-     
+
      bits:  01111110 11111110 11111110 11111111
-     bytes: AAAAAAAA BBBBBBBB CCCCCCCC DDDDDDDD 
+     bytes: AAAAAAAA BBBBBBBB CCCCCCCC DDDDDDDD
 
      The 1-bits make sure that carries propagate to the next 0-bit.
      The 0-bits provide holes for carries to fall into.  */
@@ -108,10 +108,10 @@ memchr (s, c, n)
 
       /* Add MAGIC_BITS to LONGWORD.  */
       if ((((longword + magic_bits)
-	
+
 	    /* Set those bits that were unchanged by the addition.  */
 	    ^ ~longword)
-	       
+
 	   /* Look at only the hole bits.  If any of the hole bits
 	      are unchanged, most likely one of the bytes was a
 	      zero.  */
diff --git a/gnu/libexec/uucp/libuucp/parse.c b/gnu/libexec/uucp/libuucp/parse.c
index d40da8086b66..d829fa92b79e 100644
--- a/gnu/libexec/uucp/libuucp/parse.c
+++ b/gnu/libexec/uucp/libuucp/parse.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char parse_rcsid[] = "$Id: parse.c,v 1.6 1994/03/26 04:42:39 ian Rel $";
+const char parse_rcsid[] = "$Id: parse.c,v 1.2 1994/05/07 18:13:33 ache Exp $";
 #endif
 
 #include "uudefs.h"
@@ -104,7 +104,7 @@ fparse_cmd (zcmd, qcmd)
   if (z == NULL)
     return FALSE;
   qcmd->zto = z;
-      
+
   z = strtok ((char *) NULL, " \t\n");
   if (z == NULL)
     return FALSE;
@@ -155,7 +155,7 @@ fparse_cmd (zcmd, qcmd)
 	}
 
       return TRUE;
-    }      
+    }
 
   z = strtok ((char *) NULL, " \t\n");
   if (z == NULL)
@@ -203,7 +203,7 @@ fparse_cmd (zcmd, qcmd)
 	}
       else if (qcmd->bcmd == 'E')
 	return FALSE;
-      
+
       if (z != NULL)
 	{
 	  z = strtok ((char *) NULL, "");
diff --git a/gnu/libexec/uucp/tstuu.c b/gnu/libexec/uucp/tstuu.c
index d411ae6ac402..3f629754aee4 100644
--- a/gnu/libexec/uucp/tstuu.c
+++ b/gnu/libexec/uucp/tstuu.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char tstuu_rcsid[] = "$Id: tstuu.c,v 1.81 1994/01/30 20:53:38 ian Rel $";
+const char tstuu_rcsid[] = "$Id: tstuu.c,v 1.2 1994/05/07 18:08:16 ache Exp $";
 #endif
 
 #include "sysdep.h"
@@ -187,7 +187,7 @@ struct sbuf
   int cend;
   char ab[BUFCHARS];
 };
-  
+
 /* Local functions.  */
 
 static void umake_file P((const char *zfile, int cextra));
@@ -305,7 +305,7 @@ main (argc, argv)
 	  {
 	    int om, os;
 	    FILE *e;
-  
+
 	    sprintf (zptyname, "/dev/pty%c%c", *zpty,
 		     "0123456789abcdef"[ipty]);
 	    om = open (zptyname, O_RDWR);
@@ -755,7 +755,7 @@ umake_file (z, c)
   FILE *e;
 
   e = xfopen (z, "w");
-	
+
   for (i = 0; i < 256; i++)
     {
       int i2;
@@ -1293,7 +1293,7 @@ cpshow (z, ichar)
       sprintf (z, "%03o", (unsigned int)(ichar & 0xff));
       return strlen (z) + 1;
     }
-}      
+}
 
 /* Pick one of two file descriptors which is ready for reading, or
    return in five seconds.  If the argument is ready for reading,
@@ -1345,7 +1345,7 @@ uchoose (po1, po2)
 
   if ((as[0].revents & POLLIN) == 0)
     *po1 = -1;
-  
+
   if ((as[1].revents & POLLIN) == 0)
     *po2 = -1;
 
@@ -1388,7 +1388,7 @@ cread (o, pqbuf)
 	  (*pqbuf)->cstart = 0;
 	  (*pqbuf)->cend = 0;
 	}
-      
+
       cgot = read (o, (*pqbuf)->ab + (*pqbuf)->cend,
 		   (sizeof (*pqbuf)->ab) - (*pqbuf)->cend);
       if (cgot < 0)
@@ -1515,7 +1515,7 @@ fsend (o, oslave, pqbuf)
 	      uchild (SIGCHLD);
 	    }
 	}
-      
+
       if (cwrote == 0)
 	break;
 
diff --git a/gnu/libexec/uucp/uuchk/uuchk.c b/gnu/libexec/uucp/uuchk/uuchk.c
index a1e69e888f8a..8e5c4ffde142 100644
--- a/gnu/libexec/uucp/uuchk/uuchk.c
+++ b/gnu/libexec/uucp/uuchk/uuchk.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char uuchk_rcsid[] = "$Id: uuchk.c,v 1.52 1994/05/02 03:43:02 ian Rel $";
+const char uuchk_rcsid[] = "$Id: uuchk.c,v 1.2 1994/05/07 18:13:37 ache Exp $";
 #endif
 
 #include "getopt.h"
@@ -112,7 +112,7 @@ main (argc, argv)
 		  zKprogram, VERSION);
 	  exit (EXIT_SUCCESS);
 	  /*NOTREACHED*/
-	  
+
 	case 1:
 	  /* --help.  */
 	  ukhelp ();
@@ -279,7 +279,7 @@ ukshow (qsys, puuconf)
 	    printf (" Call out");
 	  else
 	    printf (" This alternate applies when calling");
-	  
+
 	  if (qsys->uuconf_zport != NULL || qsys->uuconf_qport != NULL)
 	    {
 	      printf (" using ");
@@ -514,7 +514,7 @@ ukshow (qsys, puuconf)
 	    printf (" %s", *pz);
 	  printf ("\n");
 	}
-	  
+
       if (qsys->uuconf_pzforward_to != NULL)
 	{
 	  printf (" May forward to");
@@ -522,7 +522,7 @@ ukshow (qsys, puuconf)
 	    printf (" %s", *pz);
 	  printf ("\n");
 	}
-	  
+
       if (qsys->uuconf_zprotocols != NULL)
 	printf (" Will use protocols %s\n", qsys->uuconf_zprotocols);
       else
diff --git a/gnu/libexec/uucp/uucico/prote.c b/gnu/libexec/uucp/uucico/prote.c
index adb937b7769f..4cff75b27d72 100644
--- a/gnu/libexec/uucp/uucico/prote.c
+++ b/gnu/libexec/uucp/uucico/prote.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char prote_rcsid[] = "$Id: prote.c,v 1.16 1994/01/30 21:01:46 ian Rel $";
+const char prote_rcsid[] = "$Id: prote.c,v 1.2 1994/05/07 18:13:43 ache Exp $";
 #endif
 
 #include "uudefs.h"
@@ -97,7 +97,7 @@ festart (qdaemon, pzlog)
 /* Stop the protocol.  */
 
 /*ARGSUSED*/
-boolean 
+boolean
 feshutdown (qdaemon)
      struct sdaemon *qdaemon;
 {
diff --git a/gnu/libexec/uucp/uucico/protf.c b/gnu/libexec/uucp/uucico/protf.c
index a54be9f88cec..c38b9a1c3457 100644
--- a/gnu/libexec/uucp/uucico/protf.c
+++ b/gnu/libexec/uucp/uucico/protf.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char protf_rcsid[] = "$Id: protf.c,v 1.31 1994/01/30 21:01:46 ian Rel $";
+const char protf_rcsid[] = "$Id: protf.c,v 1.2 1994/05/07 18:13:45 ache Exp $";
 #endif
 
 #include <ctype.h>
@@ -247,7 +247,7 @@ ffsenddata (qdaemon, zdata, cdata, ilocal, iremote, ipos)
   char ab[CFBUFSIZE * 2];
   char *ze;
   register unsigned int itmpchk;
-      
+
   cFsent_data += cdata;
 
   ze = ab;
@@ -759,7 +759,7 @@ ffawait_cksum (qtrans, qdaemon, zdata, cdata)
       xfree (qtrans->pinfo);
       return FALSE;
     }
-	  
+
   icheck = (unsigned int) strtol ((char *) zdata, (char **) NULL, 16);
 
   if (icheck != (iFcheck & 0xffff))
diff --git a/gnu/libexec/uucp/uucico/protg.c b/gnu/libexec/uucp/uucico/protg.c
index b18a26021580..efae85ffc5ac 100644
--- a/gnu/libexec/uucp/uucico/protg.c
+++ b/gnu/libexec/uucp/uucico/protg.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char protg_rcsid[] = "$Id: protg.c,v 1.65 1994/03/26 03:39:05 ian Rel $";
+const char protg_rcsid[] = "$Id: protg.c,v 1.2 1994/05/07 18:13:46 ache Exp $";
 #endif
 
 #include <ctype.h>
@@ -137,7 +137,7 @@ const char protg_rcsid[] = "$Id: protg.c,v 1.65 1994/03/26 03:39:05 ian Rel $";
 /* Maximum amount of data in a single packet.  This is set by the <k>
    field in the header; the amount of data in a packet is
    2 ** (<k> + 4).  <k> ranges from 1 to 8.  */
-    
+
 #define CMAXDATAINDEX (8)
 
 #define CMAXDATA (1 << (CMAXDATAINDEX + 4))
@@ -446,7 +446,7 @@ fgstart (qdaemon, pzlog)
 	    iGrequest_packsize, qdaemon->qproto->bname);
       iseg = 1;
     }
-  
+
   if (iGrequest_winsize <= 0 || iGrequest_winsize > 7)
     {
       ulog (LOG_ERROR, "Illegal window size %d for '%c' protocol",
@@ -561,7 +561,7 @@ fvstart (qdaemon, pzlog)
   if (iGrequest_packsize == IPACKSIZE)
     iGrequest_packsize = 1024;
   return fgstart (qdaemon, pzlog);
-}  
+}
 
 /* Exchange initialization messages with the other system.
 
@@ -1140,7 +1140,7 @@ fgwait_for_packet (qdaemon, freturncontrol, ctimeout, cretries)
       size_t cneed;
       boolean ffound;
       size_t crec;
-  
+
       if (! fgprocess_data (qdaemon, TRUE, freturncontrol, &fexit,
 			    &cneed, &ffound))
 	return FALSE;
@@ -1502,7 +1502,7 @@ fgprocess_data (qdaemon, fdoacks, freturncontrol, pfexit, pcneed, pffound)
 	  cinbuf -= CFRAMELEN;
 
 	  /* Make sure we have enough data.  If we don't, wait for
-	     more.  */	     
+	     more.  */
 
 	  cwant = (int) CPACKLEN (ab);
 	  if (cinbuf < cwant)
@@ -1511,7 +1511,7 @@ fgprocess_data (qdaemon, fdoacks, freturncontrol, pfexit, pcneed, pffound)
 		*pcneed = cwant - cinbuf;
 	      return TRUE;
 	    }
-	  
+
 	  /* Set up the data pointers and compute the checksum.  */
 	  if (iPrecend >= iPrecstart)
 	    cfirst = cwant;
@@ -1546,7 +1546,7 @@ fgprocess_data (qdaemon, fdoacks, freturncontrol, pfexit, pcneed, pffound)
 		       (((0xaaaa - (icheck ^ (ab[IFRAME_CONTROL] & 0xff)))
 			 & 0xffff)));
 	}
-      
+
       ihdrcheck = (unsigned short) (((ab[IFRAME_CHECKHIGH] & 0xff) << 8)
 				    | (ab[IFRAME_CHECKLOW] & 0xff));
 
diff --git a/gnu/libexec/uucp/uucico/proti.c b/gnu/libexec/uucp/uucico/proti.c
index 6d9a97a51451..17b540ea07da 100644
--- a/gnu/libexec/uucp/uucico/proti.c
+++ b/gnu/libexec/uucp/uucico/proti.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char proti_rcsid[] = "$Id: proti.c,v 1.29 1994/03/26 03:39:05 ian Rel $";
+const char proti_rcsid[] = "$Id: proti.c,v 1.2 1994/05/07 18:13:48 ache Exp $";
 #endif
 
 #include <ctype.h>
@@ -866,7 +866,7 @@ fisenddata (qdaemon, zdata, cdata, ilocal, iremote, ipos)
 
   DEBUG_MESSAGE4 (DEBUG_PROTO,
 		  "fisenddata: Sending packet %d size %d local %d remote %d",
-		  iIsendseq, (int) cdata, ilocal, iremote);		  
+		  iIsendseq, (int) cdata, ilocal, iremote);
 
   iIsendseq = INEXTSEQ (iIsendseq);
   ++cIsent_packets;
@@ -1535,7 +1535,7 @@ fiprocess_packet (qdaemon, zhdr, zfirst, cfirst, zsecond, csecond, pfexit)
 
     case NAK:
       /* We must resend the requested packet.  */
-      {      
+      {
 	int iseq;
 	char *zsend;
 	size_t clen;
@@ -1598,7 +1598,7 @@ fiprocess_packet (qdaemon, zhdr, zfirst, cfirst, zsecond, csecond, pfexit)
 		zsend[IHDR_CHECK] = IHDRCHECK_VAL (zsend);
 		iIlocal_ack = iIrecseq;
 	      }
-	      
+
 	    ++cIresent_packets;
 
 	    clen = CHDRCON_GETBYTES (zsend[IHDR_CONTENTS1],
diff --git a/gnu/libexec/uucp/uucico/prott.c b/gnu/libexec/uucp/uucico/prott.c
index 26bb73065e00..8bf703a56e26 100644
--- a/gnu/libexec/uucp/uucico/prott.c
+++ b/gnu/libexec/uucp/uucico/prott.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char prott_rcsid[] = "$Id: prott.c,v 1.27 1994/01/30 21:01:46 ian Rel $";
+const char prott_rcsid[] = "$Id: prott.c,v 1.2 1994/05/07 18:13:51 ache Exp $";
 #endif
 
 #include "uudefs.h"
@@ -96,7 +96,7 @@ ftstart (qdaemon, pzlog)
 /* Stop the protocol.  */
 
 /*ARGSUSED*/
-boolean 
+boolean
 ftshutdown (qdaemon)
      struct sdaemon *qdaemon;
 {
@@ -269,7 +269,7 @@ ftprocess_data (qdaemon, pfexit, pcneed)
 	return FALSE;
 
       iPrecstart = (iPrecstart + clen) % CRECBUFLEN;
-			   
+
       if (*pfexit)
 	return TRUE;
 
diff --git a/gnu/libexec/uucp/uucico/protz.c b/gnu/libexec/uucp/uucico/protz.c
index 5dd2473fd115..7bcf8039c9bc 100644
--- a/gnu/libexec/uucp/uucico/protz.c
+++ b/gnu/libexec/uucp/uucico/protz.c
@@ -8,7 +8,7 @@
  * Ian Taylor's UUCP package.
  *
  * It was originally developed to establish a uucp link between myself and my
- * employer: Ivation Datasystems, Inc. of Ottawa. 
+ * employer: Ivation Datasystems, Inc. of Ottawa.
  *
  * My thanks to Ivation for letting me release this to the public. Given that
  * Zmodem is in the public domain, no additional copyrights have been added.
@@ -139,7 +139,7 @@
  *	ZDATA (ZCRCG, xx bytes) - received ok
  *	ZDATA (ZCRCF, 0 bytes)  - corrupted
  *
- *    At this point the receiver would like to send back a ZRPOS with a value 
+ *    At this point the receiver would like to send back a ZRPOS with a value
  *    of the size of the file. However, it can't because the value is divided
  *    by 32, and it would have to round up to the next multiple of 32. This
  *    seemed a little ugly, so I went with using the entire header to store
@@ -148,7 +148,7 @@
  *****************************************************************************
  *
  * Source version:
- * 
+ *
  * 1.1,2,3
  *	Protocol version 0
  *	Early attempts, completely rewritten later.
@@ -181,7 +181,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char protz_rcsid[] = "$Id: protz.c,v 1.8 1993/12/20 00:44:49 ian Rel $";
+const char protz_rcsid[] = "$Id: protz.c,v 1.2 1994/05/07 18:13:52 ache Exp $";
 #endif
 
 #include <errno.h>
@@ -1397,14 +1397,14 @@ static unsigned long crc_32_tab[] = { /* CRC polynomial 0xedb88320 */
 };
 
 /*
- * updcrc macro derived from article Copyright (C) 1986 Stephen Satchell. 
+ * updcrc macro derived from article Copyright (C) 1986 Stephen Satchell.
  *  NOTE: First argument must be in range 0 to 255.
  *        Second argument is referenced twice.
- * 
- * Programmers may incorporate any or all code into their programs, 
- * giving proper credit within the source. Publication of the 
- * source routines is permitted so long as proper credit is given 
- * to Stephen Satchell, Satchell Evaluations and Chuck Forsberg, 
+ *
+ * Programmers may incorporate any or all code into their programs,
+ * giving proper credit within the source. Publication of the
+ * source routines is permitted so long as proper credit is given
+ * to Stephen Satchell, Satchell Evaluations and Chuck Forsberg,
  * Omen Technology.
  */
 
diff --git a/gnu/libexec/uucp/uucico/rec.c b/gnu/libexec/uucp/uucico/rec.c
index d9f907a95183..08b31a466927 100644
--- a/gnu/libexec/uucp/uucico/rec.c
+++ b/gnu/libexec/uucp/uucico/rec.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char rec_rcsid[] = "$Id: rec.c,v 1.2 1994/05/07 18:13:55 ache Exp $";
+const char rec_rcsid[] = "$Id: rec.c,v 1.3 1994/11/06 10:17:11 davidg Exp $";
 #endif
 
 #include <errno.h>
@@ -123,7 +123,7 @@ urrec_free (qtrans)
     }
 
   utransfree (qtrans);
-}       
+}
 
 /* Set up a request for a file from the remote system.  This may be
    called before the remote system has been called.
@@ -569,7 +569,7 @@ fremote_send_file_init (qdaemon, qcmd, iremote)
 	    qcmd->zfrom);
       return fremote_send_fail (qdaemon, qcmd, FAILURE_PERM, iremote);
     }
-		  
+
   fspool = fspool_file (qcmd->zto);
 
   /* We don't accept remote command files.  An execution request may
@@ -897,7 +897,7 @@ fremote_send_fail_send (qtrans, qdaemon)
       ab[2] = '\0';
       break;
     }
-  
+
   ab[3] = '\0';
 
   qinfo->fsent = TRUE;
@@ -1063,7 +1063,7 @@ frec_file_end (qtrans, qdaemon, zdata, cdata)
 	    imode = 0666;
 	  (void) fsysdep_change_mode (qinfo->zfile, imode);
 	}
-  
+
       zerr = NULL;
     }
 
diff --git a/gnu/libexec/uucp/uucico/send.c b/gnu/libexec/uucp/uucico/send.c
index cf8b5b1bc98c..72d008341ce2 100644
--- a/gnu/libexec/uucp/uucico/send.c
+++ b/gnu/libexec/uucp/uucico/send.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char send_rcsid[] = "$Id: send.c,v 1.2 1994/05/07 18:13:57 ache Exp $";
+const char send_rcsid[] = "$Id: send.c,v 1.3 1994/11/06 10:17:13 davidg Exp $";
 #endif
 
 #include <errno.h>
@@ -110,7 +110,7 @@ usfree_send (qtrans)
     }
 
   utransfree (qtrans);
-}      
+}
 
 /* Set up a local request to send a file.  This may be called before
    we have even tried to call the remote system.
@@ -263,7 +263,7 @@ flocal_send_file_init (qdaemon, qcmd)
 	  else
 	    qdaemon->cmax_ever = c2;
 	}
-		      
+
       if (qdaemon->cmax_ever != -1
 	  && qdaemon->cmax_ever < qcmd->cbytes)
 	return flocal_send_fail ((struct stransfer *) NULL, qcmd, qdaemon,
@@ -1056,7 +1056,7 @@ fremote_rec_fail_send (qtrans, qdaemon)
       z = "RN";
       break;
     }
-  
+
   xfree (qtrans->pinfo);
   utransfree (qtrans);
   fret = (*qdaemon->qproto->pfsendcmd) (qdaemon, z, ilocal, iremote);
diff --git a/gnu/libexec/uucp/uucico/trans.c b/gnu/libexec/uucp/uucico/trans.c
index 9c6766e8dc54..1cb5487a68e6 100644
--- a/gnu/libexec/uucp/uucico/trans.c
+++ b/gnu/libexec/uucp/uucico/trans.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char trans_rcsid[] = "$Id: trans.c,v 1.31 1994/01/30 20:59:40 ian Rel $";
+const char trans_rcsid[] = "$Id: trans.c,v 1.2 1994/05/07 18:13:59 ache Exp $";
 #endif
 
 #include <errno.h>
@@ -411,8 +411,8 @@ utransfree (q)
   ubuffree ((char *) q->s.ztemp);
   ubuffree ((char *) q->s.znotify);
   ubuffree ((char *) q->s.zcmd);
-  
-  utchanfree (q);    
+
+  utchanfree (q);
   if (q->iremote > 0)
     {
       aqTremote[q->iremote] = NULL;
@@ -488,9 +488,9 @@ ftcharge (qdaemon, qtrans, fsend, fforce)
 	{
 	  qother->isecs = inextsecs;
 	  qother->imicros = inextmicros;
-	}	  
+	}
     }
-  
+
   qcharge->qtrans = qtrans;
   qcharge->isecs = inextsecs;
   qcharge->imicros = inextmicros;
@@ -612,7 +612,7 @@ fqueue (qdaemon, pfany)
 	  break;
 #endif
 	}
-    }	  
+    }
 
   if (pfany != NULL)
     *pfany = qTlocal != NULL;
@@ -926,7 +926,7 @@ floop (qdaemon)
    TRUE if we just receive data for a file.  This routine never sets
    *pfexit to FALSE.  */
 
-boolean 
+boolean
 fgot_data (qdaemon, zfirst, cfirst, zsecond, csecond, ilocal, iremote, ipos,
 	   fallacked, pfexit)
      struct sdaemon *qdaemon;
diff --git a/gnu/libexec/uucp/uucico/uucico.c b/gnu/libexec/uucp/uucico/uucico.c
index 90cbcce7b5bc..8183980fd561 100644
--- a/gnu/libexec/uucp/uucico/uucico.c
+++ b/gnu/libexec/uucp/uucico/uucico.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char uucico_rcsid[] = "$Id: uucico.c,v 1.2 1994/05/07 18:14:02 ache Exp $";
+const char uucico_rcsid[] = "$Id: uucico.c,v 1.3 1994/05/25 20:14:52 ache Exp $";
 #endif
 
 #include <ctype.h>
@@ -333,7 +333,7 @@ main (argc, argv)
 	  else
 	    uusage ();
 	  break;
-    
+
 	case 's':
 	  /* Set system name  */
 	  zsystem = optarg;
@@ -1339,7 +1339,7 @@ fdo_call (qdaemon, qstat, qdialer, pfcalled, pterr)
 	    ulog_uuconf (LOG_ERROR, puuconf, iuuconf);
 	    return FALSE;
 	  }
-      }	    
+      }
 
     zsend = zbufalc (strlen (qdaemon->zlocalname) + 70);
     if (! qsys->uuconf_fsequence)
@@ -1907,7 +1907,7 @@ faccept_call (puuconf, zconfig, fuuxqt, zlogin, qconn, pzsystem)
 	    }
 	  else
 	    qdialer = qport->uuconf_u.uuconf_smodem.uuconf_qdialer;
-	}	  
+	}
       else if (qport->uuconf_ttype == UUCONF_PORTTYPE_TCP
 	       || (qport->uuconf_ttype == UUCONF_PORTTYPE_TLI
 		   && (qport->uuconf_ireliable
@@ -2195,7 +2195,7 @@ faccept_call (puuconf, zconfig, fuuxqt, zlogin, qconn, pzsystem)
 	     getopt, which is distributed with the program anyhow.  */
 	  optind = 0;
 	  opterr = 0;
-	  
+
 	  while ((iopt = getopt (pzset - paz, paz,
 				 "N::p:Q:RU:v:x:")) != EOF)
 	    {
@@ -2427,7 +2427,7 @@ faccept_call (puuconf, zconfig, fuuxqt, zlogin, qconn, pzsystem)
       uaccept_call_cleanup (puuconf, &ssys, qport, &sport, zloc);
       return FALSE;
     }
-    
+
   /* The master will now send back the selected protocol.  */
   zstr = zget_uucp_cmd (qconn, TRUE);
   if (zstr == NULL)
@@ -2757,7 +2757,7 @@ zget_uucp_cmd (qconn, frequired)
   while ((ctimeout = (int) (iendtime - ixsysdep_time ((long *) NULL))) > 0)
     {
       int b;
-      
+
       b = breceive_char (qconn, ctimeout, frequired);
       /* Now b == -1 on timeout, -2 on error.  */
       if (b < 0)
@@ -2873,7 +2873,7 @@ static char *
 zget_typed_line (qconn)
      struct sconnection *qconn;
 {
-  static boolean flastcr; 
+  static boolean flastcr;
   char *zalc;
   size_t calc;
   size_t cgot;
@@ -2897,7 +2897,7 @@ zget_typed_line (qconn)
   while (TRUE)
     {
       int b;
-      
+
       b = breceive_char (qconn, CTIMEOUT, FALSE);
 
       /* Now b == -1 on timeout, -2 on error.  */
diff --git a/gnu/libexec/uucp/uuconv/Makefile b/gnu/libexec/uucp/uuconv/Makefile
index f83920b95413..1f9feff7b987 100644
--- a/gnu/libexec/uucp/uuconv/Makefile
+++ b/gnu/libexec/uucp/uuconv/Makefile
@@ -1,10 +1,10 @@
 # Makefile for uuconv
-# $Id: Makefile,v 1.3 1994/05/31 05:46:34 ache Exp $
+# $Id: Makefile,v 1.4 1995/05/14 17:01:07 ache Exp $
 
 BINDIR=		$(sbindir)
 
 PROG=		uuconv
-SRCS=		uuconv.c 
+SRCS=		uuconv.c
 LDADD+=		$(LIBUNIX) $(LIBUUCONF) $(LIBUUCP)
 DPADD+=		$(LIBUNIX) $(LIBUUCONF) $(LIBUUCP)
 CFLAGS+=	-I$(.CURDIR)/../common_sources\
diff --git a/gnu/libexec/uucp/uuconv/uuconv.c b/gnu/libexec/uucp/uuconv/uuconv.c
index 1f5d94834290..3d6ee4741e85 100644
--- a/gnu/libexec/uucp/uuconv/uuconv.c
+++ b/gnu/libexec/uucp/uuconv/uuconv.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char uuconv_rcsid[] = "$Id: uuconv.c,v 1.22 1994/03/29 01:09:32 ian Rel $";
+const char uuconv_rcsid[] = "$Id: uuconv.c,v 1.2 1994/05/07 18:14:06 ache Exp $";
 #endif
 
 #include "getopt.h"
@@ -395,7 +395,7 @@ main (argc, argv)
 				     piportfn, (pointer) eport, &sport);
 	break;
       }
-	
+
     if (iret != UUCONF_NOT_FOUND)
       uvuuconf_error (pinput, iret);
 
@@ -740,7 +740,7 @@ uvwrite_chat (e, q, qlast, zprefix, fforce)
 	  || qlast->uuconf_pzfail != q->uuconf_pzfail))
     for (pz = q->uuconf_pzfail; *pz != NULL; pz++)
       fprintf (e, "%schat-fail %s\n", zprefix, *pz);
-      
+
   if (qlast == NULL || qlast->uuconf_fstrip != q->uuconf_fstrip)
     {
       sprintf (ab, "%schat-strip", zprefix);
@@ -924,7 +924,7 @@ uvwrite_taylor_system (e, q)
 
       if (CHANGED (uuconf_qproto_params))
 	uvwrite_proto_params (e, q->uuconf_qproto_params, "");
-      
+
       uvwrite_chat (e, &q->uuconf_scalled_chat,
 		    (qlast == NULL
 		     ? (struct uuconf_chat *) NULL
@@ -1064,7 +1064,7 @@ uvwrite_v2_system (e, q)
 			  && q->uuconf_zphone != NULL)
 			{
 			  char **pzc;
-			  
+
 			  fprintf (e, " %s", q->uuconf_zphone);
 			  pzc = q->uuconf_schat.uuconf_pzchat;
 			  if (pzc != (char **) &_uuconf_unset
@@ -1142,7 +1142,7 @@ uvwrite_hdb_system (e, qsys)
 			  && q->uuconf_zphone != NULL)
 			{
 			  char **pzc;
-			  
+
 			  fprintf (e, " %s", q->uuconf_zphone);
 			  pzc = q->uuconf_schat.uuconf_pzchat;
 			  if (pzc != (char **) &_uuconf_unset
@@ -1312,7 +1312,7 @@ fvperm_array_cmp (pz1, pz2)
       break;
 
   return *pz1 == NULL && *pz2 == NULL;
-}      
+}
 
 /* Add a Permissions entry to a global list, combining entries where
    possible.  */
@@ -1502,7 +1502,7 @@ uvwrite_perm_array (e, pzarg, zcmd, pccol)
     return;
 
   c = strlen (zcmd) + 1;
-  
+
   for (pz = pzarg; *pz != NULL; pz++)
     c += strlen (*pz) + 1;
 
@@ -2001,7 +2001,7 @@ uvwrite_taylor_dialer (e, qdialer, zprefix)
     qdialer->uuconf_sabort.uuconf_ctimeout = -1;
   if (qdialer->uuconf_sabort.uuconf_fstrip)
     qdialer->uuconf_sabort.uuconf_fstrip = -1;
-  
+
   uvwrite_chat (e, &qdialer->uuconf_schat, (struct uuconf_chat *) NULL,
 		zprefix, FALSE);
   if (qdialer->uuconf_zdialtone != NULL
diff --git a/gnu/libexec/uucp/uulog/uulog.c b/gnu/libexec/uucp/uulog/uulog.c
index 44e33142d0bc..fbf6bfffb47c 100644
--- a/gnu/libexec/uucp/uulog/uulog.c
+++ b/gnu/libexec/uucp/uulog/uulog.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char uulog_rcsid[] = "$Id: uulog.c,v 1.21 1994/01/30 20:59:40 ian Rel $";
+const char uulog_rcsid[] = "$Id: uulog.c,v 1.2 1994/05/07 18:14:12 ache Exp $";
 #endif
 
 #include <ctype.h>
@@ -350,7 +350,7 @@ main (argc, argv)
 	      zluser = znext;
 	      cluser = strcspn (znext, " \t");
 #endif
-      
+
 	      /* Skip the first field.  */
 	      znext += strcspn (znext, " \t");
 	      znext += strspn (znext, " \t");
diff --git a/gnu/libexec/uucp/uustat/uustat.c b/gnu/libexec/uucp/uustat/uustat.c
index 7649dd47b393..edeccfab1d8c 100644
--- a/gnu/libexec/uucp/uustat/uustat.c
+++ b/gnu/libexec/uucp/uustat/uustat.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char uustat_rcsid[] = "$Id: uustat.c,v 1.44 1994/01/30 20:59:40 ian Rel $";
+const char uustat_rcsid[] = "$Id: uustat.c,v 1.2 1994/05/07 18:14:24 ache Exp $";
 #endif
 
 #include <ctype.h>
@@ -885,7 +885,7 @@ fsworkfiles (puuconf, icmd, csystems, pazsystems, fnotsystems, cusers,
 	  ulog_uuconf (LOG_ERROR, puuconf, iuuconf);
 	  return FALSE;
 	}
-      
+
       for (pz = pznames; *pz != NULL; pz++)
 	{
 	  if (csystems > 0)
@@ -1281,7 +1281,7 @@ fsworkfile_show (puuconf, icmd, qsys, qcmd, itime, ccommands, pazcommands,
 	  else if ((icmd & JOB_KILL) != 0
 		   || (icmd & JOB_REJUVENATE) != 0)
 	    fkill_or_rejuv = TRUE;
-	      
+
 	  if (fkill_or_rejuv
 	      && (qlist->s.zuser == NULL
 		  || strcmp (zsysdep_login_name (), qlist->s.zuser) != 0)
@@ -1466,7 +1466,7 @@ fsexecutions (puuconf, icmd, csystems, pazsystems, fnotsystems, cusers,
 	{
 	  ubuffree (zfile);
 	  ubuffree (zsystem);
-	  continue;      
+	  continue;
 	}
 
       if (cusers == 0)
@@ -2286,7 +2286,7 @@ fsquery_show (qsys, cwork, ifirstwork, qxqt, inow, zlocalname,
 
   usysdep_localtime (sstat.ilast, &stime);
 
-  printf (" %02d-%02d %02d:%02d ", 
+  printf (" %02d-%02d %02d:%02d ",
 	  stime.tm_mon + 1,stime.tm_mday, stime.tm_hour, stime.tm_min);
 
   printf ("%s\n", azStatus[(int) sstat.ttype]);
diff --git a/gnu/libexec/uucp/uux/uux.c b/gnu/libexec/uucp/uux/uux.c
index ef5c90ad20d9..c5e7c2047ac3 100644
--- a/gnu/libexec/uucp/uux/uux.c
+++ b/gnu/libexec/uucp/uux/uux.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char uux_rcsid[] = "$Id: uux.c,v 1.4 1994/05/07 18:14:35 ache Exp $";
+const char uux_rcsid[] = "$Id: uux.c,v 1.5 1994/10/02 23:09:41 ache Exp $";
 #endif
 
 #include "uudefs.h"
@@ -227,7 +227,7 @@ main (argc, argv)
 	  break;
 
 	case 'I':
-	  /* Configuration file name.  */ 
+	  /* Configuration file name.  */
 	  if (fsysdep_other_config (optarg))
 	    zconfig = optarg;
 	  break;
@@ -1170,7 +1170,7 @@ main (argc, argv)
       s.cbytes = -1;
       s.zcmd = zfullcmd;
       s.ipos = 0;
-      
+
       ++cXcmds;
       pasXcmds = (struct scmd *) xrealloc ((pointer) pasXcmds,
 					   cXcmds * sizeof (struct scmd));
diff --git a/gnu/libexec/uucp/uuxqt/uuxqt.c b/gnu/libexec/uucp/uuxqt/uuxqt.c
index 890aa4326815..825f8a5b2d2e 100644
--- a/gnu/libexec/uucp/uuxqt/uuxqt.c
+++ b/gnu/libexec/uucp/uuxqt/uuxqt.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char uuxqt_rcsid[] = "$Id: uuxqt.c,v 1.2 1994/05/07 18:14:43 ache Exp $";
+const char uuxqt_rcsid[] = "$Id: uuxqt.c,v 1.3 1994/10/22 03:51:36 ache Exp $";
 #endif
 
 #include <errno.h>
@@ -658,7 +658,7 @@ iqset (puuconf, argc, argv, pvar, pinfo)
      int argc;
      char **argv;
      pointer pvar;
-     pointer pinfo;     
+     pointer pinfo;
 {
   boolean *pf = (boolean *) pvar;
 
@@ -1161,7 +1161,7 @@ uqdo_xqt_file (puuconf, zfile, zbase, qsys, zlocalname, zcmd, pfprocessed)
 				       (const char *) NULL)))
 	{
 	  ulog (LOG_ERROR, "Not permitted to read %s", zQinput);
-	      
+
 	  if (zmail != NULL && ! fQno_ack)
 	    {
 	      const char *az[20];
@@ -1190,7 +1190,7 @@ uqdo_xqt_file (puuconf, zfile, zbase, qsys, zlocalname, zcmd, pfprocessed)
 	   && strcmp (zQoutsys, zlocalname) != 0)
     {
       char *zdata;
-	 
+
       /* The output file is destined for some other system, so we must
 	 use a temporary file to catch standard output.  */
       if (strcmp (zQoutsys, qsys->uuconf_zname) == 0)
@@ -1240,7 +1240,7 @@ uqdo_xqt_file (puuconf, zfile, zbase, qsys, zlocalname, zcmd, pfprocessed)
   else
     {
       boolean fok;
-	 
+
       qoutsys = NULL;
 
       /* If we permitted the standard output to be redirected into
@@ -1278,7 +1278,7 @@ uqdo_xqt_file (puuconf, zfile, zbase, qsys, zlocalname, zcmd, pfprocessed)
       if (! fok)
 	{
 	  ulog (LOG_ERROR, "Not permitted to write to %s", zQoutfile);
-	      
+
 	  if (zmail != NULL && ! fQno_ack)
 	    {
 	      const char *az[20];
diff --git a/gnu/libexec/ypxfr/yp_xdr.c b/gnu/libexec/ypxfr/yp_xdr.c
index 91a3ad8be255..850d62e2ad22 100644
--- a/gnu/libexec/ypxfr/yp_xdr.c
+++ b/gnu/libexec/ypxfr/yp_xdr.c
@@ -15,40 +15,40 @@ struct {
         char *data;
 } *xdr_ypall_callback;
 
-bool_t           
+bool_t
 __xdr_ypstat(XDR *xdrs, ypstat *objp)
 {
- 
+
          if (!xdr_enum(xdrs, (enum_t *)objp)) {
                  return (FALSE);
          }
         return (TRUE);
 }
 
-bool_t           
+bool_t
 __xdr_valdat(XDR *xdrs, valdat *objp)
 {
- 
+
          if (!xdr_bytes(xdrs, (char **)&objp->valdat_val, (u_int *)&objp->valdat_len, YPMAXRECORD)) {
                  return (FALSE);
          }
         return (TRUE);
-}        
+}
 
-bool_t         
+bool_t
 __xdr_keydat(XDR *xdrs, keydat *objp)
 {
- 
+
          if (!xdr_bytes(xdrs, (char **)&objp->keydat_val, (u_int *)&objp->keydat_len, YPMAXRECORD)) {
                  return (FALSE);
          }
         return (TRUE);
-} 
+}
 
 bool_t
 __xdr_ypresp_key_val(XDR *xdrs, ypresp_key_val *objp)
 {
- 
+
          if (!__xdr_ypstat(xdrs, &objp->stat)) {
                  return (FALSE);
          }
@@ -139,7 +139,7 @@ __xdr_ypresp_all(XDR *xdrs, ypresp_all *objp)
            }
         }
 #endif
-           
+
       return(TRUE);
    }
 }
diff --git a/gnu/libexec/ypxfr/ypclnt.c b/gnu/libexec/ypxfr/ypclnt.c
index 9f8a3167ed5d..04e58b9c03b3 100644
--- a/gnu/libexec/ypxfr/ypclnt.c
+++ b/gnu/libexec/ypxfr/ypclnt.c
@@ -18,7 +18,7 @@
 
     Modified for use with FreeBSD 2.x by Bill Paul (wpaul@ctr.columbia.edu)
 
-	$Id: ypclnt.c,v 1.2 1995/02/06 23:35:48 wpaul Exp $
+	$Id: ypclnt.c,v 1.3 1995/03/31 05:45:21 wpaul Exp $
 */
 
 #include <stdio.h>
@@ -40,7 +40,7 @@ struct dom_binding {
 	void * m;
 };
 #include <rpcsvc/ypclnt.h>
- 
+
 static struct sockaddr_in ServerAddress;
 static CLIENT *UdpClient=NULL, *TcpClient=NULL;
 extern void Perror __P((const char *, ...));
@@ -53,7 +53,7 @@ eachresult( caddr_t resultsp, struct sockaddr_in *raddr)
    return((bool_t) TRUE);
 }
 #endif
- 
+
 static struct sockaddr_in *
 __do_ypbind(domainname d)
 {
@@ -73,8 +73,8 @@ __do_ypbind(domainname d)
       clnt_pcreateerror("");
       return NULL;
    }
-   
-   rc=clnt_call(localBindClient, YPBINDPROC_DOMAIN, 
+
+   rc=clnt_call(localBindClient, YPBINDPROC_DOMAIN,
       xdr_domainname, (char *)&d, xdr_ypbind_resp, (char *)&r, t);
    if (rc) {
       clnt_perrno(rc);
@@ -118,16 +118,16 @@ __yp_unbind(char *DomainName)
    if (TcpClient) clnt_destroy(TcpClient);
    TcpClient=NULL;
 }
- 
+
 int
 _yp_bind(struct sockaddr_in *ServerAddress, char *DomainName)
 {
    struct sockaddr_in UdpServerAddress, TcpServerAddress;
    int UdpSockp, TcpSockp;
    static struct timeval Wait = { 5, 0 };
- 
+
    if (UdpClient || TcpClient) __yp_unbind(DomainName);
- 
+
    bcopy(ServerAddress, &UdpServerAddress, sizeof(*ServerAddress));
    UdpServerAddress.sin_port=0;
    UdpSockp=(RPC_ANYSOCK);
@@ -145,9 +145,9 @@ _yp_bind(struct sockaddr_in *ServerAddress, char *DomainName)
       return(YPERR_RPC);
    }
    return(0);
- 
+
 }
- 
+
 int
 __yp_bind(char *DomainName)
 {
@@ -156,7 +156,7 @@ __yp_bind(char *DomainName)
    static bool_t res;
 #  endif
    static domainname domain;
- 
+
    domain=DomainName;
 #  ifndef SOCKSERVER
 #  ifdef YPBROADCAST
@@ -189,11 +189,11 @@ __yp_all( char *DomainName, char *MapName, struct ypall_callback *CallBack)
    ypresp_all *resp;
    extern struct ypall_callback *xdr_ypall_callback;
    int Status;
- 
+
    do {
       if (TcpClient==NULL)
          if ((Status=__yp_bind(DomainName))) return(Status);
- 
+
       req.domain=DomainName;
       req.map=MapName;
       xdr_ypall_callback=CallBack;
@@ -219,7 +219,7 @@ _yp_clear(char *DomainName)
 {
    void *resp;
    int Status;
- 
+
    do {
       if (UdpClient==NULL)
          if ((Status=yp_bind(DomainName))) return(Status);
diff --git a/gnu/libexec/ypxfr/ypxfr.c b/gnu/libexec/ypxfr/ypxfr.c
index 2c245504964f..e3a47345f6a1 100644
--- a/gnu/libexec/ypxfr/ypxfr.c
+++ b/gnu/libexec/ypxfr/ypxfr.c
@@ -18,7 +18,7 @@
 
     Modified for use with FreeBSD 2.x by Bill Paul (wpaul@ctr.columbia.edu)
 
-	$Id: ypxfr.c,v 1.2 1995/02/06 23:35:49 wpaul Exp $
+	$Id: ypxfr.c,v 1.5 1995/03/31 05:45:23 wpaul Exp $
 */
 
 #include <stdio.h>
@@ -61,7 +61,7 @@ struct dom_binding {
         CLIENT *dom_client;
         u_short dom_local_port;
         long dom_vers;
-};  
+};
 
 #define DATUM /* Otherwise ypclnt.h redefines datum */
 #include <rpcsvc/ypclnt.h>
@@ -133,7 +133,7 @@ ypxfr_foreach(int status, char *key, int keylen, char *val, int vallen,
 
 static enum ypxfrstat
 ypxfr(char *mapName) {
-	
+
 	int localOrderNum=0;
 	int masterOrderNum=0;
 	char *masterName;
@@ -264,7 +264,7 @@ ypxfr(char *mapName) {
 		localHost.sin_addr.s_addr=htonl(INADDR_LOOPBACK);
 		if (_yp_bind(&localHost, TargetDomain) ||
 			_yp_clear(TargetDomain)) return YPXFR_CLEAR;
-	} 
+	}
 	return y==0?YPXFR_SUCC:YPXFR_YPERR;
 }