summaryrefslogtreecommitdiffstats
path: root/usr.sbin/ctm/mkCTM
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>1994-09-26 06:01:01 +0000
committerphk <phk@FreeBSD.org>1994-09-26 06:01:01 +0000
commit5a5794a15ded6fc55c5461698466ca2186b348c8 (patch)
tree873214d2c6600110c649ac4416a438046006d486 /usr.sbin/ctm/mkCTM
parentf37e6d1e5de7c658b8eab4fef2567ee7c369fdb4 (diff)
downloadFreeBSD-src-5a5794a15ded6fc55c5461698466ca2186b348c8.zip
FreeBSD-src-5a5794a15ded6fc55c5461698466ca2186b348c8.tar.gz
A couple of nit-picks.
Diffstat (limited to 'usr.sbin/ctm/mkCTM')
-rw-r--r--usr.sbin/ctm/mkCTM/mkCTM16
1 files changed, 10 insertions, 6 deletions
diff --git a/usr.sbin/ctm/mkCTM/mkCTM b/usr.sbin/ctm/mkCTM/mkCTM
index 047fa0e..35198e9 100644
--- a/usr.sbin/ctm/mkCTM/mkCTM
+++ b/usr.sbin/ctm/mkCTM/mkCTM
@@ -13,7 +13,7 @@ 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"]
@@ -83,10 +83,10 @@ proc CTMchg {t1 n1 m1 u1 g1 b1 s1 h1 t2 n2 m2 u2 g2 b2 s2 h2} {
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
@@ -148,13 +148,17 @@ 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
}
OpenPOWER on IntegriCloud