From owner-svn-src-all@FreeBSD.ORG  Wed Aug  3 19:26:57 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id ADEC1106566C;
	Wed,  3 Aug 2011 19:26:57 +0000 (UTC) (envelope-from uqs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9FC0F8FC15;
	Wed,  3 Aug 2011 19:26:57 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p73JQvLq026515;
	Wed, 3 Aug 2011 19:26:57 GMT (envelope-from uqs@svn.freebsd.org)
Received: (from uqs@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p73JQvwv026513;
	Wed, 3 Aug 2011 19:26:57 GMT (envelope-from uqs@svn.freebsd.org)
Message-Id: <201108031926.p73JQvwv026513@svn.freebsd.org>
From: Ulrich Spoerlein <uqs@FreeBSD.org>
Date: Wed, 3 Aug 2011 19:26:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r224639 - head/usr.bin/catman
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Aug 2011 19:26:57 -0000

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",