pauljako/yambar
1
0
Fork 0
forked from external/yambar
Code Pull requests Activity

module/mpd: free strdup:ed path string

Browse source
This commit is contained in:
Daniel Eklöf 2019-01-29 20:58:55 +01:00
parent 2d104e4a7d
commit f37dfbc727
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
modules/mpd.c
View file

@ -195,12 +195,15 @@ wait_for_socket_create(const struct module *mod)
LOG_DBG("monitoring %s for %s to be created", directory, base); LOG_DBG("monitoring %s for %s to be created", directory, base);
int fd = inotify_init(); int fd = inotify_init();
if (fd == -1) if (fd == -1) {
free(copy);
return false; return false;
}
int wd = inotify_add_watch(fd, directory, IN_CREATE); int wd = inotify_add_watch(fd, directory, IN_CREATE);
if (wd == -1) { if (wd == -1) {
close(fd); close(fd);
free(copy);
return false; return false;
} }
@ -231,6 +234,7 @@ wait_for_socket_create(const struct module *mod)
if (!have_mpd_socket) if (!have_mpd_socket)
LOG_WARN("MPD doesn't appear to be running"); LOG_WARN("MPD doesn't appear to be running");
bool ret = false;
while (!have_mpd_socket) { while (!have_mpd_socket) {
struct pollfd fds[] = { struct pollfd fds[] = {
{.fd = mod->abort_fd, .events = POLLIN}, {.fd = mod->abort_fd, .events = POLLIN},
@ -239,8 +243,10 @@ wait_for_socket_create(const struct module *mod)
poll(fds, 2, -1); poll(fds, 2, -1);
if (fds[0].revents & POLLIN) if (fds[0].revents & POLLIN) {
return true; ret = true;
break;
}
assert(fds[1].revents & POLLIN); assert(fds[1].revents & POLLIN);
@ -264,7 +270,7 @@ wait_for_socket_create(const struct module *mod)
inotify_rm_watch(fd, wd); inotify_rm_watch(fd, wd);
close(fd); close(fd);
free(copy); free(copy);
return false; return ret;
} }
static struct mpd_connection * static struct mpd_connection *