From owner-svn-src-all@FreeBSD.ORG  Wed Dec  8 22:13:27 2010
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 5D8DC106566C;
	Wed,  8 Dec 2010 22:13:27 +0000 (UTC)
	(envelope-from jilles@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4D1238FC14;
	Wed,  8 Dec 2010 22:13:27 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oB8MDRx3016345;
	Wed, 8 Dec 2010 22:13:27 GMT (envelope-from jilles@svn.freebsd.org)
Received: (from jilles@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oB8MDRMI016343;
	Wed, 8 Dec 2010 22:13:27 GMT (envelope-from jilles@svn.freebsd.org)
Message-Id: <201012082213.oB8MDRMI016343@svn.freebsd.org>
From: Jilles Tjoelker <jilles@FreeBSD.org>
Date: Wed, 8 Dec 2010 22:13:27 +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: r216310 - head/usr.bin/printf
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, 08 Dec 2010 22:13:27 -0000

Author: jilles
Date: Wed Dec  8 22:13:27 2010
New Revision: 216310
URL: http://svn.freebsd.org/changeset/base/216310

Log:
  printf: Remove support for building as a csh builtin.
  
  The #define BUILTIN was for building as a csh (not tcsh) builtin.
  Given that csh was replaced by tcsh years ago there is no point in keeping
  this.
  
  The #define SHELL is for building as an sh builtin and is in active use.
  
  This commit does not change the /bin/sh and /usr/bin/printf binaries.

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

Modified: head/usr.bin/printf/printf.c
==============================================================================
--- head/usr.bin/printf/printf.c	Wed Dec  8 20:35:20 2010	(r216309)
+++ head/usr.bin/printf/printf.c	Wed Dec  8 22:13:27 2010	(r216310)
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#if !defined(BUILTIN) && !defined(SHELL)
+#ifndef SHELL
 #ifndef lint
 static char const copyright[] =
 "@(#) Copyright (c) 1989, 1993\n\
@@ -69,9 +69,7 @@ static const char rcsid[] =
 #define	warnx3(a, b, c)		warnx(a, b, c)
 #endif
 
-#ifndef BUILTIN
 #include <locale.h>
-#endif
 
 #define PF(f, func) do { \
 	char *b = NULL; \
@@ -105,17 +103,13 @@ static void	 usage(void);
 static char **gargv;
 
 int
-#ifdef BUILTIN
-progprintf(int argc, char *argv[])
-#else
 main(int argc, char *argv[])
-#endif
 {
 	size_t len;
 	int ch, chopped, end, rval;
 	char *format, *fmt, *start;
 
-#if !defined(BUILTIN) && !defined(SHELL)
+#ifndef SHELL
 	(void) setlocale(LC_NUMERIC, "");
 #endif
 #ifdef SHELL