Merge branch 'frazze/stdlib/io_ansi_handle_enotsup/OTP-20028'

Author: frazze-jobb

erts/emulator/nifs/common/prim_tty_nif.c

@@ -766,13 +766,19 @@ static ERL_NIF_TERM setlocale_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM a
     return atom_false;
 #endif
 }
-
+#ifdef HAVE_TERMCAP
+static TERMINAL *saved_term = NULL;
+#endif
 static ERL_NIF_TERM tty_setupterm_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]) {
 #ifdef HAVE_TERMCAP
     int errret;
     if (setupterm(NULL, -1, &errret) < 0) {
         return make_errno_error(env, "setupterm");
     }
+    if (saved_term) {
+        del_curterm(saved_term);
+    }
+    saved_term = cur_term;
     return atom_ok;
 #else
     return make_enotsup(env);
@@ -1257,7 +1263,12 @@ static int load(ErlNifEnv* env, void** priv_data, ERL_NIF_TERM load_info)
 
 static void unload(ErlNifEnv* env, void* priv_data)
 {
-
+#ifdef HAVE_TERMCAP
+    if (saved_term) {
+        del_curterm(saved_term);
+        saved_term = NULL;
+    }
+#endif
 }
 
 static int upgrade(ErlNifEnv* env, void** priv_data, void** old_priv_data,

lib/stdlib/src/io_ansi.erl

@@ -2506,7 +2506,9 @@ init_mappings() ->
                                                        9 -> fun(A, B, C, D, E, F, G, H, I) -> {ok, S} = prim_tty:tputs(TermInfoStr, [A, B , C, D, E, F, G, H, I]), S end
                                                    end,
                                                { Arity, #{ terminfo => TermInfoFun, ansi => AnsiFun }};
-                                           false -> Fun({undefined, AnsiFun})
+                                           false -> Fun({undefined, AnsiFun});
+                                           {error, enotsup} ->
+                                               Fun({undefined, AnsiFun})
                                        catch error:badarg ->
                                                Fun({undefined, AnsiFun})
                                        end;
@@ -2517,7 +2519,9 @@ init_mappings() ->
                                                {0, #{ terminfo => fun() -> TermInfoStr end,
                                                       ansi => fun() -> AnsiString end } };
                                            false ->
-                                               Fun({undefined, AnsiString})
+                                               Fun({undefined, AnsiString});
+                                            {error, enotsup} ->
+                                                Fun({undefined, AnsiString})
                                        catch error:badarg ->
                                                Fun({undefined, AnsiString})
                                        end;