perso
/
finalcut
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

FTermcap is now null pointer resistant

This commit is contained in:
Markus Gans 2020-05-02 16:54:22 +02:00
parent 0be377a94a
commit 5f447e8267
2 changed files with 59 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/ftermcap.cpp
View File

@ -67,39 +67,6 @@ char FTermcap::string_buf[2048] {};
*/
// public methods of FTermcap
//----------------------------------------------------------------------
bool FTermcap::getFlag (const std::string& cap)
{
return tgetflag(C_STR(cap.c_str()));
}
//----------------------------------------------------------------------
int FTermcap::getNumber (const std::string& cap)
{
return tgetnum(C_STR(cap.c_str()));
}
//----------------------------------------------------------------------
char* FTermcap::getString (const std::string& cap)
{
return tgetstr( C_STR(cap.c_str())
, reinterpret_cast<char**>(&string_buf) );
}
//----------------------------------------------------------------------
int FTermcap::paddingPrint ( const std::string& str
, int affcnt, fn_putc putc )
{
return fsystem->tputs (str.c_str(), affcnt, putc);
}
//----------------------------------------------------------------------
char* FTermcap::encodeMotionParameter ( const std::string& str
, int col, int row )
{
return tgoto(str.c_str(), col, row);
}
//----------------------------------------------------------------------
void FTermcap::init()
{
@ -271,6 +238,15 @@ void FTermcap::termcapKeys()
fc::fkey[i].string = getString(fc::fkey[i].tname);
}
//----------------------------------------------------------------------
int FTermcap::_tputs (const char* str, int affcnt, fn_putc putc)
{
if ( ! fsystem )
fsystem = FTerm::getFSystem();
return fsystem->tputs (str, affcnt, putc);
}
// private Data Member of FTermcap - termcap capabilities
//----------------------------------------------------------------------

59
src/include/final/ftermcap.h
View File

@ -95,13 +95,18 @@ class FTermcap final
// Accessors
const FString getClassName() const;
static bool getFlag (const std::string&);
static int getNumber (const std::string&);
static char* getString (const std::string&);
static int paddingPrint (const std::string&, int, fn_putc);
static char* encodeMotionParameter (const std::string&, int, int);
template<typename CharT>
static bool getFlag (const CharT&);
template<typename CharT>
static int getNumber (const CharT&);
template<typename CharT>
static char* getString (const CharT&);
template<typename CharT>
static char* encodeMotionParameter (const CharT&, int, int);
template<typename... Args>
static char* encodeParameter (const std::string&, Args&&...);
static char* encodeParameter (Args&&...);
template<typename CharT>
static int paddingPrint (const CharT&, int, fn_putc);
// Methods
static void init();
@ -129,6 +134,7 @@ class FTermcap final
static void termcapNumerics();
static void termcapStrings();
static void termcapKeys();
static int _tputs (const char*, int, fn_putc);
// Data member
static FSystem* fsystem;
@ -144,10 +150,45 @@ inline const FString FTermcap::getClassName() const
{ return "FTermcap"; }
//----------------------------------------------------------------------
template<typename... Args>
inline char* FTermcap::encodeParameter (const std::string& str, Args&&... args)
template<typename CharT>
bool FTermcap::getFlag (const CharT& cap)
{
return tparm (str.c_str(), std::forward<Args>(args)...);
return tgetflag(cap);
}
//----------------------------------------------------------------------
template<typename CharT>
int FTermcap::getNumber (const CharT& cap)
{
return tgetnum(cap);
}
//----------------------------------------------------------------------
template<typename CharT>
char* FTermcap::getString (const CharT& cap)
{
return tgetstr(cap, reinterpret_cast<char**>(&string_buf));
}
//----------------------------------------------------------------------
template<typename CharT>
char* FTermcap::encodeMotionParameter (const CharT& cap, int col, int row)
{
return tgoto(cap, col, row);
}
//----------------------------------------------------------------------
template<typename... Args>
inline char* FTermcap::encodeParameter (Args&&... args)
{
return tparm (std::forward<Args>(args)...);
}
//----------------------------------------------------------------------
template<typename CharT>
int FTermcap::paddingPrint (const CharT& str, int affcnt, fn_putc putc)
{
return _tputs (str, affcnt, putc);
}
} // namespace finalcut