mirror of
https://git.proxmox.com/git/libgit2
synced 2025-08-11 06:52:09 +00:00
Check for EWOULDBLOCK as well as EAGAIN on write.
On some systems, notably HP PA-RISC systems running Linux or HP-UX, EWOULDBLOCK and EAGAIN are not the same value. POSIX (and these OSes) allow EWOULDBLOCK to occur on write(2) (and send(2), etc.), so check explicitly for this case as well as EAGAIN by defining and using a macro GIT_ISBLOCKED that considers both. The macro is necessary because MSYS does not provide EWOULDBLOCK and compilation fails if an attempt is made to use it unconditionally. On most systems, where the two values are the same, the compiler will simply optimize this check out and it will have no effect.
This commit is contained in:
parent
dbd2ca356b
commit
0197d4107a
@ -189,7 +189,7 @@ int p_write(git_file fd, const void *buf, size_t cnt)
|
||||
r = write(fd, b, cnt);
|
||||
#endif
|
||||
if (r < 0) {
|
||||
if (errno == EINTR || errno == EAGAIN)
|
||||
if (errno == EINTR || GIT_ISBLOCKED(errno))
|
||||
continue;
|
||||
return -1;
|
||||
}
|
||||
|
@ -29,6 +29,15 @@
|
||||
#define O_CLOEXEC 0
|
||||
#endif
|
||||
|
||||
/* Determine whether an errno value indicates that a read or write failed
|
||||
* because the descriptor is blocked.
|
||||
*/
|
||||
#if defined(EWOULDBLOCK)
|
||||
#define GIT_ISBLOCKED(e) ((e) == EAGAIN || (e) == EWOULDBLOCK)
|
||||
#else
|
||||
#define GIT_ISBLOCKED(e) ((e) == EAGAIN)
|
||||
#endif
|
||||
|
||||
typedef int git_file;
|
||||
|
||||
/**
|
||||
|
Loading…
Reference in New Issue
Block a user