vratili original FreeBSD host.tcl i exec.tcl, a dodali Linux verzije u linux/; dodali...

diff --git a/imunes.tcl b/imunes.tcl
index 52cb6e3506dc713159c284955a701de2c4f70b51..4fd9dd83cdc091588aabb5ef79aab2870070000e 100755 (executable)
--- a/imunes.tcl
+++ b/imunes.tcl
@@ -102,6 +102,33 @@ if { $ROOTDIR == "." } {
     set BINDIR "bin"
 }
 
+#****v* imunes.tcl/gui_unix
+# NAME
+#    gui_unix
+# FUNCTION
+#    false: IMUNES GUI is on MS Windows, 
+#    true: GUI is on FreeBSD / Linux / ...
+#    Used in spawnShell to start xterm or command.com with NetCat
+#    Used below in order to source the right OS-specific files
+#*****
+
+if { $tcl_platform(platform) == "unix" } {
+    set gui_unix true
+    if { $tcl_platform(os) == "FreeBSD" } {
+           set gui_freebsd true
+        set gui_linux false
+       } elseif { $tcl_platform(os) == "Linux" } {
+           set gui_linux true
+        set gui_freebsd false
+    } else {
+        puts "a bit lost here... apparently I am $tcl_platform(os)"
+        exit 1
+    }
+} else {
+    set gui_unix false
+}
+#puts "we have gui_unix=$gui_unix gui_linux=$gui_linux";
+
 source "$ROOTDIR/$LIBDIR/canvas.tcl"
 source "$ROOTDIR/$LIBDIR/linkcfg.tcl"
 source "$ROOTDIR/$LIBDIR/nodecfg.tcl"
@@ -109,18 +136,34 @@ source "$ROOTDIR/$LIBDIR/ipv4.tcl"
 source "$ROOTDIR/$LIBDIR/ipv6.tcl"
 source "$ROOTDIR/$LIBDIR/ipsec.tcl"
 source "$ROOTDIR/$LIBDIR/cfgparse.tcl"
-# TODO: odrediti je li FreeBSD ili Linux i ovisno o tome ucitati pravi exec.tcl
-source "$ROOTDIR/$LIBDIR/exec.tcl"
+
+if { $gui_unix && $gui_linux } {
+    source "$ROOTDIR/$LIBDIR/linux/exec.tcl"
+} else {
+    source "$ROOTDIR/$LIBDIR/exec.tcl"
+}
+
 source "$ROOTDIR/$LIBDIR/eventsched.tcl"
 
-source "$ROOTDIR/$LIBDIR/quagga.tcl"
-source "$ROOTDIR/$LIBDIR/xorp.tcl"
-source "$ROOTDIR/$LIBDIR/static.tcl"
-source "$ROOTDIR/$LIBDIR/pc.tcl"
-source "$ROOTDIR/$LIBDIR/host.tcl"
-source "$ROOTDIR/$LIBDIR/hub.tcl"
-source "$ROOTDIR/$LIBDIR/lanswitch.tcl"
-source "$ROOTDIR/$LIBDIR/rj45.tcl"
+if { $gui_unix && $gui_linux } {
+#    source "$ROOTDIR/$LIBDIR/quagga.tcl"
+#    source "$ROOTDIR/$LIBDIR/xorp.tcl"
+#    source "$ROOTDIR/$LIBDIR/static.tcl"
+#    source "$ROOTDIR/$LIBDIR/pc.tcl"
+    source "$ROOTDIR/$LIBDIR/linux/host.tcl"
+#    source "$ROOTDIR/$LIBDIR/hub.tcl"
+#    source "$ROOTDIR/$LIBDIR/lanswitch.tcl"
+#    source "$ROOTDIR/$LIBDIR/rj45.tcl"
+} else {
+    source "$ROOTDIR/$LIBDIR/quagga.tcl"
+    source "$ROOTDIR/$LIBDIR/xorp.tcl"
+    source "$ROOTDIR/$LIBDIR/static.tcl"
+    source "$ROOTDIR/$LIBDIR/pc.tcl"
+    source "$ROOTDIR/$LIBDIR/host.tcl"
+    source "$ROOTDIR/$LIBDIR/hub.tcl"
+    source "$ROOTDIR/$LIBDIR/lanswitch.tcl"
+    source "$ROOTDIR/$LIBDIR/rj45.tcl"
+}
 
 source "$ROOTDIR/$LIBDIR/editor.tcl"
 source "$ROOTDIR/$LIBDIR/copypaste.tcl"
@@ -201,21 +244,6 @@ set editor_only false
 
 set exec_sockets_opened false
 
-#****v* imunes.tcl/gui_unix
-# NAME
-#    gui_unix
-# FUNCTION
-#    false: IMUNES GUI is on MS Windows, 
-#    true: GUI is on FreeBSD / Linux / ...
-#    Used in spawnShell to start xterm or command.com with NetCat
-#*****
-
-if { $tcl_platform(platform) == "unix" } {
-    set gui_unix true
-} else {
-    set gui_unix false
-}
-
 
 #****v* imunes.tcl/remote_exec
 # NAME