Merge of 4.4-Lite2 sh source, plus some gcc -Wall cleaning. This is a

merge of parallel duplicate work by Steve Price and myself. :-]

There are some changes to the build that are my fault...  mkinit.c was
trying (poorly) to duplicate some of the work that make(1) is designed to
do.  The Makefile hackery is my fault too, the depend list was incomplete
because of some explicit OBJS+= entries, so mkdep wasn't picking up their
source file #includes.

This closes a pile of /bin/sh PR's, but not all of them..

Submitted by: Steve Price <steve@bonsai.hiwaay.net>, peter

1 files changed, 23 insertions, 12 deletions

diff --git a/bin/sh/output.c b/bin/sh/output.c
index 914df67eb387..a52cea9f8747 100644
--- a/bin/sh/output.c
+++ b/bin/sh/output.c
@@ -33,11 +33,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: output.c,v 1.2 1994/09/24 02:58:06 davidg Exp $
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)output.c	8.1 (Berkeley) 5/31/93";
+static char sccsid[] = "@(#)output.c	8.2 (Berkeley) 5/4/95";
 #endif /* not lint */
 
 /*
@@ -51,18 +51,24 @@ static char sccsid[] = "@(#)output.c	8.1 (Berkeley) 5/31/93";
  *	Our output routines may be smaller than the stdio routines.
  */
 
+#include <sys/ioctl.h>
+
 #include <stdio.h>	/* defines BUFSIZ */
-#include "shell.h"
-#include "syntax.h"
-#include "output.h"
-#include "memalloc.h"
-#include "error.h"
+#include <string.h>
 #ifdef __STDC__
-#include "stdarg.h"
+#include <stdarg.h>
 #else
 #include <varargs.h>
 #endif
 #include <errno.h>
+#include <unistd.h>
+#include <stdlib.h>
+
+#include "shell.h"
+#include "syntax.h"
+#include "output.h"
+#include "memalloc.h"
+#include "error.h"
 
 
 #define OUTBUFSIZ BUFSIZ
@@ -117,7 +123,7 @@ open_mem(block, length, file)
 
 void
 out1str(p)
-	char *p;
+	const char *p;
 	{
 	outstr(p, out1);
 }
@@ -125,7 +131,7 @@ out1str(p)
 
 void
 out2str(p)
-	char *p;
+	const char *p;
 	{
 	outstr(p, out2);
 }
@@ -133,7 +139,7 @@ out2str(p)
 
 void
 outstr(p, file)
-	register char *p;
+	register const char *p;
 	register struct output *file;
 	{
 	while (*p)
@@ -545,10 +551,15 @@ xwrite(fd, buf, nbytes)
 
 /*
  * Version of ioctl that retries after a signal is caught.
+ * XXX unused function
  */
 
 int
-xioctl(fd, request, arg) {
+xioctl(fd, request, arg) 
+	int fd;
+	unsigned long request;
+	char * arg;
+{
 	int i;
 
 	while ((i = ioctl(fd, request, arg)) == -1 && errno == EINTR);