Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Tero Saarni
OpenLDAP
Commits
894e88bf
Commit
894e88bf
authored
Oct 20, 2016
by
Lorenz Bauer
Committed by
Hallvard Furuseth
Dec 15, 2016
Browse files
ITS
#8504
mdb_env_copyfd2(): Don't abort on SIGPIPE
Return EPIPE instead.
parent
e8e82933
Changes
1
Hide whitespace changes
Inline
Side-by-side
libraries/liblmdb/mdb.c
View file @
894e88bf
...
...
@@ -129,6 +129,7 @@ typedef SSIZE_T ssize_t;
#ifndef _WIN32
#include <pthread.h>
#include <signal.h>
#ifdef MDB_USE_POSIX_SEM
# define MDB_USE_HASH 1
#include <semaphore.h>
...
...
@@ -8995,10 +8996,17 @@ mdb_env_copythr(void *arg)
#define DO_WRITE(rc, fd, ptr, w2, len) rc = WriteFile(fd, ptr, w2, &len, NULL)
#else
int len;
sigset_t set;
#define DO_WRITE(rc, fd, ptr, w2, len) len = write(fd, ptr, w2); rc = (len >= 0)
sigemptyset(&set);
sigaddset(&set, SIGPIPE);
#endif
pthread_mutex_lock(&my->mc_mutex);
#ifndef _WIN32
my->mc_error = pthread_sigmask(SIG_BLOCK, &set, NULL);
#endif
for(;;) {
while (!my->mc_new)
pthread_cond_wait(&my->mc_cond, &my->mc_mutex);
...
...
@@ -9012,6 +9020,12 @@ again:
DO_WRITE(rc, my->mc_fd, ptr, wsize, len);
if (!rc) {
rc = ErrCode();
#ifndef _WIN32
if (rc == EPIPE) {
int tmp;
sigwait(&set, &tmp);
}
#endif
break;
} else if (len > 0) {
rc = MDB_SUCCESS;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment