TheCloud/dwarfs
1
0
Fork 0
mirror of https://github.com/mhx/dwarfs.git synced 2025-09-11 21:35:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(terminal_ansi): handle errors and fall back to default width

Browse Source
This commit is contained in:
Marcus Holland-Moritz 2024-08-13 16:26:32 +02:00
parent 1daa729d59
commit 9d4bba042b
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/terminal_ansi.cpp
View File

@ -39,6 +39,8 @@ namespace dwarfs {
namespace {
constexpr size_t default_width{80};
#if defined(_WIN32)
void WindowsEmulateVT100Terminal(DWORD std_handle) {
@ -66,8 +68,10 @@ void WindowsEmulateVT100Terminal(DWORD std_handle) {
size_t width_impl() {
CONSOLE_SCREEN_BUFFER_INFO csbi;
::GetConsoleScreenBufferInfo(::GetStdHandle(STD_ERROR_HANDLE), &csbi);
return csbi.srWindow.Right - csbi.srWindow.Left + 1;
if (::GetConsoleScreenBufferInfo(::GetStdHandle(STD_ERROR_HANDLE), &csbi)) {
return csbi.srWindow.Right - csbi.srWindow.Left + 1;
}
return default_width;
}
bool is_tty_impl(std::ostream& os) {
@ -86,8 +90,8 @@ bool is_fancy_impl() { return true; }
size_t width_impl() {
struct ::winsize w;
::ioctl(STDERR_FILENO, TIOCGWINSZ, &w);
return w.ws_col;
auto rv = ::ioctl(STDERR_FILENO, TIOCGWINSZ, &w);
return rv == 0 ? w.ws_col : default_width;
}
bool is_tty_impl(std::ostream& os) {