Fix the fix in rev. 1.15 so that we jump to the next column

instead of always skipping it.

MFC after:	3 days

1 files changed, 3 insertions, 3 deletions

diff --git a/usr.bin/column/column.c b/usr.bin/column/column.c
index ca2837d..329cfa9 100644
--- a/usr.bin/column/column.c
+++ b/usr.bin/column/column.c
@@ -141,7 +141,7 @@ main(int argc, char **argv)
 	if (!entries)
 		exit(eval);
 
-	maxlength = roundup(maxlength + TAB, TAB);
+	maxlength = roundup(maxlength + 1, TAB);
 	if (tflag)
 		maketbl();
 	else if (maxlength >= termwidth)
@@ -171,7 +171,7 @@ c_columnate(void)
 			endcol = maxlength;
 			putwchar('\n');
 		} else {
-			while ((cnt = roundup(chcnt + TAB, TAB)) <= endcol) {
+			while ((cnt = roundup(chcnt + 1, TAB)) <= endcol) {
 				(void)putwchar('\t');
 				chcnt = cnt;
 			}
@@ -199,7 +199,7 @@ r_columnate(void)
 			chcnt += width(list[base]);
 			if ((base += numrows) >= entries)
 				break;
-			while ((cnt = roundup(chcnt + TAB, TAB)) <= endcol) {
+			while ((cnt = roundup(chcnt + 1, TAB)) <= endcol) {
 				(void)putwchar('\t');
 				chcnt = cnt;
 			}