flexfax: bug in tkhylafax-3.0 (Patch)

[Glenn Burkhardt <glenn@aoi.ultranet.com>]

I've found what appears to be another bug - the cover sheet selection
didn't work at all.  Selecting 'No Cover Page' didn't prevent sending a
cover page; selecting any cover page other than the default didn't work
either.

Here's my patch.  It include my previous patch to allow special
characters to appear in the comments section.  

Thanks.


*** orig/faxIt.t	Thu Oct  9 16:58:22 1997
--- faxIt.t	Thu Oct  9 16:59:21 1997
***************
*** 67,76 ****
  
      if {[string length $Th_Info(name)]} {
          # This MUST appear.
!         append options " -d \"$Th_Info(name)@$Th_Info(phone)\""
  
          # Make an ID string for later usage
!         append options " -i \"$Th_Info(name)@$Th_Info(company)\"" 
      } else {
          # This MUST appear.
          append options " -d $Th_Info(phone)"
--- 67,78 ----
  
      if {[string length $Th_Info(name)]} {
          # This MUST appear.
! 	regsub -all {["'$\\]} $Th_Info(name) {\\&} name
!         append options " -d \"$name@$Th_Info(phone)\""
  
          # Make an ID string for later usage
! 	regsub -all {["'$\\]} $Th_Info(company) {\\&} company
!         append options " -i \"$name@$company\"" 
      } else {
          # This MUST appear.
          append options " -d $Th_Info(phone)"
***************
*** 88,115 ****
  	    append faxcmd "[mkCover] | sendfax -n" $options
  	}
      } elseif {$sz > 0} {
  	# Make command. Ignore the following options: -k -s -h -v 
! 	append faxcmd "sendfax "
  
!          foreach ln [lsort [array name Comments]] { 
  	    append comments "$Comments($ln) "
!          }    
  
  	set comments [string trim $comments]
  	if {[string length $comments]} {
  	    append faxcmd " -c \"$comments\""
  	}
  
  	if {[string length $Th_Info(regard)]} {
! 	    append faxcmd " -r \"$Th_Info(regard)\""
  	}
  
  	if {[string length $Th_Info(company)]} {
! 	    append faxcmd " -x \"$Th_Info(company)\""
  	}
  
  	if {[string length $Th_Info(location)]} {
! 	    append faxcmd " -y \"$Th_Info(location)\""
  	}
  
  	append faxcmd $options
--- 90,122 ----
  	    append faxcmd "[mkCover] | sendfax -n" $options
  	}
      } elseif {$sz > 0} {
+ 
  	# Make command. Ignore the following options: -k -s -h -v 
! 	append faxcmd "sendfax " $Th_Info(coverPage)
  
!         foreach ln [lsort [array name Comments]] { 
  	    append comments "$Comments($ln) "
!         }    
  
  	set comments [string trim $comments]
  	if {[string length $comments]} {
+ 	    regsub -all {["'$\\]} $comments {\\&} comments
  	    append faxcmd " -c \"$comments\""
  	}
  
  	if {[string length $Th_Info(regard)]} {
! 	    regsub -all {["'$\\]} $Th_Info(regard) {\\&} regarding
! 	    append faxcmd " -r \"$regarding\""
  	}
  
  	if {[string length $Th_Info(company)]} {
! 	    regsub -all {["'$\\]} $Th_Info(company) {\\&} company
! 	    append faxcmd " -x \"$company\""
  	}
  
  	if {[string length $Th_Info(location)]} {
! 	    regsub -all {["'$\\]} $Th_Info(location) {\\&} location
! 	    append faxcmd " -y \"$location\""
  	}
  
  	append faxcmd $options