diff --git a/src/fterm.cpp b/src/fterm.cpp index df782f10..0c6e23cb 100644 --- a/src/fterm.cpp +++ b/src/fterm.cpp @@ -88,7 +88,7 @@ bool FTerm::NewFont; bool FTerm::VGAFont; uChar FTerm::x11_button_state; termios FTerm::term_init; -char FTerm::termtype[30] = {}; +char FTerm::termtype[30] = ""; char* FTerm::term_name = 0; char* FTerm::locale_name = 0; char* FTerm::locale_xterm = 0; @@ -938,7 +938,7 @@ void FTerm::signal_handler (int signum) void FTerm::init() { char local256[80] = ""; - char *s1, *s2, *s3, *s4, *s5, *s6, *term_env1, *term_env2; + char *s1, *s2, *s3, *s4, *s5, *s6; output_buffer = new std::queue; vt100_alt_char = new std::map; @@ -1003,10 +1003,9 @@ void FTerm::init() x11_button_state = 0x03; // Import untrusted environment variable TERM - term_env1 = getenv("TERM"); - term_env2 = term_env1; - if ( term_env2 ) - snprintf (termtype, sizeof(termtype), "%s", term_env2); + const char* term_env = getenv("TERM"); + if ( term_env != 0 ) + strncat (termtype, term_env, sizeof(termtype) - strlen(termtype) - 1); else strncpy (termtype, const_cast("vt100"), 6);