Remove trailing whitespace.

11 files changed, 54 insertions, 54 deletions

diff --git a/usr.sbin/ctm/ctm/ctm.c b/usr.sbin/ctm/ctm/ctm.c
index c39d0bc..05ab0cc 100644
--- a/usr.sbin/ctm/ctm/ctm.c
+++ b/usr.sbin/ctm/ctm/ctm.c
@@ -6,15 +6,15 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: ctm.c,v 1.9 1995/03/19 13:42:54 joerg Exp $
+ * $Id: ctm.c,v 1.10 1995/03/26 20:09:50 phk Exp $
  *
- * This is the client program of 'CTM'.  It will apply a CTM-patch to a 
+ * This is the client program of 'CTM'.  It will apply a CTM-patch to a
  * collection of files.
  *
  * Options we'd like to see:
  *
  * -a 			Attempt best effort.
- * -b <dir>		Base-dir	
+ * -b <dir>		Base-dir
  * -B <file>		Backup to tar-file.
  * -d <int>		Debug TBD.
  * -m <mail-addr>	Email me instead.
@@ -40,7 +40,7 @@
 extern int Proc(char *, unsigned applied);
 
 int
-main(int argc, char **argv) 
+main(int argc, char **argv)
 {
     int stat=0;
     int c;
@@ -48,12 +48,12 @@ main(int argc, char **argv)
     extern char * optarg;
     FILE *statfile;
     unsigned applied = 0;
-    
+
     Verbose = 1;
     Paranoid = 1;
     setbuf(stderr,0);
     setbuf(stdout,0);
-    
+
     while((c=getopt(argc,argv,"ab:B:cd:Fm:pPqr:R:T:Vv")) != -1) {
 	switch (c) {
 	    case 'c': CheckIt++;	break; /* Only check it */
@@ -91,7 +91,7 @@ main(int argc, char **argv)
 	fscanf(statfile, "%*s %u", &applied);
 	fclose(statfile);
     }
-    
+
     if(!argc)
 	stat |= Proc("-", applied);
 
diff --git a/usr.sbin/ctm/ctm/ctm.h b/usr.sbin/ctm/ctm/ctm.h
index eb4b4ba..a444f98 100644
--- a/usr.sbin/ctm/ctm/ctm.h
+++ b/usr.sbin/ctm/ctm/ctm.h
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: ctm.h,v 1.5 1994/10/24 20:09:21 phk Exp $
+ * $Id: ctm.h,v 1.6 1995/03/04 20:36:45 phk Exp $
  *
  */
 
@@ -66,7 +66,7 @@ EXTERN u_char *FileName;
 EXTERN u_char *BaseDir;
 EXTERN u_char *TmpDir;
 
-/* 
+/*
  * Paranoid -- Just in case they should be after us...
  *  0 not at all.
  *  1 normal.
@@ -75,7 +75,7 @@ EXTERN u_char *TmpDir;
  *
  * Verbose -- What to tell mom...
  *  0 Nothing which wouldn't surprise.
- *  1 Normal. 
+ *  1 Normal.
  *  2 Show progress '.'.
  *  3 Show progress names, and actions.
  *  4 even more...
@@ -89,7 +89,7 @@ EXTERN u_char *TmpDir;
  *  8 Destination-tree not correct.
  * 16 Destination-tree not correct, can force.
  * 32 Internal problems.
- * 
+ *
  */
 
 EXTERN int Paranoid;
diff --git a/usr.sbin/ctm/ctm/ctm_ed.c b/usr.sbin/ctm/ctm/ctm_ed.c
index 4fdf3b9..a78be73 100644
--- a/usr.sbin/ctm/ctm/ctm_ed.c
+++ b/usr.sbin/ctm/ctm/ctm_ed.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: ctm_ed.c,v 1.4 1994/09/22 02:49:17 phk Exp $
+ * $Id: ctm_ed.c,v 1.5 1995/04/16 22:40:49 bde Exp $
  *
  */
 
@@ -20,9 +20,9 @@ ctm_edit(u_char *script, int length, char *filein, char *fileout)
     FILE *fi=0,*fo=0;
 
     fi = fopen(filein,"r");
-    if(!fi) { 
+    if(!fi) {
 	perror(filein);
-	return 8; 
+	return 8;
     }
 
     fo = fopen(fileout,"w");
@@ -84,7 +84,7 @@ ctm_edit(u_char *script, int length, char *filein, char *fileout)
 	    }
 	    continue;
 	}
-	ret = 1; 
+	ret = 1;
 	goto bye;
     }
     while(1) {
diff --git a/usr.sbin/ctm/ctm/ctm_pass1.c b/usr.sbin/ctm/ctm/ctm_pass1.c
index e8bfcc4..6b00fcc 100644
--- a/usr.sbin/ctm/ctm/ctm_pass1.c
+++ b/usr.sbin/ctm/ctm/ctm_pass1.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: ctm_pass1.c,v 1.8 1995/03/04 20:36:46 phk Exp $
+ * $Id: ctm_pass1.c,v 1.9 1995/03/26 20:09:52 phk Exp $
  *
  */
 
@@ -27,15 +27,15 @@ Pass1(FILE *fd, unsigned applied)
     struct CTM_Syntax *sp;
     int slashwarn=0;
     unsigned current;
-    
-    if(Verbose>3) 
+
+    if(Verbose>3)
 	printf("Pass1 -- Checking integrity of incoming CTM-patch\n");
     MD5Init (&ctx);
 
     GETFIELD(p,' ');				/* CTM_BEGIN */
     if(strcmp(p,"CTM_BEGIN")) {
 	Fatal("Probably not a CTM-patch at all.");
-	if(Verbose>3) 
+	if(Verbose>3)
 	    fprintf(stderr,"Expected \"CTM_BEGIN\" got \"%s\".\n",p);
 	return 1;
     }
@@ -43,7 +43,7 @@ Pass1(FILE *fd, unsigned applied)
     GETFIELDCOPY(Version,' ');				/* <Version> */
     if(strcmp(Version,VERSION)) {
 	Fatal("CTM-patch is wrong version.");
-	if(Verbose>3) 
+	if(Verbose>3)
 	    fprintf(stderr,"Expected \"%s\" got \"%s\".\n",VERSION,p);
 	return 1;
     }
@@ -60,7 +60,7 @@ Pass1(FILE *fd, unsigned applied)
 		    current);
 	return Exit_Version;
     }
-    
+
     for(;;) {
 	if(md5)		{Free(md5), md5 = 0;}
 	if(trash)	{Free(trash), trash = 0;}
diff --git a/usr.sbin/ctm/ctm/ctm_pass2.c b/usr.sbin/ctm/ctm/ctm_pass2.c
index 9ad407c..7ce55e2 100644
--- a/usr.sbin/ctm/ctm/ctm_pass2.c
+++ b/usr.sbin/ctm/ctm/ctm_pass2.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: ctm_pass2.c,v 1.6 1995/02/04 19:20:48 phk Exp $
+ * $Id: ctm_pass2.c,v 1.7 1995/03/19 12:01:23 roberto Exp $
  *
  */
 
@@ -28,7 +28,7 @@ Pass2(FILE *fd)
     struct stat st;
     int ret = 0;
 
-    if(Verbose>3) 
+    if(Verbose>3)
 	printf("Pass2 -- Checking if CTM-patch will apply\n");
     MD5Init (&ctx);
 
@@ -87,7 +87,7 @@ Pass2(FILE *fd)
 			else
 			    ret |= Exit_NotOK;
 			break;
-		    } 
+		    }
 		    if (j & CTM_Q_Name_Dir) {
 			if((st.st_mode & S_IFMT) != S_IFDIR) {
 			    fprintf(stderr,
@@ -96,7 +96,7 @@ Pass2(FILE *fd)
 			    ret |= Exit_NotOK;
 			}
 			break;
-		    } 
+		    }
 		    if (j & CTM_Q_Name_File) {
 			if((st.st_mode & S_IFMT) != S_IFREG) {
 			    fprintf(stderr,
@@ -162,7 +162,7 @@ Pass2(FILE *fd)
 			unlink(p);
 			free(p);
 		    }
-		    
+
 		    break;
 		default: WRONG
 	    }
diff --git a/usr.sbin/ctm/ctm/ctm_pass3.c b/usr.sbin/ctm/ctm/ctm_pass3.c
index 8143816..049648d 100644
--- a/usr.sbin/ctm/ctm/ctm_pass3.c
+++ b/usr.sbin/ctm/ctm/ctm_pass3.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: ctm_pass3.c,v 1.8 1995/02/04 19:20:49 phk Exp $
+ * $Id: ctm_pass3.c,v 1.9 1995/03/25 20:46:51 joerg Exp $
  *
  */
 
@@ -28,7 +28,7 @@ Pass3(FILE *fd)
     FILE *ed=0;
     struct stat st;
 
-    if(Verbose>3) 
+    if(Verbose>3)
 	printf("Pass3 -- Applying the CTM-patch\n");
     MD5Init (&ctx);
 
@@ -74,9 +74,9 @@ Pass3(FILE *fd)
 		case CTM_F_Mode: GETFIELDCOPY(mode,sep); break;
 		case CTM_F_MD5:
 		    if(j & CTM_Q_MD5_Before)
-			GETFIELDCOPY(md5before,sep); 
+			GETFIELDCOPY(md5before,sep);
 		    else
-			GETFIELDCOPY(md5,sep); 
+			GETFIELDCOPY(md5,sep);
 		    break;
 		case CTM_F_Count: GETBYTECNT(cnt,sep); break;
 		case CTM_F_Bytes: GETDATA(trash,cnt); break;
@@ -105,7 +105,7 @@ Pass3(FILE *fd)
 		WRONG
 	    }
 	    continue;
-	} 
+	}
 	if(!strcmp(sp->Key,"FE")) {
 	    ed = popen("ed","w");
 	    if(!ed) {
@@ -156,7 +156,7 @@ Pass3(FILE *fd)
 		WRONG
 	    }
 	    continue;
-	} 
+	}
 	if(!strcmp(sp->Key,"FR")) {
 	    if (0 != unlink(name)) {
 		fprintf(stderr,"<%s> unlink failed\n",name);
@@ -164,8 +164,8 @@ Pass3(FILE *fd)
 		    WRONG
 	    }
 	    continue;
-	} 
-	if(!strcmp(sp->Key,"DR")) { 
+	}
+	if(!strcmp(sp->Key,"DR")) {
 	    /*
 	     * We cannot use rmdir() because we do not get the directories
 	     * in '-depth' order (cvs-cur.0018.gz for examples)
@@ -173,7 +173,7 @@ Pass3(FILE *fd)
 	    sprintf(buf,"rm -rf %s",name);
 	    system(buf);
 	    continue;
-	} 
+	}
 	WRONG
     }
     q = MD5End (&ctx);
diff --git a/usr.sbin/ctm/ctm/ctm_syntax.c b/usr.sbin/ctm/ctm/ctm_syntax.c
index a2da70a..89ea54f 100644
--- a/usr.sbin/ctm/ctm/ctm_syntax.c
+++ b/usr.sbin/ctm/ctm/ctm_syntax.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id$
+ * $Id: ctm_syntax.c,v 1.4 1994/09/22 02:49:21 phk Exp $
  *
  */
 
@@ -31,15 +31,15 @@
 #define Force	CTM_Q_MD5_Force
 
 static int ctmFM[] = /* File Make */
-    { Name|File|New, Uid, Gid, Mode, 
+    { Name|File|New, Uid, Gid, Mode,
 	MD5|After|Chunk, Count, Bytes,0 };
 
 static int ctmFS[] = /* File Substitute */
-    { Name|File, Uid, Gid, Mode, 
+    { Name|File, Uid, Gid, Mode,
 	MD5|Before|Force, MD5|After|Chunk, Count, Bytes,0 };
 
 static int ctmFE[] = /* File Edit */
-    { Name|File, Uid, Gid, Mode, 
+    { Name|File, Uid, Gid, Mode,
 	MD5|Before, MD5|After, Count, Bytes,0 };
 
 static int ctmFR[] = /* File Remove */
diff --git a/usr.sbin/ctm/ctm_rmail/ctm_rmail.c b/usr.sbin/ctm/ctm_rmail/ctm_rmail.c
index cc42e3f..a47f885 100644
--- a/usr.sbin/ctm/ctm_rmail/ctm_rmail.c
+++ b/usr.sbin/ctm/ctm_rmail/ctm_rmail.c
@@ -556,9 +556,9 @@ combine(char *delta, int npieces, char *dname, char *pname, char *tname)
  * MIME BASE64 decode table.
  */
 static unsigned char from_b64[0x80] =
-    { 
+    {
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,  
     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
diff --git a/usr.sbin/ctm/ctm_rmail/options.h b/usr.sbin/ctm/ctm_rmail/options.h
index f0d96c8..18b844c 100644
--- a/usr.sbin/ctm/ctm_rmail/options.h
+++ b/usr.sbin/ctm/ctm_rmail/options.h
@@ -15,7 +15,7 @@
  *
  * For example:
  *	zap -xz -f flame -q34 -- -x
- * 
+ *
  * where zap.c contains the following in main():
  *
  *	OPTIONS("[-xz] [-q queue-id] [-f dump-file] user")
diff --git a/usr.sbin/ctm/ctm_scan/ctm_scan.c b/usr.sbin/ctm/ctm_scan/ctm_scan.c
index 8650578..5a68e0f 100644
--- a/usr.sbin/ctm/ctm_scan/ctm_scan.c
+++ b/usr.sbin/ctm/ctm_scan/ctm_scan.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: ctm_scan.c,v 1.9 1995/03/24 21:33:20 phk Exp $
+ * $Id: ctm_scan.c,v 1.10 1995/03/24 21:36:32 phk Exp $
  *
  */
 #include <stdio.h>
@@ -22,7 +22,7 @@
 int barf[256];
 int CheckMode = 0;
 
-int 
+int
 pstrcmp(const void *pp, const void *qq)
 {
     return strcmp(*(char **)pp,*(char **)qq);
@@ -41,7 +41,7 @@ Do(char *path)
     MD5_CTX ctx;
     int fd,i,j,k,l,npde,nde=0;
     char **pde;
- 
+
     npde = 1;
     pde = malloc(sizeof *pde * (npde+1));
     d = opendir(path);
@@ -82,9 +82,9 @@ Do(char *path)
 	switch(st.st_mode & S_IFMT) {
 	    case S_IFDIR:
 		if(!CheckMode) {
-		    i = printf("d %s %o %lu %lu - - -\n",	
+		    i = printf("d %s %o %lu %lu - - -\n",
 			buf,st.st_mode & (~S_IFMT),st.st_uid,st.st_gid);
-		    if(!i) 
+		    if(!i)
 			exit(-1);
 		}
 		ret |= Do(buf);
@@ -170,7 +170,7 @@ main(int argc, char **argv)
 	argv++;
     }
 
-    /* 
+    /*
      * Scan the directories recursively.
      */
     if (argc > 1) {
@@ -182,6 +182,6 @@ main(int argc, char **argv)
 			return i;
 	}
 	return i;
-    } else 
+    } else
 	    return Do(".");
 }
diff --git a/usr.sbin/ctm/ctm_smail/ctm_smail.c b/usr.sbin/ctm/ctm_smail/ctm_smail.c
index df09070..4782f40 100644
--- a/usr.sbin/ctm/ctm_smail/ctm_smail.c
+++ b/usr.sbin/ctm/ctm_smail/ctm_smail.c
@@ -1,14 +1,14 @@
 /*
- * Send a compressed CTM delta to a recipient mailing list by encoding it 
+ * Send a compressed CTM delta to a recipient mailing list by encoding it
  * in safe ASCII characters, in mailer-friendly chunks, and passing it
  * to sendmail.  The encoding is almost the same as MIME BASE64, and is
  * protected by a simple checksum.
  *
  * Author: Stephen McKay
  *
- * NOTICE: This is free software.  I hope you get some use from this program.  
- * In return you should think about all the nice people who give away software. 
- * Maybe you should write some free software too.  
+ * NOTICE: This is free software.  I hope you get some use from this program.
+ * In return you should think about all the nice people who give away software.
+ * Maybe you should write some free software too.
  */
 
 #include <stdio.h>
@@ -69,7 +69,7 @@ main(int argc, char **argv)
 	err("%s: %s", delta_file, strerror(errno));
 	exit(1);
 	}
-    
+
     if (max_ctm_size != 0 && sb.st_size > max_ctm_size)
 	apologise(delta_file, sb.st_size, max_ctm_size, mail_alias);
     else