From owner-svn-src-all@FreeBSD.ORG  Tue Apr 21 17:44:46 2009
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 D2CDD1065688;
	Tue, 21 Apr 2009 17:44:46 +0000 (UTC)
	(envelope-from rdivacky@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C0FFE8FC28;
	Tue, 21 Apr 2009 17:44:46 +0000 (UTC)
	(envelope-from rdivacky@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3LHikIa017385;
	Tue, 21 Apr 2009 17:44:46 GMT
	(envelope-from rdivacky@svn.freebsd.org)
Received: (from rdivacky@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3LHikUF017384;
	Tue, 21 Apr 2009 17:44:46 GMT
	(envelope-from rdivacky@svn.freebsd.org)
Message-Id: <200904211744.n3LHikUF017384@svn.freebsd.org>
From: Roman Divacky <rdivacky@FreeBSD.org>
Date: Tue, 21 Apr 2009 17:44:46 +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: r191364 - head/usr.bin/ncal
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: Tue, 21 Apr 2009 17:44:47 -0000

Author: rdivacky
Date: Tue Apr 21 17:44:46 2009
New Revision: 191364
URL: http://svn.freebsd.org/changeset/base/191364

Log:
  Couple of changes based on feedback
  
  	o	Change mr/me to so/se [1].
  	o	Introduce a -h option to disable highlighting. [2]
  	o	Spell STDOUT_FILENO as such and pass NULL to tgetent()
  		to handle the case of unset TERM. [3]
  
  Suggested by:	naddy mips.inka.de (Christian Weisgerber) [1]
  Requested by:	danfe, deischen	[2]
  Suggested by:	jmallett	[3]
  Approved by:	ed (mentor)

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

Modified: head/usr.bin/ncal/ncal.c
==============================================================================
--- head/usr.bin/ncal/ncal.c	Tue Apr 21 17:08:02 2009	(r191363)
+++ head/usr.bin/ncal/ncal.c	Tue Apr 21 17:44:46 2009	(r191364)
@@ -209,12 +209,12 @@ main(int argc, char *argv[])
 
 	term_e = term_r = NULL;
 	today = 0;
-	if (isatty(1) && tgetent(tbuf, getenv("TERM")) == 1) {
+	if (isatty(STDOUT_FILENO) && tgetent(tbuf, NULL) == 1) {
 		date	dt;		/* handy date */
 
 		b = cbuf;
-		term_r = tgetstr("mr", &b);
-		term_e = tgetstr("me", &b);
+		term_r = tgetstr("so", &b);
+		term_e = tgetstr("se", &b);
 		t = time(NULL);
 		tm1 = localtime(&t);
 		dt.y = tm1->tm_year + 1900;
@@ -263,7 +263,7 @@ main(int argc, char *argv[])
 	if (flag_backward)
 		nswitchb = ndaysj(&ukswitch);
 
-	while ((ch = getopt(argc, argv, "Jejm:ops:wy")) != -1)
+	while ((ch = getopt(argc, argv, "Jehjm:ops:wy")) != -1)
 		switch (ch) {
 		case 'J':
 			if (flag_backward)
@@ -271,6 +271,9 @@ main(int argc, char *argv[])
 			nswitch = ndaysj(&never);
 			flag_julian_cal = 1;
 			break;
+		case 'h':
+			term_r = term_e = NULL;
+			break;
 		case 'e':
 			if (flag_backward)
 				usage();