<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[141415] trunk/base/src/pextlib1.0/system.c</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/141415">141415</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2015-10-17 17:07:16 -0700 (Sat, 17 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>base: pextlib/system: Report signal termination
Add code to correctly report termination by signal back to the Tcl user. See
https://www.tcl.tk/man/tcl7.6/TclCmd/tclvars.n.html#M7 for a description of the
format in case of signaled subprocesses. See vendor/tcl8.5.15/generic/tclPipe.c
for C code that generates these messages. Use Tcl_SignalId and Tcl_SignalMsg to
generate the required data for the message to be returned to the user.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbasesrcpextlib10systemc">trunk/base/src/pextlib1.0/system.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbasesrcpextlib10systemc"></a>
<div class="modfile"><h4>Modified: trunk/base/src/pextlib1.0/system.c (141414 => 141415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/pextlib1.0/system.c 2015-10-18 00:06:39 UTC (rev 141414)
+++ trunk/base/src/pextlib1.0/system.c 2015-10-18 00:07:16 UTC (rev 141415)
</span><span class="lines">@@ -306,23 +306,36 @@
</span><span class="cx">
</span><span class="cx"> status = TCL_ERROR;
</span><span class="cx">
</span><del>- if (wait(&ret) == pid && WIFEXITED(ret) && !read_failed) {
</del><ins>+ if (wait(&ret) == pid && (WIFEXITED(ret) || WIFSIGNALED(ret)) && !read_failed) {
</ins><span class="cx"> /* Normal exit, and reading from the pipe didn't fail. */
</span><del>- if (WEXITSTATUS(ret) == 0) {
</del><ins>+ if (WIFEXITED(ret) && WEXITSTATUS(ret) == 0) {
</ins><span class="cx"> status = TCL_OK;
</span><span class="cx"> } else {
</span><span class="cx"> Tcl_Obj* errorCode;
</span><span class="cx">
</span><span class="cx"> /* print error */
</span><span class="cx"> ui_info(interp, "Command failed: %s", cmdstring);
</span><del>- ui_info(interp, "Exit code: %d", WEXITSTATUS(ret));
</del><ins>+ if (WIFEXITED(ret)) {
+ ui_info(interp, "Exit code: %d", WEXITSTATUS(ret));
+ } else if(WIFSIGNALED(ret)) {
+ ui_info(interp, "Killed by signal: %d", WTERMSIG(ret));
+ }
</ins><span class="cx">
</span><del>- /* set errorCode [list CHILDSTATUS <pid> <code>] */
</del><span class="cx"> errorCode = Tcl_NewListObj(0, NULL);
</span><del>- Tcl_ListObjAppendElement(interp, errorCode, Tcl_NewStringObj("CHILDSTATUS", -1));
- Tcl_ListObjAppendElement(interp, errorCode, Tcl_NewIntObj(pid));
- Tcl_ListObjAppendElement(interp, errorCode, Tcl_NewIntObj(WEXITSTATUS(ret)));
- Tcl_SetObjErrorCode(interp, errorCode);
</del><ins>+ if (WIFEXITED(ret)) {
+ /* set errorCode [list CHILDSTATUS <pid> <code>] */
+ Tcl_ListObjAppendElement(interp, errorCode, Tcl_NewStringObj("CHILDSTATUS", -1));
+ Tcl_ListObjAppendElement(interp, errorCode, Tcl_NewIntObj(pid));
+ Tcl_ListObjAppendElement(interp, errorCode, Tcl_NewIntObj(WEXITSTATUS(ret)));
+ Tcl_SetObjErrorCode(interp, errorCode);
+ } else if (WIFSIGNALED(ret)) {
+ /* set errorCode [list CHILDKILLED <pid> <SIGNAME> <signal descripton>] */
+ Tcl_ListObjAppendElement(interp, errorCode, Tcl_NewStringObj("CHILDKILLED", -1));
+ Tcl_ListObjAppendElement(interp, errorCode, Tcl_NewIntObj(pid));
+ Tcl_ListObjAppendElement(interp, errorCode, Tcl_NewStringObj(Tcl_SignalId(WTERMSIG(ret)), -1));
+ Tcl_ListObjAppendElement(interp, errorCode, Tcl_NewStringObj(Tcl_SignalMsg(WTERMSIG(ret)), -1));
+ Tcl_SetObjErrorCode(interp, errorCode);
+ }
</ins><span class="cx">
</span><span class="cx"> Tcl_SetObjResult(interp, Tcl_NewStringObj("command execution failed", -1));
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>