From f153e2fde097117a5a0c787f74aafa6670b08f11 Mon Sep 17 00:00:00 2001
From: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
Date: Mon, 3 Jun 2019 07:30:57 -0500
Subject: usr.bin/printf: make buildable

---
 usr.bin/printf/printf.c | 32 +-------------------------------
 1 file changed, 1 insertion(+), 31 deletions(-)

(limited to 'usr.bin/printf')

diff --git a/usr.bin/printf/printf.c b/usr.bin/printf/printf.c
index 4d88e7d..d89cafe 100644
--- a/usr.bin/printf/printf.c
+++ b/usr.bin/printf/printf.c
@@ -29,22 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#ifndef lint
-#if !defined(BUILTIN) && !defined(SHELL)
-__COPYRIGHT("@(#) Copyright (c) 1989, 1993\
- The Regents of the University of California.  All rights reserved.");
-#endif
-#endif
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)printf.c	8.2 (Berkeley) 3/22/95";
-#else
-__RCSID("$NetBSD: printf.c,v 1.48 2019/01/27 12:03:09 kre Exp $");
-#endif
-#endif /* not lint */
-
 #include <sys/types.h>
 
 #include <ctype.h>
@@ -56,6 +40,7 @@ __RCSID("$NetBSD: printf.c,v 1.48 2019/01/27 12:03:09 kre Exp $");
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <bsd/stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
@@ -85,15 +70,6 @@ static char	*b_fmt;
 static int	rval;
 static char  **gargv;
 
-#ifdef BUILTIN		/* csh builtin */
-#define main progprintf
-#endif
-
-#ifdef SHELL		/* sh (aka ash) builtin */
-#define main printfcmd
-#include "../../bin/sh/bltin/bltin.h"
-#endif /* SHELL */
-
 #define PF(f, func) { \
 	if (fieldwidth != -1) { \
 		if (precision != -1) \
@@ -118,10 +94,6 @@ static char  **gargv;
 		error = asprintf(cpp, f, func); \
 }
 
-#ifdef main
-int main(int, char *[]);
-#endif
-
 int
 main(int argc, char *argv[])
 {
@@ -132,9 +104,7 @@ main(int argc, char *argv[])
 	char ch;
 	int error, o;
 
-#if !defined(SHELL) && !defined(BUILTIN)
 	(void)setlocale (LC_ALL, "");
-#endif
 
 	rval = 0;	/* clear for builtin versions (avoid holdover) */
 
-- 
cgit v1.2.3-60-g2f50