Commit e8a4d942 authored by John Shahid's avatar John Shahid Committed by Eli Zaretskii

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

* src/term.c (init_tty): Call delete_terminal_internal if emacs_open
* 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.
parent 9ad0f1d1
......@@ -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);
......@@ -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. */
......@@ -314,7 +314,6 @@ create_terminal (enum output_method type, struct redisplay_interface *rif)
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);
delete_terminal_internal (struct terminal *terminal)
struct terminal **tp;
for (tp = &terminal_list; *tp != terminal; tp = &(*tp)->next_terminal)
if (! *tp)
emacs_abort ();
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment