Changeset 5588

Timestamp:

Jul 28, 2009, 4:53:48 PM (15 years ago)

Author:

landauf

Message:

changes in init.tcl:

• check if tcl was properly initialized
• bugfix in puts
• added backwards compatibility in unknown

Location:

data/media/tcl

Files:

• init.tcl (modified) (6 diffs)
• remote.tcl (modified) (1 diff)

data/media/tcl/init.tcl

@@ +1 @@
+# Check if Tcl was properly initialized
+info library
+
+# Create orxonox namespace
 namespace eval orxonox {}
 
@@ -163 +167 @@
         execute puts $newline $s
     } else {
-        ::tcl::puts $args
+        eval [concat ::tcl::puts $args]
     }
 }
@@ -180 +184 @@
     # get the returned errormessage if an undefined_proc command is called
     if {[llength [info commands ::tcl::unknown]] == 0} {
-        set errorcode [catch {unknown undefined_proc} result options]
+        set errorcode [catch {unknown undefined_proc} result]
     } else {
-        set errorcode [catch {::tcl::unknown undefined_proc} result options]
+        set errorcode [catch {::tcl::unknown undefined_proc} result]
     }
 
@@ -211 +215 @@
 
             set cmd [concat ::tcl::unknown $args]
-            set errorcode [catch {eval $cmd} result options]
+            if {[info tclversion] < 8.5} {
+                set errorcode [catch {eval $cmd} result]
+            } else {
+                set errorcode [catch {eval $cmd} result options]
+            }
             set resultlist [split $result]
             set success 1
@@ -227 +235 @@
 
             if {!$success} {
-                return -code $errorcode -options $options $result
+                if {[info tclversion] < 8.5} {
+                    return -code $errorcode $result
+                } else {
+                    return -code $errorcode -options $options $result
+                }
             } else {
                 return [query $args]
@@ -240 +252 @@
     unset errorcode
     unset result
-    unset options
 
     # if the "undefined_proc" command was renamed previously, undo this

data/media/tcl/remote.tcl

@@ -1 +1 @@
 set telnetserverthreadid [TclThreadManager create]
-TclThreadManager execute $telnetserverthreadid source telnet_server.tcl
+TclThreadManager execute $telnetserverthreadid source $pld/telnet_server.tcl