<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/0210261e6ddec5f4b71d0c2fd00d446d2fb45fdf">https://github.com/macports/macports-base/commit/0210261e6ddec5f4b71d0c2fd00d446d2fb45fdf</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 0210261e6ddec5f4b71d0c2fd00d446d2fb45fdf
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Mon Dec 12 03:33:03 2016 +1100
<span style='display:block; white-space:pre;color:#404040;'> Turn off syscall restarting in get_next_cmdline
</span>---
src/port/port.tcl | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port/port.tcl b/src/port/port.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index df06599..52f0655 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port/port.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port/port.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4807,7 +4807,11 @@ proc get_next_cmdline { in out use_readline prompt linename } {
</span>
set line ""
while { $line eq "" } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Don't restart syscalls interrupted by signals while potentially
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # blocking on user input. Unfortunately, readline seems to try
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # again when syscalls fail with EINTR, so ctrl-c will not
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # actually raise an error until after the line is read.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ signal error {TERM INT}
</span> if {$use_readline} {
set len [readline read -attempted_completion attempt_completion line $prompt]
} else {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4815,7 +4819,8 @@ proc get_next_cmdline { in out use_readline prompt linename } {
</span> flush $out
set len [gets $in line]
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Re-enable syscall restarting
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ signal -restart error {TERM INT}
</span> if { $len < 0 } {
return -1
}
</pre><pre style='margin:0'>
</pre>