From dc5ae267ce304feffcb73e5e26bb4ed6149c8693 Mon Sep 17 00:00:00 2001
From: tg <tg@mirbsd.org>
Date: Thu, 28 Jun 2012 20:02:29 +0000
Subject: [PATCH] make tempvar() and vtemp global

---
 expr.c | 5 ++---
 sh.h   | 5 ++++-
 var.c  | 3 +--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/expr.c b/expr.c
index d77556e..d6042ef 100644
--- a/expr.c
+++ b/expr.c
@@ -23,7 +23,7 @@
 
 #include "sh.h"
 
-__RCSID("$MirOS: src/bin/mksh/expr.c,v 1.56 2012/03/31 17:52:33 tg Exp $");
+__RCSID("$MirOS: src/bin/mksh/expr.c,v 1.57 2012/06/28 20:02:27 tg Exp $");
 
 /* The order of these enums is constrained by the order of opinfo[] */
 enum token {
@@ -160,7 +160,6 @@ static struct tbl *evalexpr(Expr_state *, int);
 static void exprtoken(Expr_state *);
 static struct tbl *do_ppmm(Expr_state *, enum token, struct tbl *, bool);
 static void assign_check(Expr_state *, enum token, struct tbl *);
-static struct tbl *tempvar(void);
 static struct tbl *intvar(Expr_state *, struct tbl *);
 
 /*
@@ -641,7 +640,7 @@ assign_check(Expr_state *es, enum token op, struct tbl *vasn)
 		evalerr(es, ET_RDONLY, opinfo[(int)op].name);
 }
 
-static struct tbl *
+struct tbl *
 tempvar(void)
 {
 	struct tbl *vp;
diff --git a/sh.h b/sh.h
index 71f0610..b3812b8 100644
--- a/sh.h
+++ b/sh.h
@@ -157,7 +157,7 @@
 #endif
 
 #ifdef EXTERN
-__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.565 2012/06/28 20:01:00 tg Exp $");
+__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.566 2012/06/28 20:02:28 tg Exp $");
 #endif
 #define MKSH_VERSION "R40 2012/06/26"
 
@@ -1063,6 +1063,8 @@ struct tbl {
 	char name[4];
 };
 
+EXTERN struct tbl vtemp;
+
 /* common flag bits */
 #define ALLOC		BIT(0)	/* val.s has been allocated */
 #define DEFINED		BIT(1)	/* is defined in block */
@@ -1643,6 +1645,7 @@ size_t utf_ptradj(const char *);
 int utf_wcwidth(unsigned int);
 #endif
 int ksh_access(const char *, int);
+struct tbl *tempvar(void);
 /* funcs.c */
 int c_hash(const char **);
 int c_pwd(const char **);
diff --git a/var.c b/var.c
index 71efb4d..8cb603b 100644
--- a/var.c
+++ b/var.c
@@ -27,7 +27,7 @@
 #include <sys/sysctl.h>
 #endif
 
-__RCSID("$MirOS: src/bin/mksh/var.c,v 1.150 2012/06/25 16:31:18 tg Exp $");
+__RCSID("$MirOS: src/bin/mksh/var.c,v 1.151 2012/06/28 20:02:29 tg Exp $");
 
 /*-
  * Variables
@@ -39,7 +39,6 @@ __RCSID("$MirOS: src/bin/mksh/var.c,v 1.150 2012/06/25 16:31:18 tg Exp $");
  * if (flag&EXPORT), val.s contains "name=value" for E-Z exporting.
  */
 
-static struct tbl vtemp;
 static struct table specials;
 static uint32_t lcg_state = 5381;