* unix/mkLinks:

* doc/SetVar.3:
* generic/tcl.h:
* generic/tclVar.c: Restored Tcl_ObjGetVar2 and Tcl_ObjSetVar2
from 8.0. Renamed Tcl_Get/SetObjVar2 to Tcl_GetVar2Ex and
Tcl_SetVar2Ex.

* Merged 8.0.5b2 patches

6 files changed, 26 insertions, 19 deletions

diff --git a/library/auto.tcl b/library/auto.tcl
index 075a5d2..748c663 100644
--- a/library/auto.tcl
+++ b/library/auto.tcl
@@ -3,7 +3,7 @@
 # utility procs formerly in init.tcl dealing with auto execution
 # of commands and can be auto loaded themselves.
 #
-# RCS: @(#) $Id: auto.tcl,v 1.1.2.5 1998/12/02 20:08:05 welch Exp $
+# RCS: @(#) $Id: auto.tcl,v 1.1.2.6 1999/02/10 23:31:20 stanton Exp $
 #
 # Copyright (c) 1991-1993 The Regents of the University of California.
 # Copyright (c) 1994-1998 Sun Microsystems, Inc.
@@ -58,7 +58,7 @@ proc tcl_findLibrary {basename version patch initScript enVarName varName} {
 
     # The C application may have hardwired a path, which we honor
     
-    if {[info exist the_library]} {
+    if {[info exist the_library] && [string compare $the_library {}]} {
 	lappend dirs $the_library
     } else {
 
@@ -72,7 +72,8 @@ proc tcl_findLibrary {basename version patch initScript enVarName varName} {
 
 	# 2. Relative to the Tcl library
 
-        lappend dirs [file join [file dirname [info library]] $basename$version]
+        lappend dirs [file join [file dirname [info library]] \
+		$basename$version]
 
 	# 3. Various locations relative to the executable
 	# ../lib/foo1.0		(From bin directory in install hierarchy)
@@ -88,9 +89,7 @@ proc tcl_findLibrary {basename version patch initScript enVarName varName} {
         lappend dirs [file join $grandParentDir lib $basename$version]
         lappend dirs [file join $parentDir library]
         lappend dirs [file join $grandParentDir library]
-        if {[string match {*[ab]*} $patch]} {
-            set ver $patch
-        } else {
+        if {![regexp {.*[ab][0-9]*} $patch ver]} {
             set ver $version
         }
         lappend dirs [file join $grandParentDir $basename$ver library]
diff --git a/library/http/http.tcl b/library/http/http.tcl
index 622801f..2e3f724 100644
--- a/library/http/http.tcl
+++ b/library/http/http.tcl
@@ -9,7 +9,7 @@
 # See the file "license.terms" for information on usage and
 # redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: http.tcl,v 1.1.2.3 1999/01/29 00:20:46 stanton Exp $
+# RCS: @(#) $Id: http.tcl,v 1.1.2.4 1999/02/10 23:31:21 stanton Exp $
 
 package provide http 2.0	;# This uses Tcl namespaces
 
@@ -363,9 +363,10 @@ proc http::size {token} {
     if {[info exists state(-progress)]} {
 	eval $state(-progress) {$token $state(totalsize) $state(currentsize)}
     }
+    # At this point the token may have been reset
     if {([string length $error] != 0)} {
 	Finish $token $error
-    } elseif {[::eof $s]} {
+    } elseif {[catch {::eof $s} iseof] || $iseof} {
 	Eof $token
     } else {
 	CopyStart $s $token
diff --git a/library/http2.0/http.tcl b/library/http2.0/http.tcl
index 622801f..2e3f724 100644
--- a/library/http2.0/http.tcl
+++ b/library/http2.0/http.tcl
@@ -9,7 +9,7 @@
 # See the file "license.terms" for information on usage and
 # redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: http.tcl,v 1.1.2.3 1999/01/29 00:20:46 stanton Exp $
+# RCS: @(#) $Id: http.tcl,v 1.1.2.4 1999/02/10 23:31:21 stanton Exp $
 
 package provide http 2.0	;# This uses Tcl namespaces
 
@@ -363,9 +363,10 @@ proc http::size {token} {
     if {[info exists state(-progress)]} {
 	eval $state(-progress) {$token $state(totalsize) $state(currentsize)}
     }
+    # At this point the token may have been reset
     if {([string length $error] != 0)} {
 	Finish $token $error
-    } elseif {[::eof $s]} {
+    } elseif {[catch {::eof $s} iseof] || $iseof} {
 	Eof $token
     } else {
 	CopyStart $s $token
diff --git a/library/http2.1/http.tcl b/library/http2.1/http.tcl
index 622801f..2e3f724 100644
--- a/library/http2.1/http.tcl
+++ b/library/http2.1/http.tcl
@@ -9,7 +9,7 @@
 # See the file "license.terms" for information on usage and
 # redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: http.tcl,v 1.1.2.3 1999/01/29 00:20:46 stanton Exp $
+# RCS: @(#) $Id: http.tcl,v 1.1.2.4 1999/02/10 23:31:21 stanton Exp $
 
 package provide http 2.0	;# This uses Tcl namespaces
 
@@ -363,9 +363,10 @@ proc http::size {token} {
     if {[info exists state(-progress)]} {
 	eval $state(-progress) {$token $state(totalsize) $state(currentsize)}
     }
+    # At this point the token may have been reset
     if {([string length $error] != 0)} {
 	Finish $token $error
-    } elseif {[::eof $s]} {
+    } elseif {[catch {::eof $s} iseof] || $iseof} {
 	Eof $token
     } else {
 	CopyStart $s $token
diff --git a/library/http2.3/http.tcl b/library/http2.3/http.tcl
index 622801f..2e3f724 100644
--- a/library/http2.3/http.tcl
+++ b/library/http2.3/http.tcl
@@ -9,7 +9,7 @@
 # See the file "license.terms" for information on usage and
 # redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: http.tcl,v 1.1.2.3 1999/01/29 00:20:46 stanton Exp $
+# RCS: @(#) $Id: http.tcl,v 1.1.2.4 1999/02/10 23:31:21 stanton Exp $
 
 package provide http 2.0	;# This uses Tcl namespaces
 
@@ -363,9 +363,10 @@ proc http::size {token} {
     if {[info exists state(-progress)]} {
 	eval $state(-progress) {$token $state(totalsize) $state(currentsize)}
     }
+    # At this point the token may have been reset
     if {([string length $error] != 0)} {
 	Finish $token $error
-    } elseif {[::eof $s]} {
+    } elseif {[catch {::eof $s} iseof] || $iseof} {
 	Eof $token
     } else {
 	CopyStart $s $token
diff --git a/library/init.tcl b/library/init.tcl
index 6d77e30..712ae30 100644
--- a/library/init.tcl
+++ b/library/init.tcl
@@ -3,7 +3,7 @@
 # Default system startup file for Tcl-based applications.  Defines
 # "unknown" procedure and auto-load facilities.
 #
-# RCS: @(#) $Id: init.tcl,v 1.1.2.5 1999/01/29 00:20:45 stanton Exp $
+# RCS: @(#) $Id: init.tcl,v 1.1.2.6 1999/02/10 23:31:20 stanton Exp $
 #
 # Copyright (c) 1991-1993 The Regents of the University of California.
 # Copyright (c) 1994-1996 Sun Microsystems, Inc.
@@ -42,9 +42,11 @@ if {![info exists auto_path]} {
 	set auto_path ""
     }
 }
-foreach __dir [list [info library] [file dirname [info library]]] {
-    if {[lsearch -exact $auto_path $__dir] < 0} {
-	lappend auto_path $__dir
+if {[string compare [info library] {}]} {
+    foreach __dir [list [info library] [file dirname [info library]]] {
+	if {[lsearch -exact $auto_path $__dir] < 0} {
+	    lappend auto_path $__dir
+	}
     }
 }
 if {[info exist tcl_pkgPath]} {
@@ -54,7 +56,9 @@ if {[info exist tcl_pkgPath]} {
 	}
     }
 }
-unset __dir
+if {[info exists __dir]} {
+    unset __dir
+}
   
 # Windows specific end of initialization