diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix reading from pipes in WIN32.

Browse Source
This commit is contained in:
Vitor Santos Costa 2010-04-07 01:18:32 +01:00
parent 8e72f97651
commit 471bf55c4c
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
C/iopreds.c
View File

@ -859,8 +859,7 @@ SocketPutc (int sno, int ch)
} }
} }
#endif #endif
console_count_output_char(ch,s); return (int) ch;
return ((int) ch);
} }
#endif #endif
@ -1414,8 +1413,8 @@ PipeGetc(int sno)
/* should be able to use a buffer */ /* should be able to use a buffer */
#if _MSC_VER || defined(__MINGW32__) #if _MSC_VER || defined(__MINGW32__)
DWORD count; DWORD count;
if (WriteFile(s->u.pipe.hdl, &c, sizeof(c), &count, NULL) == FALSE) { if (ReadFile(s->u.pipe.hdl, &c, sizeof(c), &count, NULL) == FALSE) {
PlIOError (SYSTEM_ERROR,TermNil, "write to pipe returned error"); Yap_WinError("read from pipe returned error");
return EOF; return EOF;
} }
#else #else
@ -1460,9 +1459,9 @@ ConsolePipeGetc(int sno)
newline = FALSE; newline = FALSE;
} }
#if _MSC_VER || defined(__MINGW32__) #if _MSC_VER || defined(__MINGW32__)
if (WriteFile(s->u.pipe.hdl, &c, sizeof(c), &count, NULL) == FALSE) { if (ReadFile(s->u.pipe.hdl, &c, sizeof(c), &count, NULL) == FALSE) {
Yap_PrologMode |= ConsoleGetcMode; Yap_PrologMode |= ConsoleGetcMode;
PlIOError (SYSTEM_ERROR,TermNil, "read from pipe returned error"); Yap_WinError("read from console pipe returned error");
Yap_PrologMode &= ~ConsoleGetcMode; Yap_PrologMode &= ~ConsoleGetcMode;
return console_post_process_eof(s); return console_post_process_eof(s);
} }
@ -2774,7 +2773,9 @@ p_open_pipe_stream (void)
st->u.pipe.fd = filedes[1]; st->u.pipe.fd = filedes[1];
#endif #endif
t2 = MkStream (sno); t2 = MkStream (sno);
return (Yap_unify (ARG1, t1) && Yap_unify (ARG2, t2)); return
Yap_unify (ARG1, t1) &&
Yap_unify (ARG2, t2);
} }
static int static int