mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-10 12:33:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

swaybar: invalidate file descriptors upon closing

Browse Source
This commit is contained in:
Ian Fan 2018-09-15 10:15:30 +01:00
parent 4cb28de89f
commit 952453480f
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
swaybar/status_line.c
View File

@ -7,12 +7,24 @@
#include <unistd.h> #include <unistd.h>
#include <wlr/util/log.h> #include <wlr/util/log.h>
#include "swaybar/config.h" #include "swaybar/config.h"
#include "swaybar/event_loop.h"
#include "swaybar/status_line.h" #include "swaybar/status_line.h"
#include "readline.h" #include "readline.h"
static void status_line_close_fds(struct status_line *status) {
if (status->read_fd != -1) {
remove_event(status->read_fd);
close(status->read_fd);
status->read_fd = -1;
}
if (status->write_fd != -1) {
close(status->write_fd);
status->write_fd = -1;
}
}
void status_error(struct status_line *status, const char *text) { void status_error(struct status_line *status, const char *text) {
close(status->read_fd); status_line_close_fds(status);
close(status->write_fd);
status->protocol = PROTOCOL_ERROR; status->protocol = PROTOCOL_ERROR;
status->text = text; status->text = text;
} }
@ -123,8 +135,7 @@ struct status_line *status_line_init(char *cmd) {
} }
void status_line_free(struct status_line *status) { void status_line_free(struct status_line *status) {
close(status->read_fd); status_line_close_fds(status);
close(status->write_fd);
kill(status->pid, SIGTERM); kill(status->pid, SIGTERM);
switch (status->protocol) { switch (status->protocol) {
case PROTOCOL_I3BAR: { case PROTOCOL_I3BAR: {