Date: Wed, 8 Dec 2010 22:13:27 +0000 (UTC) From: Jilles Tjoelker <jilles@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r216310 - head/usr.bin/printf Message-ID: <201012082213.oB8MDRMI016343@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201012082213.oB8MDRMI016343>