diff --git a/usr.sbin/ctm/ctm_scan/ctm_scan.c b/usr.sbin/ctm/ctm_scan/ctm_scan.c
index 0f6e3dea2ed6..e38a9f00eb85 100644
--- a/usr.sbin/ctm/ctm_scan/ctm_scan.c
+++ b/usr.sbin/ctm/ctm_scan/ctm_scan.c
@@ -1,171 +1,173 @@
 /*
  * ----------------------------------------------------------------------------
  * "THE BEER-WARE LICENSE" (Revision 42):
  * <phk@login.dkuug.dk> wrote this file.  As long as you retain this notice you
  * can do whatever you want with this stuff. If we meet some day, and you think
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id$
+ * $Id: ctm_scan.c,v 1.5 1994/09/25 20:45:55 phk Exp $
  *
  */
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/file.h>
 #include <dirent.h>
 #include <md5.h>
 
 int barf[256];
 int CheckMode = 0;
 
 int 
 pstrcmp(const void *pp, const void *qq)
 {
     return strcmp(*(char **)pp,*(char **)qq);
 }
 
 int
 Do(char *path)
 {
     DIR *d;
     struct dirent *de;
     struct stat st;
     int ret=0;
     u_char buf[BUFSIZ];
     u_char data[BUFSIZ],*q;
     int bufp;
     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);
     if(!d) { perror(path); return 2; }
     if(!strcmp(path,".")) {
 	*buf = 0;
     } else {
 	strcpy(buf,path);
 	if(buf[strlen(buf)-1] != '/')
 	    strcat(buf,"/");
     }
     bufp = strlen(buf);
     while((de=readdir(d))) {
 	if(!strcmp(de->d_name,".")) continue;
 	if(!strcmp(de->d_name,"..")) continue;
 	if(nde >= npde) {
 	    npde *= 2;
 	    pde = realloc(pde,sizeof *pde * (npde+1));
 	}
 	strcpy(buf+bufp,de->d_name);
 	if(stat(buf,&st)) {
 	    ret |= 1;
 	    continue;
 	}
 	pde[nde] = malloc(strlen(buf+bufp)+1);
         strcpy(pde[nde++],buf+bufp);
     }
     closedir(d);
     if(!nde) return 0;
     qsort(pde,nde,sizeof *pde, pstrcmp);
     for(k=0;k<nde;k++) {
 	strcpy(buf+bufp,pde[k]);
         free(pde[k]);
 	if(stat(buf,&st)) {
 	    ret |= 1;
 	    continue;
 	}
 	switch(st.st_mode & S_IFMT) {
 	    case S_IFDIR:
-		i = printf("d %s %d %d %d - - -\n",	
-		    buf,st.st_mode & (~S_IFMT),st.st_uid,st.st_gid);
-		if(!i) 
-		    exit(-1);
+		if(!CheckMode) {
+		    i = printf("d %s %d %d %d - - -\n",	
+			buf,st.st_mode & (~S_IFMT),st.st_uid,st.st_gid);
+		    if(!i) 
+			exit(-1);
+		}
 		ret |= Do(buf);
 		break;
 	    case S_IFREG:
 		fd = open(buf,O_RDONLY);
 		if(fd < 0) {
 		    ret |= 1;
 		    continue;
 		}
 		MD5Init(&ctx);
 		l = 1;
 		j = 0;
 		while(0 < (i = read(fd,data,sizeof data))) {
 		    l = (data[i-1] == '\n');
 		    if(!CheckMode)
 			MD5Update(&ctx,data,i);
 		    for(q=data;i && !j;i--)
 			if(barf[*q++])
 			    j=1;
 		}
 		close(fd);
 		if(CheckMode) {
 		    if(j || !l) {
 			i = printf("%s",buf);
 			if(!i) exit(-1);
 			if(j) printf("  Illegal characters.");
 			if(!l) printf("  No final newline.");
 			i = printf(".\n");
 			if(!i) exit(-1);
 			}
 		} else {
 		    if(!l)
 			j=2;
 		    i = printf("f %s %o %d %d %d %d %s\n",
 			buf,st.st_mode & (~S_IFMT),st.st_uid,st.st_gid,
 			j,st.st_size,MD5End(&ctx));
 		    if(!i) exit(-1);
 		}
 		break;
 	    default:
 		fprintf(stderr,"%s: type 0%o\n",buf, st.st_mode & S_IFMT);
 		ret |= 4;
 		break;
 	}
     }
     free(pde);
     return ret;
 }
 
 int
 main(int argc, char **argv)
 {
     /*
      * Initialize barf[], characters diff/patch will not appreciate.
      */
 
     barf[0x00] = 1;
     barf[0x7f] = 1;
     barf[0x80] = 1;
     barf[0xff] = 1;
 
     /*
      * -c is CheckMode
      */
     if (argc > 1 && !strcmp(argv[1],"-c")) {
 	CheckMode=1;
 	argc--;
 	argv++;
     }
 
     /*
      * First argument, if any, is where to do the work.
      */
     if (argc > 1) {
 	if(chdir(argv[1])) {
 	    perror(argv[1]);
 	    return 2;
 	}
     }
 
     /* 
      * Scan the directories recursively.
      */
     return Do(".");
 }
diff --git a/usr.sbin/ctm/mkCTM/mkCTM b/usr.sbin/ctm/mkCTM/mkCTM
index 047fa0e06981..35198e98453a 100644
--- a/usr.sbin/ctm/mkCTM/mkCTM
+++ b/usr.sbin/ctm/mkCTM/mkCTM
@@ -1,160 +1,164 @@
 #!/usr/local/bin/tclsh
 
 set CTMignoreCVS 0
 set CTMapply 1
 
 source $argv
 
 set tmp $CTMtmp
 set dd  $CTMdest
 set d1  $CTMcopy
 set d2  $CTMref
 set foo $CTMdate
 set foo $CTMprefix
 set foo $CTMname
 
-exec rm -f $tmp.*
+exec sh -x -c "rm -f ${tmp}.*" >&@ stdout
 
 set f1 [open "| ./ctm_scan $d1"]
 set f2 [open "| ./ctm_scan $d2"]
 
 set fo_del   [open $tmp.del w]
 set fo_rmdir [open $tmp.rmdir w]
 set fo_mkdir [open $tmp.mkdir w]
 set fo_files [open $tmp.files w]
 set changes 0
 
 ####
 # Find CTM#
 for {set i 0} {1} {incr i} {
     if {[file exists [format "%s/$CTMname.%04d" $dd $i]]} continue
     if {[file exists [format "%s/$CTMname.%04d.gz" $dd $i]]} continue
     break
 }
 set CTMnbr $i
 
 puts "Doing CTMname $CTMname CTMnbr $CTMnbr CTMdate $CTMdate"
 
 #####
 # Type Name Mode User Group Barf Size Hash
 
 proc CTMadd {t n m u g b s h} {
     global fo_files fo_mkdir changes d2
     puts stderr "A $b  $t  $n"
     if {$t == "d"} {
 	puts $fo_mkdir "CTMDM $n $u $g $m"
 	incr changes
 	return
     }
     puts $fo_files "CTMFM $n $u $g $m $h $s"
     flush $fo_files
     exec cat $d2/$n >@ $fo_files
     puts $fo_files ""
     incr changes
     return
 }
 proc CTMdel {t n m u g b s h} {
     global fo_del fo_rmdir changes
     puts stderr "D $b  $t  $n"
     if {$t == "d"} {
 	puts $fo_rmdir "CTMDR $n"
 	incr changes
 	return
     }
     puts $fo_del "CTMFR $n $h"
     incr changes
     return
 }
 proc CTMchg {t1 n1 m1 u1 g1 b1 s1 h1 t2 n2 m2 u2 g2 b2 s2 h2} {
     global fo_files d2 d1 changes
     if {$t1 == "d" && $t2 == "d"} {
 	return
     }
     if {$t1 == "d" || $t2 == "d"} {
 	CTMdel $t1 $n1 $m1 $u1 $g1 $b1 $s1 $h1
 	CTMadd $t2 $n2 $m2 $u2 $g2 $b2 $s2 $h2
 	return
     }
     if {"x$h1" == "x$h2" && $s1 == $s2} {
 	return
         puts stderr "M $b1$b2 $t1$t2 $n1"
 	puts $fo_files "CTMFA $n2 $u2 $g2 $m2 $h2"
 	incr changes
 	return
     }
     if {$b1 == "0" && $b2 == "0"} {
-	puts stderr "E $b1$b2 $t1$t2 $n1"
 	set i [catch "exec diff -n $d1/$n1 $d2/$n2 > tmp" j]
 	set s [file size tmp]
 	if {$s < $s2} {
+	    puts stderr "E $b1$b2 $t1$t2 $n1"
 	    puts $fo_files "CTMFN $n1 $u2 $g2 $m2 $h1 $h2 $s"
 	    flush $fo_files
 	    exec cat tmp >@ $fo_files
 	    puts $fo_files ""
 	    incr changes
 	    return
 	}
     }
     puts stderr "R $b1$b2 $t1$t2 $n1"
     puts $fo_files "CTMFS $n2 $u2 $g2 $m2 $h1 $h2 $s2"
     flush $fo_files
     exec cat $d2/$n2 >@ $fo_files
     puts $fo_files ""
     incr changes
     return
 }
 #####
 set l1 ""
 set l2 ""
 
 while 1 {
 
     if {$l1 == ""} {gets $f1 l1}
 
     if {$l2 == ""} {gets $f2 l2}
     
     if {$l1 == "" && $l2 == ""} break
 
     set n1 [lindex $l1 1]
     set n2 [lindex $l2 1]
 
     if {$l1 == $l2}  { set l1 "" ; set l2 "" ; continue }
 
     if {$CTMignoreCVS } {
 	if {[regexp {/CVS/} $l1]} {set l1 ""; continue }
 	if {[regexp {/CVS/} $l2]} {set l2 ""; continue }
     }
 
     if {$l1 == "" }   { eval CTMadd $l2 ; set l2 "" ; continue }
 
     if {$l2 == "" }   { eval CTMdel $l1 ; set l1 "" ; continue }
 
     if {$n1 < $n2 }   { eval CTMdel $l1 ; set l1 "" ; continue }
     
     if {$n1 > $n2 }   { eval CTMadd $l2 ; set l2 "" ; continue }
 
     if {$n1 == $n2}  { eval CTMchg $l1 $l2 ; set l1 "" ; set l2 "" ; continue }
 }
 
 close $fo_del
 close $fo_rmdir
 close $fo_mkdir
 close $fo_files
 
 exec echo CTM_BEGIN 2.0 $CTMname $CTMnbr $CTMdate $CTMprefix > $tmp.begin
 exec echo -n "CTM_END " >> $tmp.end
 set m [exec cat $tmp.begin $tmp.del $tmp.rmdir $tmp.mkdir $tmp.files $tmp.end | /sbin/md5]
 exec echo "$m" >> $tmp.end
 
 if {!$changes} {
     puts "no changes"
-    exec sh -c "rm -f $tmp.*"
+    exec sh -c "rm -f ${tmp}.*"
     exit 0
 }
-
+flush stdout
 set  nm [format "%s/%s.%04d" $dd $CTMname $CTMnbr]
-exec cat $tmp.begin $tmp.del $tmp.rmdir $tmp.mkdir $tmp.files $tmp.end | gzip -9 -v > ${nm}.gz 
-exec sh -c "rm -f $tmp.*"
+
+exec cat $tmp.begin $tmp.del $tmp.rmdir $tmp.mkdir $tmp.files $tmp.end \
+	| gzip -9 > ${nm}.gz 
+
+exec sh -x -c "rm -f ${tmp}.*" >&@ stdout
+
 if {$CTMapply} {
 	exec sh -e -x -c "cd $CTMcopy ; /root/CTM/ctm -v -v -v ${nm}.gz" >&@ stdout
 }