Changeset 3185 for trunk/lang

Timestamp:

Oct 18, 2012, 3:01:53 PM (12 years ago)

Author:

gah

Message:

 

File:

• trunk/lang/tcl/scripts/exec.tcl (modified) (3 diffs)

trunk/lang/tcl/scripts/exec.tcl

@@ -46 +46 @@
     append execout(output) $execout(extra)
 
-    if {$status != 0} {
-        if {[regexp {^KILLED} $execctl] && [llength $execctl] == 4} {
-            set reason [lindex $execctl end]
-            set result "job killed: $reason"
-        }
+    if { $status != 0 } {
+        # We're here because the exec-ed program failed 
+        if { $execctl != "" } {
+            foreach { token pid code mesg } $execctl break
+            if { $token == "EXITED" } {
+                # This means that the program exited normally but
+                # returned a non-zero exitcode.  Consider this an
+                # invalid result from the program.  Append the stderr
+                # from the program to the message.
+                set result \
+                    "Program finished: exit code is $code\n\n"
+                append result $execout(error)
+            } elseif { $token == "abort" }  {
+                # The user pressed the abort button.
+                set result "Program terminated by user.\n\n"
+                append result $execout(output)
+            } else {
+                # Abnormal termination
+                set result "Abnormal program termination: $mesg\n\n"
+                append result $execout(output)
+            }
+        }
         error $result
     }
@@ -72 +89 @@
     #
     if {$channel == "stderr"} {
+        append execout(error) $message
         set newmesg ""
         foreach line [split $message \n] {
@@ -78 +96 @@
         set message $newmesg
     }
-
     #
     # If this message is coming in on the same channel as the