hg/stx-libbasic: comparison ExternalStream.st

equal deleted inserted replaced

-:d4735595a002
+:b7050f50aa94
 #else
 # define OPT_FSEEK(f, pos, whence)      /* nothing */
 #endif
 #ifdef __win32__
-// Win returns from ReadFile() with false and _threadErrno == 0 on end of pipe.
-// We don't know why
 #  define READ(ret, f, cp, n, handleType) { \
 if (handleType == @symbol(socketHandle)) { \
 (ret) = __STX_WSA_NOINT_CALL4("recv", recv, (f), (cp), (n), 0); \
 } else { \
 HANDLE h = _get_osfhandle(fileno(f)); \
 if (handleType == @symbol(socketFilePointer)) { \
 (ret) = __STX_WSA_NOINT_CALL4("recv", recv, h, (cp), (n), 0);\
 } else { \
 int __res; \
 (ret) = __STX_API_NOINT_CALL5("ReadFile", ReadFile, h, (cp), (n), &__res, 0);\
-(ret) = (ret) ? __res : ((__threadErrno == EPIPE || __threadErrno == 0) ? 0 : -1); \
+(ret) = (ret) > 0 ? __res : (__threadErrno == __WIN32_ERR(ERROR_BROKEN_PIPE) ? 0 : -1); \
 } \
 } \
 }
 #  define WRITE(ret, f, cp, n, handleType) { \
 int res = -1, ok = 0;                     \
 SOCKET sock = 0;                          \
 if ((handleType == @symbol(socketFilePointer) && ((ok = ioctlsocket(sock = (SOCKET)_get_osfhandle(fileno(f)),FIONREAD,&res) == 0), 1)) \
 || (handleType == @symbol(socketHandle) && ((ok = ioctlsocket(sock = (SOCKET)(f), FIONREAD, &res) == 0), 1)) \
 || (handleType == @symbol(pipeFilePointer) && ((ok = PeekNamedPipe((HANDLE)_get_osfhandle(fileno(f)),0, 0,0,&res,0)), 1))) { \
-if (!ok) { (ret) = -1; break; }       \
+if (!ok) {                                                               \
+__threadErrno = sock ? WSAGetLastError() : __WIN32_ERR(GetLastError()); \
+(ret) = __threadErrno == __WIN32_ERR(ERROR_BROKEN_PIPE) ? 0 : -1;   \
+break;                                                              \
+}                                \
 if (res > 0) {                        \
 if (res > ((cnt)-__offs))         \
 res = (cnt)-__offs;           \
 READ((ret), f, (buf)+__offs, res, handleType); \
 } else {                              \
 if ((ret) < 0) {                            \
 if (ferror(f)) {                        \
 if (__threadErrno == EINTR) {       \
 clearerr(f);                    \
 /* refetch */                   \
-buf = (char *)(obj);   \
+buf = (char *)(obj);            \
 continue;                       \
 }                                   \
 } else {                                \
 (ret) = 0;                          \
 }                                       \
 CLEAR_ERRNO;                         \
 if (l > IO_BUFFER_SIZE) l = IO_BUFFER_SIZE;              \
 if ((handleType == @symbol(socketFilePointer) && ((ok = ioctlsocket(sock = (SOCKET)_get_osfhandle(fileno(f)),FIONREAD,&res) == 0), 1)) \
 || (handleType == @symbol(socketHandle) && ((ok = ioctlsocket(sock = (SOCKET)(f), FIONREAD, &res) == 0), 1)) \
 || (handleType == @symbol(pipeFilePointer) && ((ok = PeekNamedPipe((HANDLE)_get_osfhandle(fileno(f)),0, 0,0,&res,0)), 1))) { \
-if (!ok) { (ret) = -1; break; }       \
+if (!ok) {                                                               \
+__threadErrno = sock ? WSAGetLastError() : __WIN32_ERR(GetLastError()); \
+(ret) = __threadErrno == __WIN32_ERR(ERROR_BROKEN_PIPE) ? 0 : -1;   \
+break;                                                              \
+}                                \
 if (res > 0) {                   \
 if (res > l) res = l;       \
 READ((ret), f, __buf, res, handleType); \
 } else {                              \
 if (sock && send(sock, NULL, 0, 0) == SOCKET_ERROR) {     \
 } else {                          \
 (ret) = 0;                      \
 }                                 \
 break;                            \
 }                                     \
-} else {                             \
+} else {                                  \
 READ((ret), f, __buf, l, handleType); \
 }                                     \
 if ((ret) <= 0) {                     \
 if ((ret) < 0 && __threadErrno == EINTR) \
 continue;                       \
 } else {                                            \
 int __offs = 0;                                 \
 while (__offs < (cnt)) {                        \
 CLEAR_ERRNO;                                \
 WRITE((ret),f, (buf)+__offs, (cnt)-__offs, handleType);   \
-if ((ret) <= 0) {                             \
+if ((ret) <= 0) {                           \
 if ((ret) < 0 && __threadErrno == EINTR) { \
 continue;                           \
 }                                       \
 break;                                  \
 }                                           \
 /*
 * read ahead ...
 */
 do {
 #ifdef __win32__
-# if 1
 __READBYTE__(ret, f, &c, _buffered, __INST(handleType));
-# else
-__BEGIN_INTERRUPTABLE__
-__READBYTE__(ret, f, &c, _buffered, __INST(handleType));
-__END_INTERRUPTABLE__
-# endif
 #else /* not __win32__ */
 __BEGIN_INTERRUPTABLE__
 __READBYTE__(ret, f, &c, _buffered, __INST(handleType));
 __END_INTERRUPTABLE__
 #endif
 } while ((ret < 0) && (__threadErrno == EINTR));
 if (ret > 0) {
 __UNGETC__(c&0xff, f, _buffered);
 RETURN (false);
 }
 if (ret == 0) {

changeset 21066	b7050f50aa94
parent 21037	152fe5102be0
child 21088	6f4535127ce6
child 21097	12cf2700134c