mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-04-10 08:20:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

input: pipe: avoid goto's where variables may be uninitialized

Browse source
This commit is contained in:
Daniel Eklöf 2020-07-22 19:34:07 +02:00
parent 63d73f8685
commit 10f53325e1
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
input.c
View file

@ -151,29 +151,32 @@ execute_binding(struct seat *seat, struct terminal *term,
struct pipe_context *ctx = NULL; struct pipe_context *ctx = NULL;
int pipe_fd[2] = {-1, -1};
int stdout_fd = -1;
int stderr_fd = -1;
char *text = NULL;
size_t len = 0;
char *cmd = strdup(pipe_cmd); char *cmd = strdup(pipe_cmd);
char **argv = NULL; char **argv = NULL;
if (!tokenize_cmdline(cmd, &argv)) if (!tokenize_cmdline(cmd, &argv))
goto pipe_err; goto pipe_err;
int pipe_fd[2] = {-1, -1};
if (pipe(pipe_fd) < 0) { if (pipe(pipe_fd) < 0) {
LOG_ERRNO("failed to create pipe"); LOG_ERRNO("failed to create pipe");
goto pipe_err; goto pipe_err;
} }
int stdout_fd = open("/dev/null", O_WRONLY); stdout_fd = open("/dev/null", O_WRONLY);
int stderr_fd = open("/dev/null", O_WRONLY); stderr_fd = open("/dev/null", O_WRONLY);
if (stdout_fd < 0 || stderr_fd < 0) { if (stdout_fd < 0 || stderr_fd < 0) {
LOG_ERRNO("failed to open /dev/null"); LOG_ERRNO("failed to open /dev/null");
goto pipe_err; goto pipe_err;
} }
char *text;
size_t len;
bool success = action == BIND_ACTION_PIPE_SCROLLBACK bool success = action == BIND_ACTION_PIPE_SCROLLBACK
? term_scrollback_to_text(term, &text, &len) ? term_scrollback_to_text(term, &text, &len)
: term_view_to_text(term, &text, &len); : term_view_to_text(term, &text, &len);