Rooba
/
polybar
mirror of https://github.com/polybar/polybar.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(ipc): Always close file descriptor on receive

This commit is contained in:
Michael Carlberg 2017-01-09 23:09:16 +01:00
parent 7a26254844
commit 0f0d786cbd
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/components/ipc.cpp
View File

@ -59,22 +59,18 @@ void ipc::receive_message() {
if ((bytes_read = read(*m_fd, &buffer, BUFSIZ)) == -1) { if ((bytes_read = read(*m_fd, &buffer, BUFSIZ)) == -1) {
m_log.err("Failed to read from ipc channel (err: %s)", strerror(errno)); m_log.err("Failed to read from ipc channel (err: %s)", strerror(errno));
} } else if (bytes_read > 0) {
string payload{string_util::trim(string{buffer}, '\n')};
if (!bytes_read) { if (payload.find(ipc_command::prefix) == 0) {
return; m_sig.emit(sig_ipc::command{payload.substr(strlen(ipc_command::prefix))});
} } else if (payload.find(ipc_hook::prefix) == 0) {
m_sig.emit(sig_ipc::hook{payload.substr(strlen(ipc_hook::prefix))});
string payload{string_util::trim(string{buffer}, '\n')}; } else if (payload.find(ipc_action::prefix) == 0) {
m_sig.emit(sig_ipc::action{payload.substr(strlen(ipc_action::prefix))});
if (payload.find(ipc_command::prefix) == 0) { } else if (!payload.empty()) {
m_sig.emit(sig_ipc::command{payload.substr(strlen(ipc_command::prefix))}); m_log.warn("Received unknown ipc message: (payload=%s)", payload);
} else if (payload.find(ipc_hook::prefix) == 0) { }
m_sig.emit(sig_ipc::hook{payload.substr(strlen(ipc_hook::prefix))});
} else if (payload.find(ipc_action::prefix) == 0) {
m_sig.emit(sig_ipc::action{payload.substr(strlen(ipc_action::prefix))});
} else if (!payload.empty()) {
m_log.warn("Received unknown ipc message: (payload=%s)", payload);
} }
m_fd = file_util::make_file_descriptor(m_path, O_RDONLY | O_NONBLOCK); m_fd = file_util::make_file_descriptor(m_path, O_RDONLY | O_NONBLOCK);