From b7b88b4e55835125eb38dbbe52afa992f8481f3d Mon Sep 17 00:00:00 2001 From: phk Date: Mon, 27 Feb 1995 22:26:58 +0000 Subject: Latest updates to this. --- usr.sbin/ctm/mkCTM/ctm_conf.src-special | 9 +++++++++ usr.sbin/ctm/mkCTM/mkCTM | 22 +++++++++++----------- 2 files changed, 20 insertions(+), 11 deletions(-) create mode 100644 usr.sbin/ctm/mkCTM/ctm_conf.src-special (limited to 'usr.sbin/ctm/mkCTM') diff --git a/usr.sbin/ctm/mkCTM/ctm_conf.src-special b/usr.sbin/ctm/mkCTM/ctm_conf.src-special new file mode 100644 index 0000000..2a8ca70 --- /dev/null +++ b/usr.sbin/ctm/mkCTM/ctm_conf.src-special @@ -0,0 +1,9 @@ +#!/usr/local/bin/tclsh + +set CTMname src-cur +set CTMref $CTMSW/../$CTMname +set CTMcopy /c/phk/20R/usr/src +set CTMdont {\.core$|/CVS$|/CVS/|^/secure|^/eBones|/#cvs|/\.#} +set CTMtest 1 +set CTMspecial 1 +set CTMsuff R20 diff --git a/usr.sbin/ctm/mkCTM/mkCTM b/usr.sbin/ctm/mkCTM/mkCTM index 3490a72..8bc9463 100644 --- a/usr.sbin/ctm/mkCTM/mkCTM +++ b/usr.sbin/ctm/mkCTM/mkCTM @@ -130,6 +130,7 @@ set CTMcopy {} set CTMdest {} set CTMprefix . set CTMtest 0 +set CTMspecial 0 set max_damage 100 set damage 0 @@ -150,7 +151,7 @@ if {$CTMdest == ""} { set CTMscratch ${CTMtmp}.tmp while 1 { - if { "$CTMcopy" != "" } { + if { ! $CTMspecial} { set CTMnbr [lindex [exec cat $CTMcopy/.ctm_status] 1] if {![find_delta $CTMnbr]} { @@ -170,13 +171,17 @@ while 1 { close $fo incr changes -1 - set f1 [open "| ./ctm_scan $CTMcopy"] } else { set CTMnbr [lindex [exec cat $CTMref/.ctm_status] 1] + } + + if {"$CTMcopy" == "" } { set f1 [open /dev/null] + } else { + set f1 [open "| ./ctm_scan $CTMcopy"] } - puts "Doing CTMname $CTMname CTMnbr $CTMnbr CTMdate $CTMdate" + puts "Doing CTMname $CTMname CTMnbr $CTMnbr$CTMsuff CTMdate $CTMdate" flush stdout exec sh -c "rm -f ${CTMtmp}.* ${CTMtmp}:*" >&@ stdout @@ -267,18 +272,12 @@ while 1 { flush stdout set nm [format "%s.%04d%s" $CTMname $CTMnbr $CTMsuff] - set fdmd5 [open "|/sbin/md5 >> $CTMtmp.end" w] - set fdout [open "| gzip -9 > ${CTMtmp}:${nm}.gz" w] + set fdout [open "| /sbin/md5 -p | gzip -9 > ${CTMtmp}:${nm}.gz" w] foreach i {begin del rmdir mkdir files} { - exec cat $CTMtmp.$i >@$fdmd5 exec cat $CTMtmp.$i >@$fdout } - puts $fdmd5 "CTM_END " nonewline - close $fdmd5 ; unset fdmd5 puts $fdout "CTM_END " nonewline - flush $fdout - exec cat $CTMtmp.end >@$fdout close $fdout ; unset fdout exec sh -x -c "rm -f ${CTMtmp}.*" >&@ stdout @@ -300,7 +299,7 @@ while 1 { if {$CTMmail != ""} { puts "Mailing delta" flush stdout - exec $CTMSW/ctm_smail -m 50000 -c 3000000 $CTMdest/${nm}.gz $CTMmail >&@ stdout + exec $CTMSW/ctm_smail -m 100000 -c 3000000 $CTMdest/${nm}.gz $CTMmail >&@ stdout } # If we did an absolute delta: stop. @@ -315,5 +314,6 @@ while 1 { set CTMcopy "" set CTMmail "" set CTMapply 0 + set CTMspecial 1 } puts "done." -- cgit v1.1