fix: posix function may return EINTR instead of ECANCELED after rb_stop()

1 files changed, 19 insertions, 0 deletions

diff --git a/rb.c b/rb.c
index 273c3d3..026a761 100644
--- a/rb.c
+++ b/rb.c
@@ -939,6 +939,12 @@ static long rb_recvt
             if (sact == -1)
             {
                 trace(("e/select() %s", strerror(errno)));
+
+                if (rb->force_exit == 1)
+                {
+                    errno = ECANCELED;
+                }
+
                 pthread_mutex_unlock(&rb->lock);
                 trace(("i/rb unlock"));
                 return -1;
@@ -1441,10 +1447,23 @@ long rb_sendt
             if (sact == -1)
             {
                 trace(("e/select() %s", strerror(errno)));
+
+                if (rb->force_exit == 1)
+                {
+                    /*
+                     * if select was interrupted by us, overwrite  errno  to
+                     * ECANCELED, or else it might be EINTR,  which  may  be
+                     * missleading for user.
+                     */
+
+                    errno = ECANCELED;
+                }
+
                 pthread_mutex_unlock(&rb->lock);
                 trace(("i/rb unlock"));
                 pthread_mutex_unlock(&rb->wlock);
                 trace(("i/write unlock"));
+
                 return -1;
             }