diff --git a/src/osdep/signals.c b/src/osdep/signals.c index 72bc31cc..7de1213a 100644 --- a/src/osdep/signals.c +++ b/src/osdep/signals.c @@ -73,7 +73,7 @@ sig_tstp(struct terminal *term) #ifdef SIGSTOP pid_t pid = getpid(); - block_itrm(0); + block_itrm(); #if defined (SIGCONT) && defined(SIGTTOU) if (!fork()) { sleep(1); @@ -95,7 +95,7 @@ sig_tstp(struct terminal *term) static void sig_cont(struct terminal *term) { - if (!unblock_itrm(0)) resize_terminal(); + if (!unblock_itrm()) resize_terminal(); } #endif diff --git a/src/terminal/kbd.c b/src/terminal/kbd.c index eb6e1ae6..16be876b 100644 --- a/src/terminal/kbd.c +++ b/src/terminal/kbd.c @@ -350,13 +350,13 @@ unblock_itrm_x(void *h) { close_handle(h); if (!ditrm) return; - unblock_itrm(0); + unblock_itrm(); resize_terminal(); } int -unblock_itrm(int fd) +unblock_itrm(void) { if (!ditrm) return -1; @@ -375,7 +375,7 @@ unblock_itrm(int fd) void -block_itrm(int fd) +block_itrm(void) { if (!ditrm) return; @@ -591,7 +591,7 @@ has_nul_byte: memcpy(param + 1, path.source, path_len + 1); memcpy(param + 1 + path_len + 1, delete.source, del_len + 1); - if (fg == 1) block_itrm(itrm->in.ctl); + if (fg == 1) block_itrm(); blockh = start_thread((void (*)(void *, int)) exec_thread, param, param_len); @@ -599,7 +599,7 @@ has_nul_byte: if (blockh == -1) { if (fg == 1) - unblock_itrm(itrm->in.ctl); + unblock_itrm(); goto nasty_thing; } diff --git a/src/terminal/kbd.h b/src/terminal/kbd.h index 89d352b2..f5b6d879 100644 --- a/src/terminal/kbd.h +++ b/src/terminal/kbd.h @@ -118,8 +118,8 @@ handle_trm(int std_in, int std_out, int sock_in, int sock_out, int ctl_in, void *init_string, int init_len, int remote); void itrm_queue_event(struct itrm *itrm, unsigned char *data, int len); -void block_itrm(int); -int unblock_itrm(int); +void block_itrm(void); +int unblock_itrm(void); void free_all_itrms(void); void resize_terminal(void); void dispatch_special(unsigned char *); diff --git a/src/terminal/terminal.c b/src/terminal/terminal.c index ccbe30ef..b106f9ec 100644 --- a/src/terminal/terminal.c +++ b/src/terminal/terminal.c @@ -200,7 +200,7 @@ unblock_terminal(struct terminal *term) term->blocked = -1; set_handlers(term->fdin, (select_handler_T) in_term, NULL, (select_handler_T) destroy_terminal, term); - unblock_itrm(term->fdin); + unblock_itrm(); redraw_terminal_cls(term); if (textarea_editor) /* XXX */ textarea_edit(1, NULL, NULL, NULL, NULL); @@ -223,13 +223,13 @@ exec_on_master_terminal(struct terminal *term, memcpy(param + 1, path, plen + 1); memcpy(param + 1 + plen + 1, delete, dlen + 1); - if (fg == 1) block_itrm(term->fdin); + if (fg == 1) block_itrm(); blockh = start_thread((void (*)(void *, int)) exec_thread, param, param_size); fmem_free(param); if (blockh == -1) { - if (fg == 1) unblock_itrm(term->fdin); + if (fg == 1) unblock_itrm(); return; }