From 118ee5f944912f19db268d1d2d18fa70a3fd7d6f Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Fri, 30 Sep 2005 15:33:51 -0700
Subject: [PATCH] Fix up headers and bogus re-definitions to use <stdlib.h> and
 <string.h>

Hey, it's already compiling cleaner. Getting proper function declarations
will be a bitch, though.
---
 buffer.c  |  1 -
 display.c |  1 -
 edef.h    |  7 +++----
 eval.c    | 37 -------------------------------------
 line.c    |  1 -
 main.c    | 31 -------------------------------
 search.c  |  2 --
 window.c  |  1 -
 8 files changed, 3 insertions(+), 78 deletions(-)

diff --git a/buffer.c b/buffer.c
index 9607e2c..a035e8f 100644
--- a/buffer.c
+++ b/buffer.c
@@ -450,7 +450,6 @@ register char *bname;
 	register BUFFER *bp;
 	register BUFFER *sb;	/* buffer to insert after */
 	register LINE *lp;
-	char *malloc();
 
 	bp = bheadp;
 	while (bp != NULL) {
diff --git a/display.c b/display.c
index daf1fc4..a45cd07 100644
--- a/display.c
+++ b/display.c
@@ -56,7 +56,6 @@ vtinit()
 {
 	register int i;
 	register VIDEO *vp;
-	char *malloc();
 
 	TTopen();		/* open the screen */
 	TTkopen();		/* open the keyboard */
diff --git a/edef.h b/edef.h
index 65fff82..2effd8e 100644
--- a/edef.h
+++ b/edef.h
@@ -10,6 +10,9 @@
 
 /* some global fuction declarations */
 
+#include <stdlib.h>
+#include <string.h>
+
 char *flook();
 char *getctext();
 char *getfname();
@@ -19,12 +22,8 @@ char *gtfun();
 char *gtusr();
 char *itoa();
 char *ltos();
-char *malloc();
 char *mklower();
 char *mkupper();
-char *strcat();
-char *strcpy();
-char *strncpy();
 char *token();
 char *transbind();
 unsigned int getckey();
diff --git a/eval.c b/eval.c
index a5793b7..d063b68 100644
--- a/eval.c
+++ b/eval.c
@@ -660,43 +660,6 @@ char *value;			/* value to set to */
 	return (status);
 }
 
-/*	atoi:	ascii string to integer......This is too
-		inconsistant to use the system's	*/
-
-atoi(st)
-
-char *st;
-
-{
-	int result;		/* resulting number */
-	int sign;		/* sign of resulting number */
-	char c;			/* current char being examined */
-
-	result = 0;
-	sign = 1;
-
-	/* skip preceding whitespace */
-	while (*st == ' ' || *st == '\t')
-		++st;
-
-	/* check for sign */
-	if (*st == '-') {
-		sign = -1;
-		++st;
-	}
-	if (*st == '+')
-		++st;
-
-	/* scan digits, build value */
-	while ((c = *st++))
-		if (c >= '0' && c <= '9')
-			result = result * 10 + c - '0';
-		else
-			return (0);
-
-	return (result * sign);
-}
-
 /*	itoa:	integer to ascii string.......... This is too
 		inconsistant to use the system's	*/
 
diff --git a/line.c b/line.c
index 1481b2c..e7ca1b6 100644
--- a/line.c
+++ b/line.c
@@ -33,7 +33,6 @@ register int used;
 {
 	register LINE *lp;
 	register int size;
-	char *malloc();
 
 	size = (used + NBLOCK - 1) & ~(NBLOCK - 1);
 	if (size == 0)		/* Assume that an empty */
diff --git a/main.c b/main.c
index f88daec..17fd216 100644
--- a/main.c
+++ b/main.c
@@ -118,7 +118,6 @@ char *argv[];			/* argument strings */
 	int cryptflag;		/* encrypting on the way in? */
 	char ekey[NPAT];	/* startup encryption key */
 #endif
-	char *strncpy();
 	extern *pathname[];	/* startup file path/name array */
 	int newc;
 #if	PKCODE
@@ -436,7 +435,6 @@ char bname[];
 {
 	register BUFFER *bp;
 	register WINDOW *wp;
-	char *malloc();
 
 	bp = bfind(bname, TRUE, 0);	/* First buffer         */
 	blistp = bfind("*List*", TRUE, BFINVS);	/* Buffer list buffer   */
@@ -733,35 +731,6 @@ unarg()
 
 /*****		Compiler specific Library functions	****/
 
-#if	MSDOS || PKCODE
-/*	strncpy:	copy a string...with length restrictions
-			ALWAYS null terminate
-*/
-
-char *strncpy(dst, src, maxlen)
-
-char *dst;			/* destination of copied string */
-char *src;			/* source */
-int maxlen;			/* maximum length */
-
-{
-	char *dptr;		/* ptr into dst */
-
-	dptr = dst;
-/*	while (*src && (maxlen-- > 0))
-		*dptr++ = *src++;	*/
-	while ((maxlen > 0) && *src) {
-		*dptr++ = *src++;
-		maxlen--;
-	}
-
-	*dptr = 0;		/* orig */
-/*	if (maxlen > 0)
-		*dptr = 0;		*/
-	return (dst);
-}
-#endif
-
 #if	RAMSIZE
 /*	These routines will allow me to track memory usage by placing
 	a layer on top of the standard system malloc() and free() calls.
diff --git a/search.c b/search.c
index 74435ba..914b8ab 100644
--- a/search.c
+++ b/search.c
@@ -1481,8 +1481,6 @@ BITMAP cclmap;
  */
 static BITMAP clearbits()
 {
-	char *malloc();
-
 	BITMAP cclstart, cclmap;
 	register int j;
 
diff --git a/window.c b/window.c
index e425948..7ed3775 100644
--- a/window.c
+++ b/window.c
@@ -326,7 +326,6 @@ int f, n;			/* default flag and numeric argument */
 	register int ntrd;
 	register WINDOW *wp1;
 	register WINDOW *wp2;
-	char *malloc();
 
 	if (curwp->w_ntrows < 3) {
 		mlwrite("Cannot split a %d line window", curwp->w_ntrows);