procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleanup when opening a new terminal fails. (Bug#32794)

Browse source 
* src/term.c (init_tty): Call delete_terminal_internal if emacs_open
fail.
* src/terminal.c (delete_terminal): Move some code into
delete_terminal_internal and call it.
(delete_terminal_internal): New function.
* src/termhooks.h: Prototype for delete_terminal_internal.
This commit is contained in:
John Shahid 2018-09-21 11:15:10 -04:00 • committed by Eli Zaretskii
parent 9ad0f1d15c
commit e8a4d942dd
3 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/term.c
View file

@ -4004,6 +4004,7 @@ init_tty (const char *name, const char *terminal_type, bool must_succeed)
char const *diagnostic
= (fd < 0) ? "Could not open file: %s" : "Not a tty device: %s";
emacs_close (fd);
delete_terminal_internal (terminal);
maybe_fatal (must_succeed, terminal, diagnostic, diagnostic, name);
}

1
src/termhooks.h
View file

@ -729,6 +729,7 @@ extern struct terminal *get_named_terminal (const char *);
extern struct terminal *create_terminal (enum output_method,
struct redisplay_interface *);
extern void delete_terminal (struct terminal *);
extern void delete_terminal_internal (struct terminal *);
extern Lisp_Object terminal_glyph_code (struct terminal *, int);
/* The initial terminal device, created by initial_term_init. */

9
src/terminal.c
View file

@ -314,7 +314,6 @@ create_terminal (enum output_method type, struct redisplay_interface *rif)
void
delete_terminal (struct terminal *terminal)
{
struct terminal **tp;
Lisp_Object tail, frame;
/* Protect against recursive calls. delete_frame calls the
@ -335,6 +334,14 @@ delete_terminal (struct terminal *terminal)
}
}
delete_terminal_internal (terminal);
}
void
delete_terminal_internal (struct terminal *terminal)
{
struct terminal **tp;
for (tp = &terminal_list; *tp != terminal; tp = &(*tp)->next_terminal)
if (! *tp)
emacs_abort ();