--- ray/src/util/do_file.tcl	1995/09/21 10:29:12	2.11
+++ ray/src/util/do_file.tcl	1997/08/12 15:19:05	2.15
@@ -3,8 +3,6 @@
 # Choose the Rad Input File to work on.
 #
 
-set rif_glob *.rif
-
 proc preen {} {			# clean up radvar
 	global radvar rifname
 	foreach n {objects scene materials illum mkillum render oconv pfilt
@@ -75,7 +73,7 @@ proc preen {} {			# clean up radvar
 
 proc setradvar stmt {		# assign a rad variable
 	global radvar
-	regexp {^([a-zA-Z][a-zA-Z0-9]*) *= *(.*)$} $stmt dummy vnam vval
+	regexp {^([a-zA-Z][a-zA-Z0-9]*) *=[ 	]*(.*)$} $stmt dummy vnam vval
 	switch -glob $vnam {
 		obj* { eval lappend radvar(objects) $vval }
 		sce* { eval lappend radvar(scene) $vval }
@@ -143,7 +141,7 @@ proc putradvar {fi vn} {	# print out a rad variable
 proc load_vars {f {vl all}} {	# load RIF variables
 	global curmess radvar alldone
 	if {"$f" == ""} {return 0}
-	if {! [file exists $f]} {
+	if {! [file isfile $f]} {
 		beep
 		set curmess "$f: no such file."
 		return 0
@@ -160,7 +158,7 @@ proc load_vars {f {vl all}} {	# load RIF variables
 	if {"$vl" == "all"} {
 		catch {unset radvar}
 		while {[gets $fi curli] != -1} {
-			if [regexp {^[a-zA-Z][a-zA-Z0-9]*= } $curli] {
+			if [regexp {^[a-zA-Z][a-zA-Z0-9]* *=} $curli] {
 				setradvar $curli
 			} else {
 				break
@@ -169,7 +167,11 @@ proc load_vars {f {vl all}} {	# load RIF variables
 		set curmess {Project loaded.}
 	} else {
 		foreach n $vl {
-			catch {unset radvar($n)}
+			if [regexp {[a-z][a-z]*} $n] {
+				set radvar($n) {}
+			} else {
+				catch {unset radvar($n)}
+			}
 		}
 		while {[gets $fi curli] != -1} {
 			if [regexp {^[a-zA-Z][a-zA-Z0-9]* *=} $curli] {
@@ -238,13 +240,19 @@ proc newsave f {		# save a RIF
 			return 0
 		}
 	} elseif {[file exists $f]} {
+		set ftyp [file type $f]
+		if { $ftyp != "file" } {
+			beep
+			set curmess "Selected file $f is a $ftyp."
+			return 0
+		}
 		if [tk_dialog .dlg {Verification} \
 				"Overwrite existing file $f?" \
 				questhead 1 {Go Ahead} {Cancel}] {
 			return 0
 		}
 	}
-	if {[file exists $f] && ! [file writable $f] && 
+	if {[file isfile $f] && ! [file writable $f] && 
 			[catch {exec chmod u+w $f} curmess]} {
 		beep
 		return 0
@@ -261,6 +269,12 @@ proc newsave f {		# save a RIF
 proc newnew f {			# create a new RIF
 	global rifname readonly curmess radvar
 	if [file exists $f] {
+		set ftyp [file type $f]
+		if { $ftyp != "file" } {
+			beep
+			set curmess "Selected file $f is a $ftyp."
+			return 0
+		}
 		if [tk_dialog .dlg {Verification} \
 				"File $f exists -- disregard it?" \
 				questhead 1 {Yes} {Cancel}] {
@@ -278,10 +292,10 @@ proc newnew f {			# create a new RIF
 }
 
 proc do_file w {
-	global rifname readonly rif_glob curfile curpat
+	global rifname readonly myglob curfile curpat
 	if {"$w" == "done"} {
 		cd [file dirname $rifname]
-		set rif_glob $curpat
+		set myglob(rif) $curpat
 		return
 	}
 	frame $w
@@ -302,6 +316,6 @@ proc do_file w {
 	helplink $w.left.new trad file new
 	helplink $w.left.ro trad file readonly
 	getfile -view view_txt -perm \
-			-win $w.right -glob [file dirname $rifname]/$rif_glob
+			-win $w.right -glob [file dirname $rifname]/$myglob(rif)
 	set curfile [file tail $rifname]
 }