Attempt to fix process expansion on Linux

Hopefully addresses #455
fish-shell · Dec 18, 2012 · 882a62a · 882a62a
1 parent f9697c8
commit 882a62a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/common.cpp b/common.cpp
@@ -139,7 +139,7 @@ int fgetws2(wcstring *s, FILE *f)
 
         c = getwc(f);
 
-        if (errno == EILSEQ)
+        if (errno == EILSEQ || errno == EINTR)
         {
             continue;
         }

diff --git a/expand.cpp b/expand.cpp
@@ -512,9 +512,7 @@ bool process_iterator_t::next_process(wcstring *out_str, pid_t *out_pid)
         if ((cmdfile=wfopen(path + L"/cmdline", "r")))
         {
             wcstring full_command_line;
-            signal_block();
             fgetws2(&full_command_line, cmdfile);
-            signal_unblock();
 
             /* The command line needs to be escaped */
             cmd = tok_first(full_command_line.c_str());