mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-08-22 10:29:35 +00:00
Go through the really awkward dance required to delete the memory
allocated by setupterm. Without this, some folks are seeing leaked memory whenever this routine is called more than once. Thanks to Craig Topper for the report. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@188615 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
19046ec19c
commit
d485e7bd76
@ -240,10 +240,12 @@ unsigned Process::StandardErrColumns() {
|
||||
}
|
||||
|
||||
#ifdef HAVE_TERMINFO
|
||||
// We manually declare these two extern functions because finding the correct
|
||||
// We manually declare these extern functions because finding the correct
|
||||
// headers from various terminfo, curses, or other sources is harder than
|
||||
// writing their specs down.
|
||||
extern "C" int setupterm(char *term, int filedes, int *errret);
|
||||
extern "C" struct term *set_curterm(struct term *termp);
|
||||
extern "C" int del_curterm(struct term *termp);
|
||||
extern "C" int tigetnum(char *capname);
|
||||
#endif
|
||||
|
||||
@ -272,7 +274,15 @@ static bool terminalHasColors(int fd) {
|
||||
//
|
||||
// The 'tigetnum' routine returns -2 or -1 on errors, and might return 0 if
|
||||
// the terminfo says that no colors are supported.
|
||||
if (tigetnum(const_cast<char *>("colors")) > 0)
|
||||
bool HasColors = tigetnum(const_cast<char *>("colors")) > 0;
|
||||
|
||||
// Now extract the structure allocated by setupterm and free its memory
|
||||
// through a really silly dance.
|
||||
struct term *termp = set_curterm((struct term *)0);
|
||||
(void)del_curterm(termp); // Drop any errors here.
|
||||
|
||||
// Return true if we found a color capabilities for the current terminal.
|
||||
if (HasColors)
|
||||
return true;
|
||||
#endif
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user