@@ -1135,10 +1135,10 @@ static void buf_free_all(void)
buffer.chunks = 0;
}
-/* Get current screen width, default to 80 columns if TIOCGWINSZ fails */
+/* Get current screen width, returns -1 if TIOCGWINSZ fails */
static int render_screen_width(void)
{
- int width = 80;
+ int width = -1;
if (isatty(STDOUT_FILENO)) {
struct winsize w;
@@ -1159,7 +1159,13 @@ static int render_screen_width(void)
*/
static void render_calc_width(void)
{
+ bool compact_output = false;
int screen_width = render_screen_width();
+ if (screen_width == -1) {
+ screen_width = 80;
+ compact_output = true;
+ }
+
struct column *c, *eol = columns - 1;
int first, len = 0, linecols = 0;
@@ -1183,6 +1189,11 @@ static void render_calc_width(void)
first = 0;
}
+ if (compact_output) {
+ /* Terminal width couldn't be guessed, don't extend the output */
+ return;
+ }
+
/* Second pass: find out newlines and distribute available spacing */
for (c = columns; c - columns < COL_MAX; c++) {
int pad, spacing, rem, last;