 @@ -1,15 +1,14 @@
-.\"	$NetBSD: col.1,v 1.10 2012/03/22 07:58:18 wiz Exp $
+.\" $NetBSD: col.1,v 1.11 2020/11/01 22:27:15 christos Exp $
 .\"
 .\" Copyright (c) 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" This code is derived from software contributed to Berkeley by
 .\" Michael Rendell.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 @@ -21,118 +20,153 @@
 .\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 .\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
 .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)col.1	8.1 (Berkeley) 6/29/93
 .\" $FreeBSD: head/usr.bin/col/col.1 366913 2020-10-21 16:30:34Z fernape $
 .\"
-.Dd February 22, 1999
+.Dd November 1, 2020
 .Dt COL 1
 .Os
 .Sh NAME
 .Nm col
 .Nd filter reverse line feeds from input
 .Sh SYNOPSIS
 .Nm
-.Op Fl bfpx
+.Op Fl bfhpx
 .Op Fl l Ar num
 .Sh DESCRIPTION
 The
 .Nm
-filters out reverse (and half reverse) line feeds so that the output is
+utility filters out reverse (and half reverse) line feeds so that the output is
 in the correct order with only forward and half forward line
 feeds, and replaces white-space characters with tabs where possible.
 This can be useful in processing the output of
 .Xr nroff 1
 and
 .Xr tbl 1 .
 .Pp
 The
 .Nm
-reads from the standard input and writes to the standard output.
+utility reads from the standard input and writes to the standard output.
 .Pp
 The options are as follows:
-.Bl -tag -width "-l num  "
+.Bl -tag -width indent
 .It Fl b
 Do not output any backspaces, printing only the last character
 written to each column position.
 .It Fl f
 Forward half line feeds are permitted (``fine'' mode).
 Normally characters printed on a half line boundary are printed
 on the following line.
 .It Fl h
 Do not output multiple spaces instead of tabs (default).
 .It Fl l Ar num
 Buffer at least
 .Ar num
 lines in memory.
 By default, 128 lines are buffered.
 .It Fl p
 Force unknown control sequences to be passed through unchanged.
 Normally,
 .Nm
 will filter out any control sequences from the input other than those
 recognized and interpreted by itself, which are listed below.
 .It Fl x
 Output multiple spaces instead of tabs.
 .It Fl l Ar num
 Buffer at least
 .Ar num
 lines in memory.
 By default, 128 lines are buffered.
 .El
 .Pp
-The control sequences for carriage motion that
+In the input stream,
 .Nm
-understands and their decimal values are listed in the following
+understands both the escape sequences of the form escape-digit
-table:
+mandated by
 .St -susv2
 and the traditional
 .Bx
 format escape-control-character.
 The control sequences for carriage motion and their ASCII values
 are as follows:
 .Pp
 .Bl -tag -width "carriage return" -compact
 .It ESC\-BELL
 reverse line feed (escape then bell).
 .It ESC\-7
-reverse line feed (escape then 7)
+reverse line feed (escape then 7).
 .It ESC\-BACKSPACE
 half reverse line feed (escape then backspace).
 .It ESC\-8
-half reverse line feed (escape then 8)
+half reverse line feed (escape then 8).
 .It ESC\-TAB
 half forward line feed (escape than tab).
 .It ESC\-9
-half forward line feed (escape then 9)
+half forward line feed (escape then 9).
 In
 .Fl f
 mode, this sequence may also occur in the output stream.
 .It backspace
 moves back one column (8); ignored in the first column
 .It carriage return
 (13)
 .It newline
 forward line feed (10); also does carriage return
 .It shift in
 shift to normal character set (15)
 .It shift out
-shift to alternative character set (14)
+shift to alternate character set (14)
 .It space
 moves forward one column (32)
 .It tab
 moves forward to next tab stop (9)
 .It vertical tab
 reverse line feed (11)
 .El
 .Pp
 All unrecognized control characters and escape sequences are
 discarded.
 .Pp
 The
 .Nm
-keeps track of the character set as characters are read and makes
+utility keeps track of the character set as characters are read and makes
 sure the character set is correct when they are output.
 .Pp
 If the input attempts to back up to the last flushed line,
 .Nm
 will display a warning message.
 .Sh ENVIRONMENT
 The
 .Ev LANG , LC_ALL
 and
 .Ev LC_CTYPE
 environment variables affect the execution of
 .Nm
 as described in
 .Xr environ 7 .
 .Sh EXIT STATUS
 .Ex -std
 .Sh EXAMPLES
 We can use
 .Nm
 to filter the output of
 .Xr man 1
 and remove the backspace characters (
 .Em ^H
 ) before searching for some text:
 .Bd -literal -offset indent
 man ls | col -b | grep HISTORY
 .Ed
 .Sh SEE ALSO
-.Xr expand 1 ,
+.Xr expand 1
 .Xr nroff 1 ,
 .Xr tbl 1
 .Sh STANDARDS
 The
 .Nm
 utility conforms to
-.St -xpg4.2 .
+.St -susv2 .
 The
 .Fl l
 option is an extension to the standard.
 .Sh HISTORY
+A
 .Nm
-command appeared in
+command
 appeared in
 .At v6 .

 @@ -1,16 +1,18 @@
-/*	$NetBSD: col.c,v 1.18 2014/10/18 14:56:14 christos Exp $	*/
+/*	$NetBSD: col.c,v 1.19 2020/11/01 22:27:15 christos Exp $	*/
 /*-
  * SPDX-License-Identifier: BSD-3-Clause
+ *
  * Copyright (c) 1990, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Michael Rendell of the Memorial University of Newfoundland.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -27,516 +29,575 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1990, 1993, 1994\
  The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)col.c	8.5 (Berkeley) 5/4/95";
 __FBSDID("$FreeBSD: head/usr.bin/col/col.c 366577 2020-10-09 15:27:37Z markj $")
+;
 #endif
-__RCSID("$NetBSD: col.c,v 1.18 2014/10/18 14:56:14 christos Exp $");
+__RCSID("$NetBSD: col.c,v 1.19 2020/11/01 22:27:15 christos Exp $");
 #endif /* not lint */
 #include <ctype.h>
 #include <err.h>
-#include <string.h>
+#include <errno.h>
 #include <inttypes.h>
 #include <limits.h>
 #include <locale.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <termios.h>
 #include <unistd.h>
 #include <wchar.h>
 #include <wctype.h>
 #define	BS	'\b'		/* backspace */
 #define	TAB	'\t'		/* tab */
 #define	SPACE	' '		/* space */
 #define	NL	'\n'		/* newline */
 #define	CR	'\r'		/* carriage return */
 #define	ESC	'\033'		/* escape */
 #define	SI	'\017'		/* shift in to normal character set */
 #define	SO	'\016'		/* shift out to alternate character set */
 #define	VT	'\013'		/* vertical tab (aka reverse line feed) */
-#define	RLF	'\007'		/* ESC-07 reverse line feed */
+#define	RLF	'7'		/* ESC-7 reverse line feed */
-#define	RHLF	'\010'		/* ESC-010 reverse half-line feed */
+#define	RHLF	'8'		/* ESC-8 reverse half-line feed */
-#define	FHLF	'\011'		/* ESC-011 forward half-line feed */
+#define	FHLF	'9'		/* ESC-9 forward half-line feed */
 /* build up at least this many lines before flushing them out */
 #define	BUFFER_MARGIN		32
 typedef char CSET;
 typedef struct char_str {
 #define	CS_NORMAL	1
 #define	CS_ALTERNATE	2
-	short		c_column;	/* column character is in */
+	int		c_column;	/* column character is in */
 	CSET		c_set;		/* character set (currently only 2) */
-	char		c_char;		/* character in question */
+	wchar_t		c_char;		/* character in question */
 	int		c_width;	/* character width */
 } CHAR;
 typedef struct line_str LINE;
 struct line_str {
 	CHAR	*l_line;		/* characters on the line */
 	LINE	*l_prev;		/* previous line */
 	LINE	*l_next;		/* next line */
 	int	l_lsize;		/* allocated sizeof l_line */
 	int	l_line_len;		/* strlen(l_line) */
 	int	l_needs_sort;		/* set if chars went in out of order */
 	int	l_max_col;		/* max column in the line */
 };
-static LINE   *alloc_line(void);
+static void	addto_lineno(int *, int);
 static LINE	*alloc_line(void);
 static void	dowarn(int);
 static void	flush_line(LINE *);
 static void	flush_lines(int);
 static void	flush_blanks(void);
 static void	free_line(LINE *);
 __dead static void	usage(void);
 __dead static void	wrerr(void);
 static void   *xmalloc(void *, size_t);
 static CSET	last_set;		/* char_set of last char printed */
-static LINE   *lines;
+static LINE	*lines;
 static int	compress_spaces;	/* if doing space -> tab conversion */
 static int	fine;			/* if `fine' resolution (half lines) */
-static int	max_bufd_lines;		/* max # lines to keep in memory */
+static int	max_bufd_lines;		/* max # of half lines to keep in memory */
 static int	nblank_lines;		/* # blanks after last flushed line */
 static int	no_backspaces;		/* if not to output any backspaces */
-static int	pass_unknown_seqs;	/* whether to pass unknown control sequences */
+static int	pass_unknown_seqs;	/* pass unknown control sequences */
 #define	PUTC(ch) \
-	if (putchar(ch) == EOF) \
+	do {					\
-		wrerr();
+		if (putwchar(ch) == WEOF)	\
 			errx(EXIT_FAILURE, "write error");	\
 	} while (/*CONSTCOND*/0)
 int
 main(int argc, char **argv)
+{
-	int ch;
+	wint_t ch;
 	CHAR *c;
 	CSET cur_set;			/* current character set */
 	LINE *l;			/* current line */
 	int extra_lines;		/* # of lines above first line */
 	int cur_col;			/* current column */
 	int cur_line;			/* line number of current position */
 	int max_line;			/* max value of cur_line */
 	int this_line;			/* line l points to */
 	int nflushd_lines;		/* number of lines that were flushed */
-	int adjust, opt, warned;
+	int adjust, opt, warned, width;
 	int e;
-	max_bufd_lines = 128;
+	(void)setlocale(LC_CTYPE, "");
 	max_bufd_lines = 256;
 	compress_spaces = 1;		/* compress spaces into tabs */
 	pass_unknown_seqs = 0;		/* remove unknown escape sequences */
 	while ((opt = getopt(argc, argv, "bfhl:px")) != -1)
 		switch (opt) {
 		case 'b':		/* do not output backspaces */
 			no_backspaces = 1;
 			break;
 		case 'f':		/* allow half forward line feeds */
 			fine = 1;
 			break;
 		case 'h':		/* compress spaces into tabs */
 			compress_spaces = 1;
 			break;
 		case 'l':		/* buffered line count */
-			if ((max_bufd_lines = atoi(optarg)) <= 0) {
+			max_bufd_lines = (int)strtoi(optarg, NULL, 0, 1,
-				(void)fprintf(stderr,
+			    (INT_MAX - BUFFER_MARGIN) / 2, &e) * 2;
-				    "col: bad -l argument %s.\n", optarg);
+			if (e)
-				exit(EXIT_FAILURE);
+				errc(EXIT_FAILURE, e, "bad -l argument `%s'",
 				    optarg);
 			break;
 		case 'p':		/* pass unknown control sequences */
 			pass_unknown_seqs = 1;
 			break;
 		case 'x':		/* do not compress spaces into tabs */
 			compress_spaces = 0;
 			break;
 		case '?':
 		default:
 			usage();
+		}
 	if (optind != argc)
 		usage();
 	/* this value is in half lines */
 	max_bufd_lines *= 2;
 	adjust = cur_col = extra_lines = warned = 0;
 	cur_line = max_line = nflushd_lines = this_line = 0;
 	cur_set = last_set = CS_NORMAL;
 	lines = l = alloc_line();
-	while ((ch = getchar()) != EOF) {
+	while ((ch = getwchar()) != WEOF) {
-		if (!isgraph(ch)) {
+		if (!iswgraph(ch)) {
 			switch (ch) {
 			case BS:		/* can't go back further */
 				if (cur_col == 0)
 					continue;
 				--cur_col;
 				continue;
 			case CR:
 				cur_col = 0;
 				continue;
 			case ESC:		/* just ignore EOF */
-				switch(getchar()) {
+				switch(getwchar()) {
 				/*
 				 * In the input stream, accept both the
 				 * XPG5 sequences ESC-digit and the
 				 * traditional BSD sequences ESC-ctrl.
 				 */
 				case '\007':
 					/* FALLTHROUGH */
 				case RLF:
-					cur_line -= 2;
+					addto_lineno(&cur_line, -2);
 					break;
 				case '\010':
 					/* FALLTHROUGH */
 				case RHLF:
-					cur_line--;
+					addto_lineno(&cur_line, -1);
 					break;
 				case '\011':
 					/* FALLTHROUGH */
 				case FHLF:
-					cur_line++;
+					addto_lineno(&cur_line, 1);
 					if (cur_line > max_line)
 						max_line = cur_line;
+				}
 				continue;
 			case NL:
-				cur_line += 2;
+				addto_lineno(&cur_line, 2);
 				if (cur_line > max_line)
 					max_line = cur_line;
 				cur_col = 0;
 				continue;
 			case SPACE:
 				++cur_col;
 				continue;
 			case SI:
 				cur_set = CS_NORMAL;
 				continue;
 			case SO:
 				cur_set = CS_ALTERNATE;
 				continue;
 			case TAB:		/* adjust column */
 				cur_col |= 7;
 				++cur_col;
 				continue;
 			case VT:
-				cur_line -= 2;
+				addto_lineno(&cur_line, -2);
 				continue;
+			}
 			if (iswspace(ch)) {
 				if ((width = wcwidth(ch)) > 0)
 					cur_col += width;
 				continue;
+			}
 			if (!pass_unknown_seqs)
 				continue;
+		}
 		/* Must stuff ch in a line - are we at the right one? */
-		if (cur_line != this_line - adjust) {
+		if (cur_line + adjust != this_line) {
 			LINE *lnew;
 			int nmove;
-			adjust = 0;
+			/* round up to next line */
-			nmove = cur_line - this_line;
+			adjust = !fine && (cur_line & 1);
 			if (!fine) {
-				/* round up to next line */
+			if (cur_line + adjust < this_line) {
-				if (cur_line & 1) {
+				while (cur_line + adjust < this_line &&
-					adjust = 1;
+				    l->l_prev != NULL) {
 					nmove++;
 			if (nmove < 0) {
 				for (; nmove < 0 && l->l_prev; nmove++)
 					l = l->l_prev;
-				if (nmove) {
+					this_line--;
+				}
 				if (cur_line + adjust < this_line) {
 					if (nflushd_lines == 0) {
 						/*
 						 * Allow backup past first
 						 * line if nothing has been
 						 * flushed yet.
 						 */
-						for (; nmove < 0; nmove++) {
+						while (cur_line + adjust
 						    < this_line) {
 							lnew = alloc_line();
 							l->l_prev = lnew;
 							lnew->l_next = l;
 							l = lines = lnew;
 							extra_lines++;
 							this_line--;
+						}
 					} else {
 						if (!warned++)
 							dowarn(cur_line);
-						cur_line -= nmove;
+						cur_line = this_line - adjust;
+					}
+				}
 			} else {
 				/* may need to allocate here */
-				for (; nmove > 0 && l->l_next; nmove--)
+				while (cur_line + adjust > this_line) {
 					if (l->l_next == NULL) {
 						l->l_next = alloc_line();
 						l->l_next->l_prev = l;
+					}
 					l = l->l_next;
-				for (; nmove > 0; nmove--) {
+					this_line++;
 					lnew = alloc_line();
 					lnew->l_prev = l;
 					l->l_next = lnew;
 					l = lnew;
+				}
+			}
-			this_line = cur_line + adjust;
+			if (this_line > nflushd_lines &&
-			nmove = this_line - nflushd_lines;
+			    this_line - nflushd_lines >=
-			if (nmove >= max_bufd_lines + BUFFER_MARGIN) {
+			    max_bufd_lines + BUFFER_MARGIN) {
-				nflushd_lines += nmove - max_bufd_lines;
+				if (extra_lines) {
-				flush_lines(nmove - max_bufd_lines);
+					flush_lines(extra_lines);
 					extra_lines = 0;
+				}
 				flush_lines(this_line - nflushd_lines -
 				    max_bufd_lines);
 				nflushd_lines = this_line - max_bufd_lines;
+			}
+		}
 		/* grow line's buffer? */
 		if (l->l_line_len + 1 >= l->l_lsize) {
 			int need;
 			need = l->l_lsize ? l->l_lsize * 2 : 90;
-			l->l_line = (CHAR *)xmalloc((void *) l->l_line,
+			if ((l->l_line = realloc(l->l_line,
-			    (unsigned) need * sizeof(CHAR));
+			    (unsigned)need * sizeof(CHAR))) == NULL)
 				err(EXIT_FAILURE, NULL);
 			l->l_lsize = need;
+		}
 		c = &l->l_line[l->l_line_len++];
 		c->c_char = ch;
 		c->c_set = cur_set;
 		c->c_column = cur_col;
 		c->c_width = wcwidth(ch);
 		/*
 		 * If things are put in out of order, they will need sorting
 		 * when it is flushed.
 		 */
 		if (cur_col < l->l_max_col)
 			l->l_needs_sort = 1;
 		else
 			l->l_max_col = cur_col;
-		cur_col++;
+		if (c->c_width > 0)
 			cur_col += c->c_width;
+	}
 	if (ferror(stdin))
 		err(EXIT_FAILURE, NULL);
 	if (extra_lines) {
 		/*
 		 * Extra lines only exist if no lines have been flushed
 		 * yet. This means that 'lines' must point to line zero
 		 * after we flush the extra lines.
 		 */
 		flush_lines(extra_lines);
 		l = lines;
 		this_line = 0;
+	}
 	if (max_line == 0)
 		exit(EXIT_SUCCESS);	/* no lines, so just exit */
 	/* goto the last line that had a character on it */
 	for (; l->l_next; l = l->l_next)
 		this_line++;
-	flush_lines(this_line - nflushd_lines + extra_lines + 1);
+	flush_lines(this_line - nflushd_lines + 1);
 	/* make sure we leave things in a sane state */
 	if (last_set != CS_NORMAL)
-		PUTC('\017');
+		PUTC(SI);
 	/* flush out the last few blank lines */
-	nblank_lines = max_line - this_line;
+	if (max_line >= this_line)
-	if (max_line & 1)
+		nblank_lines = max_line - this_line + (max_line & 1);
-		nblank_lines++;
+	if (nblank_lines == 0)
-	else if (!nblank_lines)
+		/* end with a newline even if the source doesn't */
 		/* missing a \n on the last line? */
 		nblank_lines = 2;
 	flush_blanks();
 	exit(EXIT_SUCCESS);
 	/* NOTREACHED */
+}
 /*
  * Prints the first 'nflush' lines. Printed lines are freed.
  * After this function returns, 'lines' points to the first
  * of the remaining lines, and 'nblank_lines' will have the
  * number of half line feeds between the final flushed line
  * and the first remaining line.
  */
 static void
 flush_lines(int nflush)
+{
 	LINE *l;
 	while (--nflush >= 0) {
 		l = lines;
 		lines = l->l_next;
 		if (l->l_line) {
 			flush_blanks();
 			flush_line(l);
 			free(l->l_line);
+		}
-		nblank_lines++;
+		if (l->l_next)
-		if (l->l_line)
+			nblank_lines++;
 			(void)free((void *)l->l_line);
 		free_line(l);
+	}
 	if (lines)
 		lines->l_prev = NULL;
+}
 /*
- * Print a number of newline/half newlines.  If fine flag is set, nblank_lines
+ * Print a number of newline/half newlines.
- * is the number of half line feeds, otherwise it is the number of whole line
+ * nblank_lines is the number of half line feeds.
  * feeds.
  */
 static void
 flush_blanks(void)
+{
 	int half, i, nb;
 	half = 0;
 	nb = nblank_lines;
 	if (nb & 1) {
 		if (fine)
 			half = 1;
 		else
 			nb++;
+	}
 	nb /= 2;
 	for (i = nb; --i >= 0;)
 		PUTC('\n');
 	if (half) {
-		PUTC('\033');
+		PUTC(ESC);
-		PUTC('\011');
+		PUTC(FHLF);
 		if (!nb)
 			PUTC('\r');
+	}
 	nblank_lines = 0;
+}
 /*
  * Write a line to stdout taking care of space to tab conversion (-h flag)
  * and character set shifts.
  */
 static void
 flush_line(LINE *l)
+{
 	CHAR *c, *endc;
-	int nchars, last_col, this_col;
+	int i, j, nchars, last_col, save, this_col, tot;
 	last_col = 0;
 	nchars = l->l_line_len;
 	if (l->l_needs_sort) {
 		static CHAR *sorted;
-		static int count_size, *count, i, save, sorted_size, tot;
+		static int count_size, *count, sorted_size;
 		/*
 		 * Do an O(n) sort on l->l_line by column being careful to
 		 * preserve the order of characters in the same column.
 		 */
 		if (l->l_lsize > sorted_size) {
 			sorted_size = l->l_lsize;
-			sorted = (CHAR *)xmalloc((void *)sorted,
+			if ((sorted = realloc(sorted,
-			    (unsigned)sizeof(CHAR) * sorted_size);
+			    sizeof(CHAR) * (size_t)sorted_size)) == NULL)
 				err(EXIT_FAILURE, NULL);
+		}
 		if (l->l_max_col >= count_size) {
 			count_size = l->l_max_col + 1;
-			count = (int *)xmalloc((void *)count,
+			if ((count = realloc(count,
-			    (unsigned)sizeof(int) * count_size);
+			    sizeof(int) * (size_t)count_size)) == NULL)
 				err(EXIT_FAILURE, NULL);
+		}
-		(void)memset(count, 0, sizeof(int) * l->l_max_col + 1);
+		memset(count, 0, sizeof(int) * (size_t)l->l_max_col + 1);
 		for (i = nchars, c = l->l_line; --i >= 0; c++)
 			count[c->c_column]++;
 		/*
 		 * calculate running total (shifted down by 1) to use as
 		 * indices into new line.
 		 */
 		for (tot = 0, i = 0; i <= l->l_max_col; i++) {
 			save = count[i];
 			count[i] = tot;
 			tot += save;
+		}
 		for (i = nchars, c = l->l_line; --i >= 0; c++)
 			sorted[count[c->c_column]++] = *c;
 		c = sorted;
 	} else
 		c = l->l_line;
 	while (nchars > 0) {
 		this_col = c->c_column;
 		endc = c;
 		do {
 			++endc;
 		} while (--nchars > 0 && this_col == endc->c_column);
 		/* if -b only print last character */
-		if (no_backspaces)
+		if (no_backspaces) {
 			c = endc - 1;
 			if (nchars > 0 &&
 			    this_col + c->c_width > endc->c_column)
 				continue;
+		}
 		if (this_col > last_col) {
 			int nspace = this_col - last_col;
 			if (compress_spaces && nspace > 1) {
-				int ntabs;
+				while (1) {
 					int tab_col, tab_size;
-				ntabs = ((last_col % 8) + nspace) / 8;
+					tab_col = (last_col + 8) & ~7;
-				if (ntabs) {
+					if (tab_col > this_col)
-					nspace -= (ntabs * 8) - (last_col % 8);
+						break;
-					while (--ntabs >= 0)
+					tab_size = tab_col - last_col;
 					if (tab_size == 1)
 						PUTC(' ');
 					else
 						PUTC('\t');
 					nspace -= tab_size;
 					last_col = tab_col;
+				}
+			}
 			while (--nspace >= 0)
 				PUTC(' ');
 			last_col = this_col;
+		}
 		last_col++;
 		for (;;) {
 			if (c->c_set != last_set) {
 				switch (c->c_set) {
 				case CS_NORMAL:
-					PUTC('\017');
+					PUTC(SI);
 					break;
 				case CS_ALTERNATE:
-					PUTC('\016');
+					PUTC(SO);
+				}
 				last_set = c->c_set;
+			}
 			PUTC(c->c_char);
 			if ((c + 1) < endc)
 				for (j = 0; j < c->c_width; j++)
 					PUTC('\b');
 			if (++c >= endc)
 				break;
 			PUTC('\b');
+		}
 		last_col += (c - 1)->c_width;
+	}
+}
 /*
  * Increment or decrement a line number, checking for overflow.
  * Stop one below INT_MAX such that the adjust variable is safe.
  */
 void
 addto_lineno(int *lno, int offset)
+{
 	if (offset > 0) {
 		if (*lno >= INT_MAX - offset)
 			errx(EXIT_FAILURE, "too many lines");
 	} else {
 		if (*lno < INT_MIN - offset)
 			errx(EXIT_FAILURE, "too many reverse line feeds");
+	}
 	*lno += offset;
+}
 #define	NALLOC 64
 static LINE *line_freelist;
 static LINE *
 alloc_line(void)
+{
 	LINE *l;
 	int i;
 	if (!line_freelist) {
-		l = (LINE *)xmalloc(NULL, sizeof(LINE) * NALLOC);
+		if ((l = realloc(NULL, sizeof(LINE) * NALLOC)) == NULL)
 			err(EXIT_FAILURE, NULL);
 		line_freelist = l;
 		for (i = 1; i < NALLOC; i++, l++)
 			l->l_next = l + 1;
 		l->l_next = NULL;
+	}
 	l = line_freelist;
 	line_freelist = l->l_next;
-	(void)memset(l, 0, sizeof(LINE));
+	memset(l, 0, sizeof(LINE));
 	return (l);
+}
 static void
 free_line(LINE *l)
+{
 	l->l_next = line_freelist;
 	line_freelist = l;
+}
 static void *
 xmalloc(void *p, size_t size)
 	void *q;
 	if (!(q = (void *)realloc(p, size)))
 		err(EXIT_FAILURE, "realloc");
 	p = q;
 	return (p);
 static void
 usage(void)
+{
-	(void)fprintf(stderr, "usage: col [-bfpx] [-l nline]\n");
+	(void)fprintf(stderr, "Usage: %s [-bfhpx] [-l nline]\n", getprogname());
 	exit(EXIT_FAILURE);
 static void
 wrerr(void)
 	(void)fprintf(stderr, "col: write error.\n");
 	exit(EXIT_FAILURE);
+}
 static void
 dowarn(int line)
+{
 	warnx("warning: can't back up %s",
 		line < 0 ? "past first line" : "-- line already flushed");
+}

 @@ -1,6 +1,7 @@
-#	$NetBSD: Makefile,v 1.5 2009/04/14 22:15:18 lukem Exp $
+#	$NetBSD: Makefile,v 1.6 2020/11/01 22:27:15 christos Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 WARNS=6
 PROG=	col
 .include <bsd.prog.mk>