}
if (the_pipe[0] >= 0)
- close(the_pipe[0]);
+ pa_assert_se(pa_close(the_pipe[0]) == 0);
if (the_pipe[1] >= 0)
- close(the_pipe[1]);
+ pa_assert_se(pa_close(the_pipe[1]) == 0);
the_pipe[0] = the_pipe[1] = -1;
if (installed) {
static void close_pipe(int p[2]) {
if (p[0] != -1)
- close(p[0]);
+ pa_assert_se(pa_close(p[0]) == 0);
if (p[1] != -1)
- close(p[1]);
+ pa_assert_se(pa_close(p[1]) == 0);
p[0] = p[1] = -1;
}
if (child != 0) {
/* Father */
- close(daemon_pipe[1]);
+ pa_assert_se(pa_close(daemon_pipe[1]) == 0);
daemon_pipe[1] = -1;
if (pa_loop_read(daemon_pipe[0], &retval, sizeof(retval), NULL) != sizeof(retval)) {
goto finish;
}
- close(daemon_pipe[0]);
+ pa_assert_se(pa_close(daemon_pipe[0]) == 0);
daemon_pipe[0] = -1;
#endif
#endif
#ifndef OS_IS_WIN32
- close(0);
- close(1);
- close(2);
+ pa_close(0);
+ pa_close(1);
+ pa_close(2);
open("/dev/null", O_RDONLY);
open("/dev/null", O_WRONLY);
#ifdef TIOCNOTTY
if ((tty_fd = open("/dev/tty", O_RDWR)) >= 0) {
ioctl(tty_fd, TIOCNOTTY, (char*) 0);
- close(tty_fd);
+ pa_assert_se(pa_close(tty_fd) == 0);
}
#endif
}
if (pa_loop_write(fd, &x, sizeof(x), NULL) != sizeof(x))
pa_log_warn("WARNING: write(%u, 1, 1) failed: %s", fd, pa_cstrerror(errno));
- close(fd);
+ pa_assert_se(pa_close(fd) == 0);
pa_module_unload_request(m);
m->core->mainloop->io_free(u->io);
if (u->fd >= 0)
- close(u->fd);
+ pa_assert_se(pa_close(u->fd) == 0);
pa_xfree(u->sink_name);
pa_xfree(u);
/* Let's suspend */
ioctl(u->fd, SNDCTL_DSP_SYNC, NULL);
- close(u->fd);
+ pa_close(u->fd);
u->fd = -1;
if (u->rtpoll_item) {
return 0;
fail:
- close(u->fd);
+ pa_close(u->fd);
u->fd = -1;
return -1;
}
if (u)
pa__done(m);
else if (fd >= 0)
- close(fd);
+ pa_close(fd);
if (ma)
pa_modargs_free(ma);
munmap(u->out_mmap, u->out_hwbuf_size);
if (u->fd >= 0)
- close(u->fd);
+ pa_close(u->fd);
pa_xfree(u->device_name);
}
if (u->fd >= 0)
- close(u->fd);
+ pa_assert_se(pa_close(u->fd) == 0);
pa_xfree(u);
}
}
if (u->fd >= 0)
- close(u->fd);
+ pa_assert_se(pa_close(u->fd) == 0);
pa_xfree(u);
}
pa_log_warn("'%s' doesn't support full duplex", device);
- close(fd);
+ pa_close(fd);
}
if ((fd = open(device, (*mode = O_WRONLY)|O_NDELAY|O_NOCTTY)) < 0) {
fail:
if (fd >= 0)
- close(fd);
+ pa_close(fd);
return -1;
}
int n;
/* Not required, since fds[0] has CLOEXEC enabled anyway */
- close(fds[0]);
+ pa_assert_se(pa_close(fds[0]) == 0);
if (c->spawn_api.atfork)
c->spawn_api.atfork();
goto fail;
}
- close(fds[1]);
+ pa_assert_se(pa_close(fds[1]) == 0);
c->is_local = 1;
fail:
if (fds[0] != -1)
- close(fds[0]);
+ pa_assert_se(pa_close(fds[0]) == 0);
if (fds[1] != -1)
- close(fds[1]);
+ pa_assert_se(pa_close(fds[1]) == 0);
unlock_autospawn_lock_file(c);
pa_xfree(m->pollfds);
if (m->wakeup_pipe[0] >= 0)
- close(m->wakeup_pipe[0]);
+ pa_assert_se(pa_close(m->wakeup_pipe[0]) == 0);
if (m->wakeup_pipe[1] >= 0)
- close(m->wakeup_pipe[1]);
+ pa_assert_se(pa_close(m->wakeup_pipe[1]) == 0);
pa_xfree(m);
}
if (unlock)
pa_lock_fd(fd, 0);
- close(fd);
+ if (pa_close(fd) < 0) {
+ pa_log_warn("Failed to close cookie file: %s", pa_cstrerror(errno));
+ ret = -1;
+ }
}
return ret;
if (unlock)
pa_lock_fd(fd, 0);
- close(fd);
+ if (pa_close(fd) < 0) {
+ pa_log_warn("Failed to close cookie file: %s", pa_cstrerror(errno));
+ ret = -1;
+ }
}
return ret;
/** Platform independent read function. Necessary since not all
* systems treat all file descriptors equal. */
int pa_close(int fd) {
+
#ifdef OS_IS_WIN32
int ret;
- ret = closesocket(fd);
- if (ret == 0)
+ if ((ret = closesocket(fd)) == 0)
return 0;
if (WSAGetLastError() != WSAENOTSOCK) {
return 0;
}
- pa_log("%slock: %s", !b? "un" : "",
- pa_cstrerror(errno));
+ pa_log("%slock: %s", !b? "un" : "", pa_cstrerror(errno));
#endif
#ifdef OS_IS_WIN32
struct stat st;
if ((fd = open(fn, O_CREAT|O_RDWR, S_IRUSR|S_IWUSR)) < 0) {
- pa_log("failed to create lock file '%s': %s", fn,
- pa_cstrerror(errno));
+ pa_log_warn("Failed to create lock file '%s': %s", fn, pa_cstrerror(errno));
goto fail;
}
if (pa_lock_fd(fd, 1) < 0) {
- pa_log("failed to lock file '%s'.", fn);
+ pa_log_warn("Failed to lock file '%s'.", fn);
goto fail;
}
if (fstat(fd, &st) < 0) {
- pa_log("failed to fstat() file '%s'.", fn);
+ pa_log_warn("Failed to fstat() file '%s': %s", fn, pa_cstrerror(errno));
goto fail;
}
- /* Check wheter the file has been removed meanwhile. When yes, restart this loop, otherwise, we're done */
+ /* Check wheter the file has been removed meanwhile. When yes,
+ * restart this loop, otherwise, we're done */
if (st.st_nlink >= 1)
break;
if (pa_lock_fd(fd, 0) < 0) {
- pa_log("failed to unlock file '%s'.", fn);
+ pa_log_warn("Failed to unlock file '%s'.", fn);
goto fail;
}
- if (close(fd) < 0) {
- pa_log("failed to close file '%s'.", fn);
+ if (pa_close(fd) < 0) {
+ pa_log_warn("Failed to close file '%s': %s", fn, pa_cstrerror(errno));
+ fd = -1;
goto fail;
}
fail:
if (fd >= 0)
- close(fd);
+ pa_close(fd);
return -1;
}
pa_assert(fd >= 0);
if (unlink(fn) < 0) {
- pa_log_warn("WARNING: unable to remove lock file '%s': %s",
- fn, pa_cstrerror(errno));
+ pa_log_warn("Unable to remove lock file '%s': %s", fn, pa_cstrerror(errno));
r = -1;
}
if (pa_lock_fd(fd, 0) < 0) {
- pa_log_warn("WARNING: failed to unlock file '%s'.", fn);
+ pa_log_warn("Failed to unlock file '%s'.", fn);
r = -1;
}
- if (close(fd) < 0) {
- pa_log_warn("WARNING: failed to close lock file '%s': %s",
- fn, pa_cstrerror(errno));
+ if (pa_close(fd) < 0) {
+ pa_log_warn("Failed to close '%s': %s", fn, pa_cstrerror(errno));
r = -1;
}
void pa_fdsem_free(pa_fdsem *f) {
pa_assert(f);
- close(f->fds[0]);
- close(f->fds[1]);
+ pa_assert_se(pa_close(f->fds[0]) == 0);
+ pa_assert_se(pa_close(f->fds[1]) == 0);
pa_xfree(f);
}
pa_assert(fd >= 0);
if ((r = pa_loop_read(fd, t, sizeof(t)-1, NULL)) < 0) {
- pa_log_warn("WARNING: failed to read PID file '%s': %s",
- fn, pa_cstrerror(errno));
+ pa_log_warn("Failed to read PID file '%s': %s", fn, pa_cstrerror(errno));
return (pid_t) -1;
}
*e = 0;
if (pa_atou(t, &pid) < 0) {
- pa_log_warn("WARNING: failed to parse PID file '%s'", fn);
+ pa_log_warn("Failed to parse PID file '%s'", fn);
return (pid_t) -1;
}
if ((fd = open(fn, mode, S_IRUSR|S_IWUSR)) < 0) {
if (mode != O_RDONLY || errno != ENOENT)
- pa_log_warn("WARNING: failed to open PID file '%s': %s",
- fn, pa_cstrerror(errno));
+ pa_log_warn("WARNING: failed to open PID file '%s': %s", fn, pa_cstrerror(errno));
goto fail;
}
goto fail;
if (fstat(fd, &st) < 0) {
- pa_log_warn("WARNING: failed to fstat() PID file '%s': %s",
- fn, pa_cstrerror(errno));
+ pa_log_warn("Failed to fstat() PID file '%s': %s", fn, pa_cstrerror(errno));
goto fail;
}
if (pa_lock_fd(fd, 0) < 0)
goto fail;
- if (close(fd) < 0) {
- pa_log_warn("WARNING: failed to close file '%s': %s",
- fn, pa_cstrerror(errno));
+ if (pa_close(fd) < 0) {
+ pa_log_warn("Failed to close file '%s': %s", fn, pa_cstrerror(errno));
+ fd = -1;
goto fail;
}
if (fd >= 0) {
pa_lock_fd(fd, 0);
- close(fd);
+ pa_close(fd);
}
return -1;
goto fail;
if ((pid = read_pid(fn, fd)) == (pid_t) -1)
- pa_log("corrupt PID file, overwriting.");
+ pa_log_warn("Corrupt PID file, overwriting.");
else if (pid > 0) {
#ifdef OS_IS_WIN32
if ((process = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, pid)) != NULL) {
#else
if (kill(pid, 0) >= 0 || errno != ESRCH) {
#endif
- pa_log("daemon already running.");
+ pa_log("Daemon already running.");
goto fail;
}
- pa_log("stale PID file, overwriting.");
+ pa_log_warn("Stale PID file, overwriting.");
}
/* Overwrite the current PID file */
if (lseek(fd, 0, SEEK_SET) == (off_t) -1 || ftruncate(fd, 0) < 0) {
- pa_log("failed to truncate PID file '%s': %s",
- fn, pa_cstrerror(errno));
+ pa_log("Failed to truncate PID file '%s': %s", fn, pa_cstrerror(errno));
goto fail;
}
l = strlen(t);
if (pa_loop_write(fd, t, l, NULL) != (ssize_t) l) {
- pa_log("failed to write PID file.");
+ pa_log("Failed to write PID file.");
goto fail;
}
fail:
if (fd >= 0) {
pa_lock_fd(fd, 0);
- close(fd);
+
+ if (pa_close(fd) < 0) {
+ pa_log("Failed to close PID file '%s': %s", fn, pa_cstrerror(errno));
+ ret = -1;
+ }
}
return ret;
goto fail;
if (pid != getpid()) {
- pa_log("WARNING: PID file '%s' not mine!", fn);
+ pa_log("PID file '%s' not mine!", fn);
goto fail;
}
if (ftruncate(fd, 0) < 0) {
- pa_log_warn("WARNING: failed to truncate PID file '%s': %s",
- fn, pa_cstrerror(errno));
+ pa_log_warn("Failed to truncate PID file '%s': %s", fn, pa_cstrerror(errno));
goto fail;
}
#endif
if (unlink(fn) < 0) {
- pa_log_warn("WARNING: failed to remove PID file '%s': %s",
- fn, pa_cstrerror(errno));
+ pa_log_warn("Failed to remove PID file '%s': %s", fn, pa_cstrerror(errno));
goto fail;
}
if (fd >= 0) {
pa_lock_fd(fd, 0);
- pa_assert_se(close(fd) == 0);
+
+ if (pa_close(fd) < 0) {
+ pa_log_warn("Failed to close PID file '%s': %s", fn, pa_cstrerror(errno));
+ ret = -1;
+ }
}
return ret;
if (fd >= 0) {
pa_lock_fd(fd, 0);
- pa_assert_se(close(fd) == 0);
+ pa_close(fd);
}
return ret;
if ((r = pa_loop_read(fd, ret_data, length, NULL)) < 0 || (size_t) r != length)
ret = -1;
- close(fd);
+ pa_close(fd);
} else
ret = -1;
pa_atomic_store(&marker->pid, (int) getpid());
pa_atomic_store(&marker->marker, SHM_MARKER);
- close(fd);
+ pa_assert_se(close(fd) == 0);
m->do_unlink = 1;
#else
return -1;
#ifdef HAVE_SHM_OPEN
if (fd >= 0) {
shm_unlink(fn);
- pa_assert_se(close(fd) >= 0);
+ pa_close(fd);
}
#endif
m->do_unlink = 0;
m->shared = 1;
- pa_assert_se(close(fd) >= 0);
+ pa_assert_se(pa_close(fd) == 0);
return 0;
fail:
if (fd >= 0)
- pa_assert_se(close(fd) >= 0);
+ pa_close(fd);
return -1;
}
#include <pulsecore/sink-input.h>
#include <pulsecore/log.h>
#include <pulsecore/thread-mq.h>
+#include <pulsecore/core-util.h>
#include "sound-file-stream.h"
if (!(u->sndfile = sf_open_fd(fd, SFM_READ, &sfinfo, 1))) {
pa_log("Failed to open file %s", fname);
- close(fd);
+ pa_close(fd);
goto fail;
}
#include <pulsecore/log.h>
#include <pulsecore/macro.h>
#include <pulsecore/core-error.h>
+#include <pulsecore/core-util.h>
#include "sound-file.h"
#include "core-scache.h"
if (!(sf = sf_open_fd(fd, SFM_READ, &sfinfo, 1))) {
pa_log("Failed to open file %s", fname);
- close(fd);
+ pa_close(fd);
goto finish;
}