svn commit: r224639 - head/usr.bin/catman

[Ulrich Spoerlein]

Author: uqs
Date: Wed Aug  3 19:26:57 2011
New Revision: 224639
URL: http://svn.freebsd.org/changeset/base/224639

Log:
  Unbreak catman(1) by removing calls to col(1).
  
  col(1) was mangling the SGR escapes and is not strictly required.
  
  See r222647, r222648, r222650, and r222653 for more details.
  
  Reported by:	delphij
  Reviewed by:	ru
  Approved by:	re (kib)
  MFC after:	3 weeks

Modified:
  head/usr.bin/catman/catman.c

Modified: head/usr.bin/catman/catman.c
==============================================================================
--- head/usr.bin/catman/catman.c	Wed Aug  3 19:14:22 2011	(r224638)
+++ head/usr.bin/catman/catman.c	Wed Aug  3 19:26:57 2011	(r224639)
@@ -432,7 +432,7 @@ process_page(char *mandir, char *src, ch
 	}
 	snprintf(tmp_file, sizeof tmp_file, "%s.tmp", cat);
 	snprintf(cmd, sizeof cmd,
-	    "%scat %s | tbl | nroff -T%s -man | col | %s > %s.tmp",
+	    "%scat %s | tbl | nroff -T%s -man | %s > %s.tmp",
 	    zipped == BZIP ? BZ2CAT_CMD : zipped == GZIP ? GZCAT_CMD : "",
 	    src, nroff_device,
 	    zipped == BZIP ? BZ2_CMD : zipped == GZIP ? GZ_CMD : "cat",