diff options
author | Norbert Preining <norbert@preining.info> | 2020-07-08 03:01:45 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2020-07-08 03:01:45 +0000 |
commit | 8c3fedd243b69349b426144e5e2b94ef4aea6a4c (patch) | |
tree | f5842753f11a90141f3cc2e356c3a04766e8d81e /graphics/asymptote/pipestream.cc | |
parent | ef87f13c4503a2aa4a9098cbf33e0bfcad19008e (diff) |
CTAN sync 202007080301
Diffstat (limited to 'graphics/asymptote/pipestream.cc')
-rw-r--r-- | graphics/asymptote/pipestream.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/graphics/asymptote/pipestream.cc b/graphics/asymptote/pipestream.cc index a809302bf5..2375a98d42 100644 --- a/graphics/asymptote/pipestream.cc +++ b/graphics/asymptote/pipestream.cc @@ -41,8 +41,7 @@ void pipeHandler(int) } void iopipestream::open(const mem::vector<string> &command, const char *hint, - const char *application, const char *Fatal, - int out_fileno) + const char *application, int out_fileno) { if(pipe(in) == -1) { ostringstream buf; @@ -90,7 +89,6 @@ void iopipestream::open(const mem::vector<string> &command, const char *hint, Running=true; pipeopen=true; pipein=true; - fatal=Fatal; block(false,true); } @@ -184,15 +182,13 @@ void iopipestream::wait(const char *prompt) { sbuffer.clear(); size_t plen=strlen(prompt); - size_t flen=strlen(fatal); do { readbuffer(); + if(*buffer == 0) camp::reportError(sbuffer); sbuffer.append(buffer); if(tailequals(sbuffer.c_str(),sbuffer.size(),prompt,plen)) break; - if(*fatal && tailequals(sbuffer.c_str(),sbuffer.size(),fatal,flen)) - camp::reportError(sbuffer); } while(true); } |