Fix an error in psql that overcounted output lines.

adunstan · adunstan · commit 4077fb4d1d34 · 2014-11-21T12:37:09.000-05:00
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.
diff --git a/src/bin/psql/print.c b/src/bin/psql/print.c
@@ -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;
 			}

Original file line number	Diff line number	Diff line change
`@@ -836,7 +836,8 @@ print_aligned_text(const printTableContent cont, FILE fout)`
`836`	`836`	`{`
`837`	`837`	`unsigned int extra_lines;`
`838`	`838`
`839`		`- extra_lines = (width - 1) / width_wrap[i] + nl_lines;`
	`839`	`+ /* don't count the first line of nl_lines - it's not "extra" */`
	`840`	`+ extra_lines = ((width - 1) / width_wrap[i]) + nl_lines - 1;`
`840`	`841`	`if (extra_lines > extra_row_output_lines)`
`841`	`842`	`extra_row_output_lines = extra_lines;`
`842`	`843`	`}`