Fix an error in psql that overcounted output lines.

This error counted the first line of a cell as "extra". The effect was
to cause far too frequent invocation of the pager. In most cases this
can be worked around (for example, by using the "less" pager with the -F
flag), so don't backpatch.
This commit is contained in:
Andrew Dunstan 2014-11-21 12:37:09 -05:00
parent e4d28175a1
commit 4077fb4d1d
1 changed files with 2 additions and 1 deletions

View File

@ -836,7 +836,8 @@ print_aligned_text(const printTableContent *cont, FILE *fout)
{
unsigned int extra_lines;
extra_lines = (width - 1) / width_wrap[i] + nl_lines;
/* don't count the first line of nl_lines - it's not "extra" */
extra_lines = ((width - 1) / width_wrap[i]) + nl_lines - 1;
if (extra_lines > extra_row_output_lines)
extra_row_output_lines = extra_lines;
}