Changeset 879 for trunk/src

Timestamp:

Apr 21, 2007, 8:33:35 AM (18 years ago)

Author:

bird

Message:

hacking...

Location:

trunk/src/ash-messup

Files:

• alias.h (modified) (1 diff)
• cd.h (modified) (1 diff)
• error.h (modified) (2 diffs)
• eval.h (modified) (2 diffs)
• exec.h (modified) (1 diff)
• expand.h (modified) (1 diff)
• init.h (modified) (1 diff)
• input.h (modified) (1 diff)
• jobs.h (modified) (1 diff)
• mail.h (modified) (1 diff)
• main.c (modified) (7 diffs)
• main.h (modified) (1 diff)
• memalloc.h (modified) (1 diff)
• miscbltin.h (modified) (1 diff)
• myhistedit.h (modified) (1 diff)
• options.h (modified) (3 diffs)
• output.h (modified) (1 diff)
• parser.h (modified) (1 diff)
• redir.h (modified) (1 diff)
• shinstance.c (added)
• shinstance.h (added)
• show.h (modified) (1 diff)
• shthread.h (added)
• shtypes.h (added)
• trap.h (modified) (1 diff)
• var.h (modified) (3 diffs)

trunk/src/ash-messup/alias.h

@@ -44 +44 @@
 };
 
-struct alias *lookupalias(char *, int);
-char *get_alias_text(char *);
-int aliascmd(int, char **);
-int unaliascmd(int, char **);
-void rmaliases(void);
+struct alias *lookupalias(struct shinstance *, char *, int);
+char *get_alias_text(struct shinstance *, char *);
+int aliascmd(struct shinstance *, int, char **);
+int unaliascmd(struct shinstance *, int, char **);
+void rmaliases(struct shinstance *);

trunk/src/ash-messup/cd.h

@@ -31 +31 @@
  */
 
-void    getpwd(int);
-int     cdcmd(int, char **);
-int     pwdcmd(int, char **);
+void    getpwd(struct shinstance *, int);
+int     cdcmd(struct shinstance *, int, char **);
+int     pwdcmd(struct shinstance *, int, char **);
 #ifdef PC_DRIVE_LETTERS
 #define IS_ROOT(path) (   *(path) == '/' \

trunk/src/ash-messup/error.h

@@ -62 +62 @@
 };
 
+/*
 extern struct jmploc *handler;
 extern int exception;
-extern int exerrno;     /* error for EXEXEC */
+extern int exerrno;*/   /* error for EXEXEC */
 
 /* exceptions */
@@ -80 +81 @@
  */
 
-extern volatile int suppressint;
-extern volatile int intpending;
+/*extern volatile int suppressint;
+extern volatile int intpending;*/
 
-#define INTOFF suppressint++
-#define INTON { if (--suppressint == 0 && intpending) onint(); }
-#define FORCEINTON {suppressint = 0; if (intpending) onint();}
-#define CLEAR_PENDING_INT intpending = 0
-#define int_pending() intpending
+#define INTOFF psh->suppressint++
+#define INTON { if (--psh->suppressint == 0 && psh->intpending) onint(psh); }
+#define FORCEINTON {suppressint = 0; if (psh->intpending) onint(psh);}
+#define CLEAR_PENDING_INT psh->intpending = 0
+#define int_pending() psh->intpending
 
-void exraise(int) __attribute__((__noreturn__));
-void onint(void);
-void error(const char *, ...) __attribute__((__noreturn__));
-void exerror(int, const char *, ...) __attribute__((__noreturn__));
-const char *errmsg(int, int);
+void exraise(struct shinstance *, int) __attribute__((__noreturn__));
+void onint(struct shinstance *);
+void error(struct shinstance *, const char *, ...) __attribute__((__noreturn__));
+void exerror(struct shinstance *, int, const char *, ...) __attribute__((__noreturn__));
+const char *errmsg(struct shinstance *, int, int);
 
-void sh_err(int, const char *, ...) __attribute__((__noreturn__));
-void sh_verr(int, const char *, va_list) __attribute__((__noreturn__));
-void sh_errx(int, const char *, ...) __attribute__((__noreturn__));
-void sh_verrx(int, const char *, va_list) __attribute__((__noreturn__));
-void sh_warn(const char *, ...);
-void sh_vwarn(const char *, va_list);
-void sh_warnx(const char *, ...);
-void sh_vwarnx(const char *, va_list);
+void sh_err(struct shinstance *, int, const char *, ...) __attribute__((__noreturn__));
+void sh_verr(struct shinstance *, int, const char *, va_list) __attribute__((__noreturn__));
+void sh_errx(struct shinstance *, int, const char *, ...) __attribute__((__noreturn__));
+void sh_verrx(struct shinstance *, int, const char *, va_list) __attribute__((__noreturn__));
+void sh_warn(struct shinstance *, const char *, ...);
+void sh_vwarn(struct shinstance *, const char *, va_list);
+void sh_warnx(struct shinstance *, const char *, ...);
+void sh_vwarnx(struct shinstance *, const char *, va_list);
 
-void sh_exit(int) __attribute__((__noreturn__));
+void sh_exit(struct shinstance *, int) __attribute__((__noreturn__));
 
 

trunk/src/ash-messup/eval.h

@@ -35 +35 @@
  */
 
-extern char *commandname;       /* currently executing command */
-extern int exitstatus;          /* exit status of last command */
-extern int back_exitstatus;     /* exit status of backquoted command */
-extern struct strlist *cmdenviron;  /* environment for builtin command */
+/*extern char *commandname;*/   /* currently executing command */
+/*extern int exitstatus;*/              /* exit status of last command */
+/*extern int back_exitstatus;*/ /* exit status of backquoted command */
+/*extern struct strlist *cmdenviron;*/  /* environment for builtin command */
 
 
@@ -48 +48 @@
 };
 
-void evalstring(char *, int);
+void evalstring(struct shinstance *, char *, int);
 union node;     /* BLETCH for ansi C */
-void evaltree(union node *, int);
-void evalbackcmd(union node *, struct backcmd *);
+void evaltree(struct shinstance *, union node *, int);
+void evalbackcmd(struct shinstance *, union node *, struct backcmd *);
 
 /* in_function returns nonzero if we are currently evaluating a function */
-#define in_function()   funcnest
-extern int funcnest;
-extern int evalskip;
+#define in_function()   psh->funcnest
+/*extern int funcnest;
+extern int evalskip;*/
 
 /* reasons for skipping commands (see comment on breakcmd routine) */

trunk/src/ash-messup/exec.h

@@ -60 +60 @@
 #define DO_ALTBLTIN     0x20    /* %builtin in alt. path */
 
-extern const char *pathopt;     /* set by padvance */
+/*extern const char *pathopt;*/ /* set by padvance */
 
-void shellexec(char **, char **, const char *, int, int)
+void shellexec(struct shinstance *, char **, char **, const char *, int, int)
     __attribute__((__noreturn__));
-char *padvance(const char **, const char *);
-int hashcmd(int, char **);
-void find_command(char *, struct cmdentry *, int, const char *);
-int (*find_builtin(char *))(int, char **);
-int (*find_splbltin(char *))(int, char **);
-void hashcd(void);
-void changepath(const char *);
-void deletefuncs(void);
-void getcmdentry(char *, struct cmdentry *);
-void addcmdentry(char *, struct cmdentry *);
-void defun(char *, union node *);
-int unsetfunc(char *);
-int typecmd(int, char **);
-void hash_special_builtins(void);
+char *padvance(struct shinstance *, const char **, const char *);
+int hashcmd(struct shinstance *, int, char **);
+void find_command(struct shinstance *, char *, struct cmdentry *, int, const char *);
+int (*find_builtin(struct shinstance *, char *))(struct shinstance *, int, char **);
+int (*find_splbltin(struct shinstance *, char *))(struct shinstance *, int, char **);
+void hashcd(struct shinstance *);
+void changepath(struct shinstance *, const char *);
+void deletefuncs(struct shinstance *);
+void getcmdentry(struct shinstance *, char *, struct cmdentry *);
+void addcmdentry(struct shinstance *, char *, struct cmdentry *);
+void defun(struct shinstance *, char *, union node *);
+int unsetfunc(struct shinstance *, char *);
+int typecmd(struct shinstance *, int, char **);
+void hash_special_builtins(struct shinstance *);

trunk/src/ash-messup/expand.h

@@ -58 +58 @@
 
 union node;
-void expandhere(union node *, int);
-void expandarg(union node *, struct arglist *, int);
-void expari(int);
-int patmatch(char *, char *, int);
-void rmescapes(char *);
-int casematch(union node *, char *);
-int wordexpcmd(int, char **);
+void expandhere(struct shinstance *, union node *, int);
+void expandarg(struct shinstance *, union node *, struct arglist *, int);
+void expari(struct shinstance *, int);
+int patmatch(struct shinstance *, char *, char *, int);
+void rmescapes(struct shinstance *, char *);
+int casematch(struct shinstance *, union node *, char *);
+int wordexpcmd(struct shinstance *, int, char **);
 
 /* From arith.y */

trunk/src/ash-messup/init.h

@@ -35 +35 @@
  */
 
-void init(void);
-void reset(void);
-void initshellproc(void);
+void init(struct shinstance *);
+void reset(struct shinstance *);
+void initshellproc(struct shinstance *);

trunk/src/ash-messup/input.h

@@ -47 +47 @@
 extern int init_editline;       /* 0 == not setup, 1 == OK, -1 == failed */
 
-char *pfgets(char *, int);
-int pgetc(void);
-int preadbuffer(void);
-void pungetc(void);
-void pushstring(char *, int, void *);
-void popstring(void);
-void setinputfile(const char *, int);
-void setinputfd(int, int);
-void setinputstring(char *, int);
-void popfile(void);
-void popallfiles(void);
-void closescript(int);
+char *pfgets(struct shinstance *, char *, int);
+int pgetc(struct shinstance *);
+int preadbuffer(struct shinstance *);
+void pungetc(struct shinstance *);
+void pushstring(struct shinstance *, char *, int, void *);
+void popstring(struct shinstance *);
+void setinputfile(struct shinstance *, const char *, int);
+void setinputfd(struct shinstance *, int, int);
+void setinputstring(struct shinstance *, char *, int);
+void popfile(struct shinstance *);
+void popallfiles(struct shinstance *);
+void closescript(struct shinstance *, int);
 
-#define pgetc_macro()   (--parsenleft >= 0? *parsenextc++ : preadbuffer())
+#define pgetc_macro()   (--psh->parsenleft >= 0? *psh->parsenextc++ : preadbuffer(psh))

trunk/src/ash-messup/jobs.h

@@ -83 +83 @@
 };
 
-extern pid_t backgndpid;        /* pid of last background process */
-extern int job_warning;         /* user was warned about stopped jobs */
+/*extern pid_t backgndpid;*/    /* pid of last background process */
+/*extern int job_warning;*/             /* user was warned about stopped jobs */
 
-void setjobctl(int);
-int fgcmd(int, char **);
-int bgcmd(int, char **);
-int jobscmd(int, char **);
-void showjobs(struct output *, int);
-int waitcmd(int, char **);
-int jobidcmd(int, char **);
-struct job *makejob(union node *, int);
-int forkshell(struct job *, union node *, int);
-void forkchild(struct job *, union node *, int, int);
-int forkparent(struct job *, union node *, int, pid_t);
-int waitforjob(struct job *);
-int stoppedjobs(void);
-void commandtext(struct procstat *, union node *);
-int getjobpgrp(const char *);
+void setjobctl(struct shinstance *, int);
+int fgcmd(struct shinstance *, int, char **);
+int bgcmd(struct shinstance *, int, char **);
+int jobscmd(struct shinstance *, int, char **);
+void showjobs(struct shinstance *, struct output *, int);
+int waitcmd(struct shinstance *, int, char **);
+int jobidcmd(struct shinstance *, int, char **);
+struct job *makejob(struct shinstance *, union node *, int);
+int forkshell(struct shinstance *, struct job *, union node *, int);
+void forkchild(struct shinstance *, struct job *, union node *, int, int);
+int forkparent(struct shinstance *, struct job *, union node *, int, pid_t);
+int waitforjob(struct shinstance *, struct job *);
+int stoppedjobs(struct shinstance *);
+void commandtext(struct shinstance *, struct procstat *, union node *);
+int getjobpgrp(struct shinstance *, const char *);
 
 #if ! JOBS
-#define setjobctl(on)   /* do nothing */
+#define setjobctl(psh, on)      /* do nothing */
 #endif

trunk/src/ash-messup/mail.h

@@ -35 +35 @@
  */
 
-void chkmail(int);
+void chkmail(struct shinstance *, int);

trunk/src/ash-messup/main.c

@@ -85 +85 @@
 STATIC union node *curcmd;
 STATIC union node *prevcmd;
-#if PROFILE
-short profile_buf[16384];
-extern int etext();
-#endif
 
 STATIC void read_profile(const char *);
@@ -105 +101 @@
 main(int argc, char **argv)
 {
+        shinstance *psh;
+
+        setlocale(LC_ALL, "");
+
+        /*
+         * Create the root shell instance.
+         */
+        psh = create_root_shell(NULL, argc, argv);
+        if (!psh)
+                return 2;
+        return shell_main(psh, argc);
+}       
+
+int 
+shell_main(shinstance *psh, int argc, char **argv)
+{
         struct jmploc jmploc;
         struct stackmark smark;
@@ -110 +122 @@
         char *shinit;
 
-        setlocale(LC_ALL, "");
-
-#if PROFILE
-        monitor(4, etext, profile_buf, sizeof profile_buf, 50);
-#endif
         state = 0;
         if (setjmp(jmploc.loc)) {
@@ -166 +173 @@
                         goto state4;
         }
-        handler = &jmploc;
+        psh->handler = &jmploc;
 #ifdef DEBUG
 #if DEBUG == 2
@@ -174 +181 @@
         trputs("Shell args:  ");  trargs(argv);
 #endif
-        rootpid = getpid();
-        rootshell = 1;
+        psh->rootpid = getpid();
+        psh->rootshell = 1;
 #ifdef _MSC_VER
     {
@@ -187 +194 @@
         if (argv[0] && argv[0][0] == '-') {
                 state = 1;
-                read_profile("/etc/profile");
+                read_profile(psh, "/etc/profile");
 state1:
                 state = 2;
-                read_profile(".profile");
+                read_profile(psh, ".profile");
         }
 state2:
         state = 3;
         if (getuid() == geteuid() && getgid() == getegid()) {
-                if ((shinit = lookupvar("ENV")) != NULL && *shinit != '\0') {
+                if ((shinit = lookupvar(psh, "ENV")) != NULL && *shinit != '\0') {
                         state = 3;
-                        read_profile(shinit);
+                        read_profile(psh, shinit);
                 }
         }
@@ -214 +221 @@
 
                 for (i = 0; i < SIGSSIZE; i++)
-                    setsignal(sigs[i], 0);
-        }
-
-        if (minusc)
-                evalstring(minusc, 0);
-
-        if (sflag || minusc == NULL) {
+                    setsignal(psh, sigs[i], 0);
+        }
+
+        if (psh->minusc)
+                evalstring(psh, psh->minusc, 0);
+
+        if (psh->sflag || minusc == NULL) {
 state4: /* XXX ??? - why isn't this before the "if" statement */
-                cmdloop(1);
-        }
-#if PROFILE
-        monitor(0);
-#endif
-        exitshell(exitstatus);
+                cmdloop(psh, 1);
+        }
+        exitshell(psh, psh->exitstatus);
         /* NOTREACHED */
 }

trunk/src/ash-messup/main.h

@@ -35 +35 @@
  */
 
-extern int rootpid;     /* pid of main shell */
-extern int rootshell;   /* true if we aren't a child of the main shell */
+/*extern int rootpid;*/ /* pid of main shell */
+/*extern int rootshell;*/       /* true if we aren't a child of the main shell */
 
-void readcmdfile(char *);
-void cmdloop(int);
-int dotcmd(int, char **);
-int exitcmd(int, char **);
+void readcmdfile(struct shinstance *, char *);
+void cmdloop(struct shinstance *, int);
+int dotcmd(struct shinstance *, int, char **);
+int exitcmd(struct shinstance *, int, char **);

trunk/src/ash-messup/memalloc.h

@@ -43 +43 @@
 
 
-extern char *stacknxt;
+/*extern char *stacknxt;
 extern int stacknleft;
 extern int sstrnleft;
-extern int herefd;
+extern int herefd;*/
 
 pointer ckmalloc(int);
 pointer ckrealloc(pointer, int);
 char *savestr(const char *);
-pointer stalloc(int);
-void stunalloc(pointer);
-void setstackmark(struct stackmark *);
-void popstackmark(struct stackmark *);
-void growstackblock(void);
-void grabstackblock(int);
-char *growstackstr(void);
-char *makestrspace(void);
-void ungrabstackstr(char *, char *);
+pointer stalloc(struct shinstance *, int);
+void stunalloc(struct shinstance *, pointer);
+void setstackmark(struct shinstance *, struct stackmark *);
+void popstackmark(struct shinstance *, struct stackmark *);
+void growstackblock(struct shinstance *);
+void grabstackblock(struct shinstance *, int);
+char *growstackstr(struct shinstance *);
+char *makestrspace(struct shinstance *);
+void ungrabstackstr(struct shinstance *, char *, char *);
 
 
 
-#define stackblock() stacknxt
-#define stackblocksize() stacknleft
-#define STARTSTACKSTR(p)        p = stackblock(), sstrnleft = stackblocksize()
-#define STPUTC(c, p)    (--sstrnleft >= 0? (*p++ = (c)) : (p = growstackstr(), *p++ = (c)))
-#define CHECKSTRSPACE(n, p)     { if (sstrnleft < n) p = makestrspace(); }
-#define USTPUTC(c, p)   (--sstrnleft, *p++ = (c))
-#define STACKSTRNUL(p)  (sstrnleft == 0? (p = growstackstr(), *p = '\0') : (*p = '\0'))
-#define STUNPUTC(p)     (++sstrnleft, --p)
+#define stackblock() psh->stacknxt
+#define stackblocksize() psh->stacknleft
+#define STARTSTACKSTR(p)        p = stackblock(), psh->sstrnleft = stackblocksize()
+#define STPUTC(c, p)    (--psh->sstrnleft >= 0? (*p++ = (c)) : (p = growstackstr(psh), *p++ = (c)))
+#define CHECKSTRSPACE(n, p)     { if (psh->sstrnleft < n) p = makestrspace(psh); }
+#define USTPUTC(c, p)   (--psh->sstrnleft, *p++ = (c))
+#define STACKSTRNUL(p)  (psh->sstrnleft == 0? (p = growstackstr(psh), *p = '\0') : (*p = '\0'))
+#define STUNPUTC(p)     (++psh->sstrnleft, --p)
 #define STTOPC(p)       p[-1]
-#define STADJUST(amount, p)     (p += (amount), sstrnleft -= (amount))
-#define grabstackstr(p) stalloc(stackblocksize() - sstrnleft)
+#define STADJUST(amount, p)     (p += (amount), psh->sstrnleft -= (amount))
+#define grabstackstr(p) stalloc(stackblocksize() - psh->sstrnleft)
 
 #define ckfree(p)       free((pointer)(p))

trunk/src/ash-messup/miscbltin.h

@@ -27 +27 @@
  */
 
-int readcmd(int, char **);
-int umaskcmd(int, char **);
-int ulimitcmd(int, char **);
+int readcmd(struct shinstance *, int, char **);
+int umaskcmd(struct shinstance *, int, char **);
+int ulimitcmd(struct shinstance *, int, char **);

trunk/src/ash-messup/myhistedit.h

@@ -35 +35 @@
 #include <histedit.h>
 
-extern History *hist;
-extern EditLine *el;
+/*extern History *hist;
+extern EditLine *el;*/
 #endif
-extern int displayhist;
+/*extern int displayhist;*/
 
-void histedit(void);
-void sethistsize(const char *);
-void setterm(const char *);
-int histcmd(int, char **);
-int inputrc(int, char **);
-int not_fcnumber(char *);
-int str_to_event(const char *, int);
+void histedit(struct shinstance *);
+void sethistsize(struct shinstance *, const char *);
+void setterm(struct shinstance *, const char *);
+int histcmd(struct shinstance *, int, char **);
+int inputrc(struct shinstance *, int, char **);
+int not_fcnumber(struct shinstance *, char *);
+int str_to_event(struct shinstance *, const char *, int);
 

trunk/src/ash-messup/options.h

@@ -54 +54 @@
 /* Those marked [U] are required by posix, but have no effect! */
 
+#ifdef DEBUG
+# define NOPTS 21
+#else
+# define NOPTS 20
+#endif 
+
 #ifdef DEFINE_OPTIONS
 #define DEF_OPTS(name, letter, opt_set) {name, letter, opt_set, 0},
-struct optent optlist[] = {
+const struct optent ro_optlist[NOPTS] = {
 #else
 #define DEF_OPTS(name, letter, opt_set)
@@ -63 +69 @@
 
 DEF_OPT( "errexit",     'e' )   /* exit on error */
-#define eflag optlist[0].val
+#define eflag psh->optlist[0].val
 DEF_OPT( "noglob",      'f' )   /* no pathname expansion */
-#define fflag optlist[1].val
+#define fflag psh->optlist[1].val
 DEF_OPT( "ignoreeof",   'I' )   /* do not exit on EOF */
-#define Iflag optlist[2].val
+#define Iflag psh->optlist[2].val
 DEF_OPT( "interactive",'i' )    /* interactive shell */
-#define iflag optlist[3].val
+#define iflag psh->optlist[3].val
 DEF_OPT( "monitor",     'm' )   /* job control */
-#define mflag optlist[4].val
+#define mflag psh->optlist[4].val
 DEF_OPT( "noexec",      'n' )   /* [U] do not exec commands */
-#define nflag optlist[5].val
+#define nflag psh->optlist[5].val
 DEF_OPT( "stdin",       's' )   /* read from stdin */
-#define sflag optlist[6].val
+#define sflag psh->optlist[6].val
 DEF_OPT( "xtrace",      'x' )   /* trace after expansion */
-#define xflag optlist[7].val
+#define xflag psh->optlist[7].val
 DEF_OPT( "verbose",     'v' )   /* trace read input */
-#define vflag optlist[8].val
+#define vflag psh->optlist[8].val
 DEF_OPTS( "vi",         'V', 'V' )      /* vi style editing */
-#define Vflag optlist[9].val
+#define Vflag psh->optlist[9].val
 DEF_OPTS( "emacs",      'E', 'V' )      /* emacs style editing */
-#define Eflag optlist[10].val
+#define Eflag psh->optlist[10].val
 DEF_OPT( "noclobber",   'C' )   /* do not overwrite files with > */
-#define Cflag optlist[11].val
+#define Cflag psh->optlist[11].val
 DEF_OPT( "allexport",   'a' )   /* export all variables */
-#define aflag optlist[12].val
+#define aflag psh->optlist[12].val
 DEF_OPT( "notify",      'b' )   /* [U] report completion of background jobs */
-#define bflag optlist[13].val
+#define bflag psh->optlist[13].val
 DEF_OPT( "nounset",     'u' )   /* error expansion of unset variables */
-#define uflag optlist[14].val
+#define uflag psh->optlist[14].val
 DEF_OPT( "quietprofile", 'q' )
-#define qflag optlist[15].val
+#define qflag psh->optlist[15].val
 DEF_OPT( "nolog",       0 )     /* [U] no functon defs in command history */
-#define nolog optlist[16].val
+#define nolog psh->optlist[16].val
 DEF_OPT( "cdprint",     0 )     /* always print result of cd */
-#define cdprint optlist[17].val
+#define cdprint psh->optlist[17].val
 DEF_OPT( "tabcomplete", 0 )     /* <tab> causes filename expansion */
-#define tabcomplete optlist[18].val
+#define tabcomplete psh->optlist[18].val
 #ifdef DEBUG
 DEF_OPT( "debug",       0 )     /* enable debug prints */
-#define debug optlist[19].val
+#define debug psh->optlist[19].val
 #endif
 
@@ -108 +114 @@
         { 0, 0, 0, 0 },
 };
-#define NOPTS (sizeof optlist / sizeof optlist[0] - 1)
-int sizeof_optlist = sizeof optlist;
 #else
-extern struct optent optlist[];
-extern int sizeof_optlist;
+extern const struct optent ro_optlist[];
 #endif
+#define sizeof_optlist (NOPTS * sizeof(struct optent))
 
 
-extern char *minusc;            /* argument to -c option */
-extern char *arg0;              /* $0 */
-extern struct shparam shellparam;  /* $@ */
-extern char **argptr;           /* argument list for builtin commands */
-extern char *optionarg;         /* set by nextopt */
-extern char *optptr;            /* used by nextopt */
+/*extern char *minusc;*/                /* argument to -c option */
+/*extern char *arg0;*/          /* $0 */
+/*extern struct shparam shellparam;*/  /* $@ */
+/*extern char **argptr;*/               /* argument list for builtin commands */
+/*extern char *optionarg;*/             /* set by nextopt */
+/*extern char *optptr;*/                /* used by nextopt */
 
-void procargs(int, char **);
-void optschanged(void);
-void setparam(char **);
-void freeparam(volatile struct shparam *);
-int shiftcmd(int, char **);
-int setcmd(int, char **);
-int getoptscmd(int, char **);
-int nextopt(const char *);
-void getoptsreset(const char *);
+void procargs(struct shinstance *, int, char **);
+void optschanged(struct shinstance *);
+void setparam(struct shinstance *, char **);
+void freeparam(struct shinstance *, volatile struct shparam *);
+int shiftcmd(struct shinstance *, int, char **);
+int setcmd(struct shinstance *, int, char **);
+int getoptscmd(struct shinstance *, int, char **);
+int nextopt(struct shinstance *, const char *);
+void getoptsreset(struct shinstance *, const char *);

trunk/src/ash-messup/output.h

@@ -46 +46 @@
         short fd;
         short flags;
+        struct shinstance *psh;
 };
 
-extern struct output output;
+/*extern struct output output;
 extern struct output errout;
 extern struct output memout;
 extern struct output *out1;
-extern struct output *out2;
+extern struct output *out2;*/
 
-void open_mem(char *, int, struct output *);
-void out1str(const char *);
-void out2str(const char *);
+void open_mem(struct shinstance *, char *, int, struct output *);
+void out1str(struct shinstance *, const char *);
+void out2str(struct shinstance *, const char *);
 void outstr(const char *, struct output *);
 void emptyoutbuf(struct output *);
-void output_flushall(void);
+void output_flushall(struct shinstance *);
 void flushout(struct output *);
-void freestdout(void);
+void freestdout(struct shinstance *);
 void outfmt(struct output *, const char *, ...)
+    __attribute__((__format__(__printf__,3,4)));
+void out1fmt(struct shinstance *, const char *, ...)
     __attribute__((__format__(__printf__,2,3)));
-void out1fmt(const char *, ...)
-    __attribute__((__format__(__printf__,1,2)));
-void dprintf(const char *, ...)
-    __attribute__((__format__(__printf__,1,2)));
-void fmtstr(char *, size_t, const char *, ...)
-    __attribute__((__format__(__printf__,3,4)));
+void dprintf(struct shinstance *, const char *, ...)
+    __attribute__((__format__(__printf__,2,3)));
+void fmtstr(struct shinstance *, char *, size_t, const char *, ...)
+    __attribute__((__format__(__printf__,4,5)));
 void doformat(struct output *, const char *, va_list);
 int xwrite(int, char *, int);
 int xioctl(int, unsigned long, char *);
 
-#define outc(c, file)   (--(file)->nleft < 0? (emptyoutbuf(file), *(file)->nextc++ = (c)) : (*(file)->nextc++ = (c)))
-#define out1c(c)        outc(c, out1);
-#define out2c(c)        outc(c, out2);
+#define outc(c, file)   (--(file)->nleft < 0? (emptyoutbuf(psh, file), *(file)->nextc++ = (c)) : (*(file)->nextc++ = (c)))
+#define out1c(c)        outc(c, psh->out1);
+#define out2c(c)        outc(c, psh->out2);
 
 #define OUTPUT_INCL

trunk/src/ash-messup/parser.h

@@ -72 +72 @@
  * happens to be handy.
  */
-extern int tokpushback;
-#define NEOF ((union node *)&tokpushback)
-extern int whichprompt;         /* 1 == PS1, 2 == PS2 */
+/*extern int tokpushback;*/
+#define NEOF ((union node *)&psh->tokpushback)
+/*extern int whichprompt;*/             /* 1 == PS1, 2 == PS2 */
 
 
-union node *parsecmd(int);
-void fixredir(union node *, const char *, int);
-int goodname(char *);
-const char *getprompt(void *);
+union node *parsecmd(struct shinstance *, int);
+void fixredir(struct shinstance *, union node *, const char *, int);
+int goodname(struct shinstance *, char *);
+const char *getprompt(struct shinstance *, void *);

trunk/src/ash-messup/redir.h

@@ -41 +41 @@
 
 union node;
-void redirect(union node *, int);
-void popredir(void);
-int fd0_redirected_p(void);
-void clearredir(int);
-int copyfd(int, int);
+void redirect(struct shinstance *, union node *, int);
+void popredir(struct shinstance *);
+int fd0_redirected_p(struct shinstance *);
+void clearredir(struct shinstance *, int);
+int copyfd(struct shinstance *, int, int);
 

trunk/src/ash-messup/show.h

@@ -35 +35 @@
 
 union node;
-void showtree(union node *);
-void trace(const char *, ...);
-void tracev(const char *, va_list);
-void trargs(char **);
+void showtree(struct shinstance *, union node *);
+void trace(struct shinstance *, const char *, ...);
+void tracev(struct shinstance *, const char *, va_list);
+void trargs(struct shinstance *, char **);
 #ifdef DEBUG
 void trputc(int);

trunk/src/ash-messup/trap.h

@@ -35 +35 @@
  */
 
-extern int pendingsigs;
+/*extern int pendingsigs;*/
 
-int trapcmd(int, char **);
-void clear_traps(int);
-long setsignal(int, int);
-void ignoresig(int, int);
-void onsig(int);
-void dotrap(void);
-void setinteractive(int);
-void exitshell(int) __attribute__((__noreturn__));
+int trapcmd(struct shinstance *, int, char **);
+void clear_traps(struct shinstance *, int);
+long setsignal(struct shinstance *, int, int);
+void ignoresig(struct shinstance *, int, int);
+void onsig(struct shinstance *, int);
+void dotrap(struct shinstance *, void);
+void setinteractive(struct shinstance *, int);
+void exitshell(struct shinstance *, int) __attribute__((__noreturn__));

trunk/src/ash-messup/var.h

@@ -71 +71 @@
 };
 
-
+/*
 struct localvar *localvars;
 
@@ -92 +92 @@
 extern struct var vhistsize;
 #endif
+*/
 
 /*
@@ -99 +100 @@
  */
 
-#define ifsval()        (vifs.text + 4)
-#define ifsset()        ((vifs.flags & VUNSET) == 0)
-#define mailval()       (vmail.text + 5)
-#define mpathval()      (vmpath.text + 9)
+#define ifsval()        (psh->vifs.text + 4)
+#define ifsset()        ((psh->vifs.flags & VUNSET) == 0)
+#define mailval()       (psh->vmail.text + 5)
+#define mpathval()      (psh->vmpath.text + 9)
 #ifdef _MSC_VER
-#define pathval()       (vpath.text[5] ? &vpath.text[5] : &vpath2.text[5])
+#define pathval()       (psh->vpath.text[5] ? &psh->vpath.text[5] : &psh->vpath2.text[5])
 #else
-#define pathval()       (vpath.text + 5)
+#define pathval()       (psh->vpath.text + 5)
 #endif
-#define ps1val()        (vps1.text + 4)
-#define ps2val()        (vps2.text + 4)
-#define ps4val()        (vps4.text + 4)
-#define optindval()     (voptind.text + 7)
+#define ps1val()        (psh->vps1.text + 4)
+#define ps2val()        (psh->vps2.text + 4)
+#define ps4val()        (psh->vps4.text + 4)
+#define optindval()     (psh->voptind.text + 7)
 #ifndef SMALL
-#define histsizeval()   (vhistsize.text + 9)
-#define termval()       (vterm.text + 5)
+#define histsizeval()   (psh->vhistsize.text + 9)
+#define termval()       (psh->vterm.text + 5)
 #endif
 
 #if ATTY
-#define attyset()       ((vatty.flags & VUNSET) == 0)
+#define attyset()       ((psh->vatty.flags & VUNSET) == 0)
 #endif
-#define mpathset()      ((vmpath.flags & VUNSET) == 0)
+#define mpathset()      ((psh->vmpath.flags & VUNSET) == 0)
 
-void initvar(void);
-void setvar(const char *, const char *, int);
-void setvareq(char *, int);
+void initvar(struct shinstance *);
+void setvar(struct shinstance *, const char *, const char *, int);
+void setvareq(struct shinstance *, char *, int);
 struct strlist;
-void listsetvar(struct strlist *, int);
-char *lookupvar(const char *);
-char *bltinlookup(const char *, int);
-char **environment(void);
-void shprocvar(void);
-int showvars(const char *, int, int);
-int exportcmd(int, char **);
-int localcmd(int, char **);
-void mklocal(const char *, int);
-void listmklocal(struct strlist *, int);
-void poplocalvars(void);
-int setvarcmd(int, char **);
-int unsetcmd(int, char **);
-int unsetvar(const char *, int);
-int setvarsafe(const char *, const char *, int);
-void print_quoted(const char *);
+void listsetvar(struct shinstance *, struct strlist *, int);
+char *lookupvar(struct shinstance *, const char *);
+char *bltinlookup(struct shinstance *, const char *, int);
+char **environment(struct shinstance *);
+void shprocvar(struct shinstance *);
+int showvars(struct shinstance *, const char *, int, int);
+int exportcmd(struct shinstance *, int, char **);
+int localcmd(struct shinstance *, int, char **);
+void mklocal(struct shinstance *, const char *, int);
+void listmklocal(struct shinstance *, struct strlist *, int);
+void poplocalvars(struct shinstance *);
+int setvarcmd(struct shinstance *, int, char **);
+int unsetcmd(struct shinstance *, int, char **);
+int unsetvar(struct shinstance *, const char *, int);
+int setvarsafe(struct shinstance *, const char *, const char *, int);
+void print_quoted(struct shinstance *, const char *);