Merge branch 'fix/issue-1757' of git://github.com/dtzWill/nix

2017-12-27 18:51:05 -05:00 · 2017-12-27 18:51:05 -05:00 · 6a0dd63508
parent 25196d0d26 bd17ccf1d8
commit 6a0dd63508
1 changed files with 10 additions and 1 deletions
--- a/src/nix/repl.cc
+++ b/src/nix/repl.cc
@ -186,7 +186,16 @@ bool NixRepl::getLine(string & input, const std::string &prompt)
 {
    char * s = linenoise(prompt.c_str());
    Finally doFree([&]() { free(s); });
-    if (!s) return false;
+    if (!s) {
+      switch (auto type = linenoiseKeyType()) {
+        case 1: // ctrl-C
+          return true;
+        case 2: // ctrl-D
+          return false;
+        default:
+          throw Error(format("Unexpected linenoise keytype: %1%") % type);
+      }
+    }
    input += s;
    return true;
 }