From 3d71dcf315f0eb0c363219aa04d2227cb3a3a8c7 Mon Sep 17 00:00:00 2001
From: jilles <jilles@FreeBSD.org>
Date: Sat, 19 Jan 2013 22:12:08 +0000
Subject: sh: Replace an mkinit use with an initialization.

---
 bin/sh/input.c | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'bin')

diff --git a/bin/sh/input.c b/bin/sh/input.c
index 2005a87..84580ad 100644
--- a/bin/sh/input.c
+++ b/bin/sh/input.c
@@ -64,7 +64,6 @@ __FBSDID("$FreeBSD$");
 
 #define EOF_NLEFT -99		/* value of parsenleft when EOF pushed back */
 
-MKINIT
 struct strpush {
 	struct strpush *prev;	/* preceding string on stack */
 	char *prevstring;
@@ -78,7 +77,6 @@ struct strpush {
  * contains information about the current file being read.
  */
 
-MKINIT
 struct parsefile {
 	struct parsefile *prev;	/* preceding file on stack */
 	int linno;		/* current line */
@@ -96,8 +94,11 @@ int plinno = 1;			/* input line number */
 int parsenleft;			/* copy of parsefile->nleft */
 MKINIT int parselleft;		/* copy of parsefile->lleft */
 char *parsenextc;		/* copy of parsefile->nextc */
-MKINIT struct parsefile basepf;	/* top level input file */
-char basebuf[BUFSIZ + 1];	/* buffer for top level input file */
+static char basebuf[BUFSIZ + 1];/* buffer for top level input file */
+static struct parsefile basepf = {	/* top level input file */
+	.nextc = basebuf,
+	.buf = basebuf
+};
 static struct parsefile *parsefile = &basepf;	/* current input file */
 int whichprompt;		/* 1 == PS1, 2 == PS2 */
 
@@ -111,12 +112,6 @@ static void popstring(void);
 INCLUDE "input.h"
 INCLUDE "error.h"
 
-MKINIT char basebuf[];
-
-INIT {
-	basepf.nextc = basepf.buf = basebuf;
-}
-
 RESET {
 	popallfiles();
 	parselleft = parsenleft = 0;	/* clear input buffer */
-- 
cgit v1.1