Plan 9 from Bell Labs 2013-11-12

sys/lib/backup/backup

@@ -67,7 +67,7 @@ fn backup1 {
 
 		sed 1,$disc1trks^d arenas >morearenas
 		mv morearenas arenas
-		arenas=`{cat arenas}
+		arenas_todo=`{cat arenas}
 	}
 }
 
@@ -75,8 +75,8 @@ cd $set
 tobackup $set >arenas
 quitonfailure $status
 
-arenas=`{cat arenas}
-if (~ $#arenas 0) {
+arenas_todo=`{cat arenas}
+if (~ $#arenas_todo 0) {
 	echo no sealed arenas not yet on disc exist on $fs
 	exit ''
 }
@@ -95,7 +95,7 @@ if (! ~ $debug yes && ~ $set set1 && ~ $print yes) {
 }
 
 progress=yes
-while (test $#arenas -gt 0 && ~ $progress yes) {
+while (test $#arenas_todo -gt 0 && ~ $progress yes) {
 	backup1
 	quitonfailure $status
 }

sys/lib/backup/backuparenas

@@ -39,17 +39,23 @@ if (! ~ $ok [Yy]*)
 	exit bad-nwa
 
 cd $fsroot/dev/fs
+shname = `{basename $arenas}
+if (! test -r $shname){
+	echo $0: $shname in `{pwd} not readable >[1=2]
+	exit unreadable-arenas
+}
+
 for (name) {
 	grep next /mnt/cd/ctl
 	# use -o 8192 to avoid devmnt fragmentation if bd drive is imported
-	venti/rdarena arena0 $name |
+	venti/rdarena $shname $name |
 		pump -i 65536 -o 8192 -k 100000 -d 5 >/mnt/cd/wd/$name
 #		pump -i 65536 -o 1048576 -k 51200 -d 10 >/mnt/cd/wd/$name
 	quitonfailure $status
 
 #	ls -l /mnt/cd
 	if (test -e '/env/fn#dumpdone' -a -e '/env/set')
-		dumpdone arena0 $name
+		dumpdone $shname $name
 }
 echo 'remember to *not* remove /mnt/cd/wd' >[1=2]
 # don't remove /mnt/cd/wd, since that would finalize the disc