Permalink
Browse files

Attempt to fix process expansion on Linux

Hopefully addresses #455
  • Loading branch information...
ridiculousfish committed Dec 18, 2012
1 parent f9697c8 commit 882a62ad521aa6a8a0f0f49fc37907aee5ae97e5
Showing with 1 addition and 3 deletions.
  1. +1 −1 common.cpp
  2. +0 −2 expand.cpp
View
@@ -139,7 +139,7 @@ int fgetws2(wcstring *s, FILE *f)
c = getwc(f);
- if (errno == EILSEQ)
+ if (errno == EILSEQ || errno == EINTR)
{
continue;
}
View
@@ -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());

0 comments on commit 882a62a

Please sign in to comment.