Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

erts: Fix prim_tty nif to compile with GNU termcap #7533

Merged
merged 1 commit into from
Aug 24, 2023
Merged

erts: Fix prim_tty nif to compile with GNU termcap #7533

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 13 additions & 12 deletions erts/emulator/nifs/common/prim_tty_nif.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,7 @@
#include <locale.h>
#ifdef HAVE_TERMCAP
#include <termios.h>
#include <curses.h>
#include <term.h>
#include <termcap.h>
#endif
#ifndef __WIN32__
#include <unistd.h>
Expand Down Expand Up @@ -710,11 +709,12 @@ static ERL_NIF_TERM tty_tgetstr_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM
/* tgetstr seems to use a lot of stack buffer space,
so buff needs to be relatively "small" */
char *str = NULL;
char buff[BUFSIZ] = {0};
char buff_area[BUFSIZ] = {0};
char *buff = (char*)buff_area;

if (!enif_inspect_iolist_as_binary(env, argv[0], &TERM))
return enif_make_badarg(env);
str = tgetstr((char*)TERM.data, (char**)&buff);
str = tgetstr((char*)TERM.data, &buff);
if (!str) return atom_false;
enif_alloc_binary(strlen(str), &ret);
memcpy(ret.data, str, strlen(str));
Expand Down Expand Up @@ -742,8 +742,11 @@ static int tty_puts_putc(int c) {
static ERL_NIF_TERM tty_tgoto_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]) {
#ifdef HAVE_TERMCAP
ErlNifBinary TERM;
ERL_NIF_TERM ret;
char *ent;
int value1 = 0, value2 = 0;
unsigned char *buff;

if (!enif_inspect_iolist_as_binary(env, argv[0], &TERM) ||
(argc > 1 && !enif_get_int(env, argv[1], &value1)) ||
(argc > 2 && !enif_get_int(env, argv[2], &value2))
Expand All @@ -753,14 +756,12 @@ static ERL_NIF_TERM tty_tgoto_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM a
if (!ent) return make_errno_error(env, "tgoto");

tputs_buffer_index = 0;
if (tputs(ent, 1, tty_puts_putc)) {
return make_errno_error(env, "tputs");
} else {
ERL_NIF_TERM ret;
unsigned char *buff = enif_make_new_binary(env, tputs_buffer_index, &ret);
memcpy(buff, tputs_buffer, tputs_buffer_index);
return enif_make_tuple2(env, atom_ok, ret);
}
(void)tputs(ent, 1, tty_puts_putc); /* tputs only fails if ent is null,
which is cannot be. */

buff = enif_make_new_binary(env, tputs_buffer_index, &ret);
memcpy(buff, tputs_buffer, tputs_buffer_index);
return enif_make_tuple2(env, atom_ok, ret);
#else
return make_enotsup(env);
#endif
Expand Down
Loading