From c58aca035e2c61510b619368861598623eb95e52 Mon Sep 17 00:00:00 2001
From: steve <steve@FreeBSD.org>
Date: Sat, 14 Dec 1996 06:20:03 +0000
Subject: Merge in NetBSD mods and -Wall cleaning.

Obtained from: NetBSD, me
---
 bin/sh/bltin/bltin.h | 11 ++++++-----
 bin/sh/bltin/echo.c  |  5 +----
 2 files changed, 7 insertions(+), 9 deletions(-)

(limited to 'bin/sh/bltin')

diff --git a/bin/sh/bltin/bltin.h b/bin/sh/bltin/bltin.h
index 7745dac..ff79458 100644
--- a/bin/sh/bltin/bltin.h
+++ b/bin/sh/bltin/bltin.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)bltin.h	8.2 (Berkeley) 5/4/95
- *	$Id: bltin.h,v 1.4 1995/12/14 23:19:36 bde Exp $
+ *	$Id: bltin.h,v 1.5 1996/09/01 10:22:13 peter Exp $
  */
 
 /*
@@ -60,11 +60,12 @@
 #define fputs outstr
 #define fflush flushout
 #define INITARGS(argv)
-#define warnx(a, b, c) {						\
-	char buf[64];							\
-	(void)snprintf(buf, sizeof(buf), a, b, c);			\
-	error(buf);							\
+#define warnx(a, b, c) {				\
+	char buf[64];					\
+	(void)snprintf(buf, sizeof(buf), a, b, c);	\
+	error("%s", buf);				\
 }
+
 #else
 #undef NULL
 #include <stdio.h>
diff --git a/bin/sh/bltin/echo.c b/bin/sh/bltin/echo.c
index 7c6e0f1..1d78f14 100644
--- a/bin/sh/bltin/echo.c
+++ b/bin/sh/bltin/echo.c
@@ -34,16 +34,13 @@
  * SUCH DAMAGE.
  *
  *	@(#)echo.c	8.2 (Berkeley) 5/4/95
- *	$Id: echo.c,v 1.3 1995/08/23 05:31:06 pst Exp $
+ *	$Id: echo.c,v 1.4 1996/09/01 10:22:16 peter Exp $
  */
 
 /*
  * Echo command.
  */
 
-#ifdef main
-#undef main
-#endif
 #define main echocmd
 
 #include "bltin.h"
-- 
cgit v1.1