diff options
Diffstat (limited to 'src/pulsecore')
| -rw-r--r-- | src/pulsecore/core-util.c | 25 | ||||
| -rw-r--r-- | src/pulsecore/sink.c | 17 | ||||
| -rw-r--r-- | src/pulsecore/source.c | 17 |
3 files changed, 41 insertions, 18 deletions
diff --git a/src/pulsecore/core-util.c b/src/pulsecore/core-util.c index d259fb16..c4818e39 100644 --- a/src/pulsecore/core-util.c +++ b/src/pulsecore/core-util.c @@ -177,7 +177,7 @@ int pa_make_secure_dir(const char* dir, mode_t m, uid_t uid, gid_t gid) { #else { mode_t u; - u = umask(~m); + u = umask((~m) & 0777); r = mkdir(dir, m); umask(u); } @@ -1887,17 +1887,21 @@ int pa_close_allv(const int except_fds[]) { if (getrlimit(RLIMIT_NOFILE, &rl) < 0) return -1; - for (fd = 0; fd < (int) rl.rlim_max; fd++) { + for (fd = 3; fd < (int) rl.rlim_max; fd++) { int i; + pa_bool_t found; - if (fd <= 3) - continue; - + found = FALSE; for (i = 0; except_fds[i] >= 0; i++) - if (except_fds[i] == fd) - continue; + if (except_fds[i] == fd) { + found = TRUE; + break; + } - if (close(fd) < 0 && errno != EBADF) + if (found) + continue; + + if (pa_close(fd) < 0 && errno != EBADF) return -1; } @@ -1972,10 +1976,11 @@ int pa_reset_sigs(int except, ...) { i = 0; if (except >= 1) { + int sig; p[i++] = except; - while ((p[i++] = va_arg(ap, int)) >= 0) - ; + while ((sig = va_arg(ap, int)) >= 0) + sig = p[i++]; } p[i] = -1; diff --git a/src/pulsecore/sink.c b/src/pulsecore/sink.c index 74971035..4102f31d 100644 --- a/src/pulsecore/sink.c +++ b/src/pulsecore/sink.c @@ -261,22 +261,31 @@ pa_sink* pa_sink_new( static int sink_set_state(pa_sink *s, pa_sink_state_t state) { int ret; pa_bool_t suspend_change; + pa_sink_state_t original_state; pa_assert(s); if (s->state == state) return 0; + original_state = s->state; + suspend_change = - (s->state == PA_SINK_SUSPENDED && PA_SINK_IS_OPENED(state)) || - (PA_SINK_IS_OPENED(s->state) && state == PA_SINK_SUSPENDED); + (original_state == PA_SINK_SUSPENDED && PA_SINK_IS_OPENED(state)) || + (PA_SINK_IS_OPENED(original_state) && state == PA_SINK_SUSPENDED); if (s->set_state) if ((ret = s->set_state(s, state)) < 0) - return -1; + return ret; if (s->asyncmsgq) - pa_assert_se(pa_asyncmsgq_send(s->asyncmsgq, PA_MSGOBJECT(s), PA_SINK_MESSAGE_SET_STATE, PA_UINT_TO_PTR(state), 0, NULL) == 0); + if ((ret = pa_asyncmsgq_send(s->asyncmsgq, PA_MSGOBJECT(s), PA_SINK_MESSAGE_SET_STATE, PA_UINT_TO_PTR(state), 0, NULL)) < 0) { + + if (s->set_state) + s->set_state(s, original_state); + + return ret; + } s->state = state; diff --git a/src/pulsecore/source.c b/src/pulsecore/source.c index e62c6c24..95007af4 100644 --- a/src/pulsecore/source.c +++ b/src/pulsecore/source.c @@ -224,22 +224,31 @@ pa_source* pa_source_new( static int source_set_state(pa_source *s, pa_source_state_t state) { int ret; pa_bool_t suspend_change; + pa_source_state_t original_state; pa_assert(s); if (s->state == state) return 0; + original_state = s->state; + suspend_change = - (s->state == PA_SOURCE_SUSPENDED && PA_SOURCE_IS_OPENED(state)) || - (PA_SOURCE_IS_OPENED(s->state) && state == PA_SOURCE_SUSPENDED); + (original_state == PA_SOURCE_SUSPENDED && PA_SOURCE_IS_OPENED(state)) || + (PA_SOURCE_IS_OPENED(original_state) && state == PA_SOURCE_SUSPENDED); if (s->set_state) if ((ret = s->set_state(s, state)) < 0) - return -1; + return ret; if (s->asyncmsgq) - pa_assert_se(pa_asyncmsgq_send(s->asyncmsgq, PA_MSGOBJECT(s), PA_SOURCE_MESSAGE_SET_STATE, PA_UINT_TO_PTR(state), 0, NULL) == 0); + if ((ret = pa_asyncmsgq_send(s->asyncmsgq, PA_MSGOBJECT(s), PA_SOURCE_MESSAGE_SET_STATE, PA_UINT_TO_PTR(state), 0, NULL)) < 0) { + + if (s->set_state) + s->set_state(s, original_state); + + return ret; + } s->state = state; |