pager: avoid setting COLUMNS when we're guessing its value

We query `TIOCGWINSZ` in Git to determine the correct value for `COLUMNS`, and then set that environment variable. If `TIOCGWINSZ` is not available, we fall back to the hard-coded value 80 _and still_ set the environment variable. On Windows this is a problem. The reason is that Git for Windows uses a version of `less` that relies on the MSYS2 runtime to interact with the pseudo terminal (typically inside a MinTTY window, which is also aware of the MSYS2 runtime). Both MinTTY and `less.exe` interact with that pseudo terminal via `ioctl()` calls (which the MSYS2 runtime emulates even if there is no such thing on Windows). Since https://github.com/gwsw/less/commit/bb0ee4e76c2, `less` prefers the `COLUMNS` variable over asking ncurses itself. But `git.exe` itself is _not_ aware of the MSYS2 runtime, or for that matter of that pseudo terminal, and has no way to call `ioctl()` or `TIOCGWINSZ`. Therefore, `git.exe` will fall back to hard-coding 80 columns, no matter what the actual terminal size is. But `less.exe` is totally able to interact with the MSYS2 runtime and would not actually require Git's help (which actually makes things worse here). So let's not override `COLUMNS` on Windows. Let's just not set `COLUMNS` unless we managed to query the actual value from the terminal. This fixes https://github.com/git-for-windows/git/issues/3235 Co-authored-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Johannes Schindelin committed Jun 21, 2021 at 16:57 UTC 9b6e2c8b98f6a382a6ee8d9110bfe93b1b48d6a7
1 file changed +13 -3
pager.c
+13 -3
@@ -11,6 +11,10 @@
11 static struct child_process pager_process = CHILD_PROCESS_INIT;
12 static const char *pager_program;
13
14 +/* Is the value coming back from term_columns() just a guess? */
15 +static int term_columns_guessed;
16 +
17 +
18 static void close_pager_fds(void)
19 {
20 /* signal EOF to pager */
@@ -114,7 +118,8 @@ void setup_pager(void)
118 {
119 char buf[64];
120 xsnprintf(buf, sizeof(buf), "%d", term_columns());
117 - setenv("COLUMNS", buf, 0);
121 + if (!term_columns_guessed)
122 + setenv("COLUMNS", buf, 0);
123 }
124
125 setenv("GIT_PAGER_IN_USE", "true", 1);
@@ -158,15 +163,20 @@ int term_columns(void)
163 return term_columns_at_startup;
164
165 term_columns_at_startup = 80;
166 + term_columns_guessed = 1;
167
168 col_string = getenv("COLUMNS");
163 - if (col_string && (n_cols = atoi(col_string)) > 0)
169 + if (col_string && (n_cols = atoi(col_string)) > 0) {
170 term_columns_at_startup = n_cols;
171 + term_columns_guessed = 0;
172 + }
173 #ifdef TIOCGWINSZ
174 else {
175 struct winsize ws;
168 - if (!ioctl(1, TIOCGWINSZ, &ws) && ws.ws_col)
176 + if (!ioctl(1, TIOCGWINSZ, &ws) && ws.ws_col) {
177 term_columns_at_startup = ws.ws_col;
178 + term_columns_guessed = 0;
179 + }
180 }
181 #endif
182