diff options
| author | jilles <jilles@FreeBSD.org> | 2010-12-08 22:13:27 +0000 |
|---|---|---|
| committer | jilles <jilles@FreeBSD.org> | 2010-12-08 22:13:27 +0000 |
| commit | 885e0c9379440717ddd5be9bd05997b4a21df13b (patch) | |
| tree | 17dc56a2ef06f0e22433da78a60be1e36d438c82 /usr.bin/printf | |
| parent | 6c063f9e37d17d062835952a9de633c93ffc7802 (diff) | |
| download | FreeBSD-src-885e0c9379440717ddd5be9bd05997b4a21df13b.zip FreeBSD-src-885e0c9379440717ddd5be9bd05997b4a21df13b.tar.gz | |
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.
Diffstat (limited to 'usr.bin/printf')
| -rw-r--r-- | usr.bin/printf/printf.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/usr.bin/printf/printf.c b/usr.bin/printf/printf.c index 4ac23c6..55cfcc8 100644 --- a/usr.bin/printf/printf.c +++ b/usr.bin/printf/printf.c @@ -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 |
