Changeset 1198 for trunk/src/kash/options.c

Timestamp:

Oct 6, 2007, 11:19:19 PM (18 years ago)

Author:

bird

Message:

moving globals into shinstance...

File:

• trunk/src/kash/options.c (modified) (26 diffs)

trunk/src/kash/options.c

@@ -66 +66 @@
 #endif
 #include "show.h"
-
-char *arg0;                     /* value of $0 */
-struct shparam shellparam;      /* current positional parameters */
-char **argptr;                  /* argument list for builtin commands */
-char *optionarg;                /* set by nextopt (like getopt) */
-char *optptr;                   /* used by nextopt */
-
-char *minusc;                   /* argument to -c option */
-
-
-STATIC void options(int);
-STATIC void minus_o(char *, int);
-STATIC void setoption(int, int);
-STATIC int getopts(char *, char *, char **, char ***, char **);
+#include "shinstance.h"
+
+//char *arg0;                   /* value of $0 */
+//struct shparam shellparam;    /* current positional parameters */
+//char **argptr;                        /* argument list for builtin commands */
+//char *optionarg;              /* set by nextopt (like getopt) */
+//char *optptr;                 /* used by nextopt */
+
+//char *minusc;                 /* argument to -c option */
+
+
+STATIC void options(shinstance *, int);
+STATIC void minus_o(shinstance *, char *, int);
+STATIC void setoption(shinstance *, int, int);
+STATIC int getopts(shinstance *, char *, char *, char **, char ***, char **);
 
 
@@ -87 +88 @@
 
 void
-procargs(int argc, char **argv)
+procargs(shinstance *psh, int argc, char **argv)
 {
         int i;
 
-        argptr = argv;
+        psh->argptr = argv;
         if (argc > 0)
-                argptr++;
+                psh->argptr++;
         for (i = 0; i < NOPTS; i++)
-                optlist[i].val = 2;
-        options(1);
-        if (*argptr == NULL && minusc == NULL)
-                sflag = 1;
-        if (iflag == 2 && sflag == 1 && isatty(0) && isatty(1))
-                iflag = 1;
-        if (mflag == 2)
-                mflag = iflag;
+                psh->optlist[i].val = 2;
+        options(psh, 1);
+        if (*psh->argptr == NULL && psh->minusc == NULL)
+                sflag(psh) = 1;
+        if (iflag(psh) == 2 && sflag(psh) == 1 && shfile_isatty(&psh->fdtab, 0) && shfile_isatty(&psh->fdtab, 1))
+                iflag(psh) = 1;
+        if (mflag(psh) == 2)
+                mflag(psh) = iflag(psh);
         for (i = 0; i < NOPTS; i++)
-                if (optlist[i].val == 2)
-                        optlist[i].val = 0;
+                if (psh->optlist[i].val == 2)
+                        psh->optlist[i].val = 0;
 #if DEBUG == 2
-        debug = 1;
-#endif
-        arg0 = argv[0];
-        if (sflag == 0 && minusc == NULL) {
-                commandname = argv[0];
-                arg0 = *argptr++;
-                setinputfile(arg0, 0);
-                commandname = arg0;
+        debug(psh) = 1;
+#endif
+        psh->arg0 = argv[0];
+        if (sflag(psh) == 0 && psh->minusc == NULL) {
+                psh->commandname = argv[0];
+                psh->arg0 = *psh->argptr++;
+                setinputfile(psh, psh->arg0, 0);
+                psh->commandname = psh->arg0;
         }
         /* POSIX 1003.2: first arg after -c cmd is $0, remainder $1... */
-        if (minusc != NULL) {
-                if (argptr == NULL || *argptr == NULL)
-                        error("Bad -c option");
-                minusc = *argptr++;
-                if (*argptr != 0)
-                        arg0 = *argptr++;
-        }
-
-        shellparam.p = argptr;
-        shellparam.reset = 1;
+        if (psh->minusc != NULL) {
+                if (psh->argptr == NULL || *psh->argptr == NULL)
+                        error(psh, "Bad -c option");
+                psh->minusc = *psh->argptr++;
+                if (*psh->argptr != 0)
+                        psh->arg0 = *psh->argptr++;
+        }
+
+        psh->shellparam.p = psh->argptr;
+        psh->shellparam.reset = 1;
         /* assert(shellparam.malloc == 0 && shellparam.nparam == 0); */
-        while (*argptr) {
-                shellparam.nparam++;
-                argptr++;
-        }
-        optschanged();
+        while (*psh->argptr) {
+                psh->shellparam.nparam++;
+                psh->argptr++;
+        }
+        optschanged(psh);
 }
 
 
 void
-optschanged(void)
-{
-        setinteractive(iflag);
+optschanged(shinstance *psh)
+{
+        setinteractive(psh, iflag(psh));
 #ifndef SMALL
-        histedit();
-#endif
-        setjobctl(mflag);
+        histedit(psh);
+#endif
+        setjobctl(psh, mflag(psh));
 }
 
@@ -152 +153 @@
 
 STATIC void
-options(int cmdline)
+options(shinstance *psh, int cmdline)
 {
         static char empty[] = "";
@@ -160 +161 @@
 
         if (cmdline)
-                minusc = NULL;
-        while ((p = *argptr) != NULL) {
-                argptr++;
+                psh->minusc = NULL;
+        while ((p = *psh->argptr) != NULL) {
+                psh->argptr++;
                 if ((c = *p++) == '-') {
                         val = 1;
@@ -169 +170 @@
                                         /* "-" means turn off -x and -v */
                                         if (p[0] == '\0')
-                                                xflag = vflag = 0;
+                                                xflag(psh) = vflag(psh) = 0;
                                         /* "--" means reset params */
-                                        else if (*argptr == NULL)
-                                                setparam(argptr);
+                                        else if (*psh->argptr == NULL)
+                                                setparam(psh, psh->argptr);
                                 }
                                 break;    /* "-" or  "--" terminates options */
@@ -179 +180 @@
                         val = 0;
                 } else {
-                        argptr--;
+                        psh->argptr--;
                         break;
                 }
@@ -185 +186 @@
                         if (c == 'c' && cmdline) {
                                 /* command is after shell args*/
-                                minusc = empty;
+                                psh->minusc = empty;
                         } else if (c == 'o') {
-                                minus_o(*argptr, val);
-                                if (*argptr)
-                                        argptr++;
+                                minus_o(psh, *psh->argptr, val);
+                                if (*psh->argptr)
+                                        psh->argptr++;
                         } else {
-                                setoption(c, val);
+                                setoption(psh, c, val);
                         }
                 }
@@ -198 +199 @@
 
 static void
-set_opt_val(int i, int val)
+set_opt_val(shinstance *psh, int i, int val)
 {
         int j;
         int flag;
 
-        if (val && (flag = optlist[i].opt_set)) {
+        if (val && (flag = psh->optlist[i].opt_set)) {
                 /* some options (eg vi/emacs) are mutually exclusive */
                 for (j = 0; j < NOPTS; j++)
-                    if (optlist[j].opt_set == flag)
-                        optlist[j].val = 0;
-        }
-        optlist[i].val = val;
+                    if (psh->optlist[j].opt_set == flag)
+                        psh->optlist[j].val = 0;
+        }
+        psh->optlist[i].val = val;
 #ifdef DEBUG
-        if (&optlist[i].val == &debug)
+        if (&psh->optlist[i].val == &debug(psh))
                 opentrace();
 #endif
@@ -217 +218 @@
 
 STATIC void
-minus_o(char *name, int val)
+minus_o(shinstance *psh, char *name, int val)
 {
         int i;
 
         if (name == NULL) {
-                out1str("Current option settings\n");
+                out1str(psh, "Current option settings\n");
                 for (i = 0; i < NOPTS; i++)
-                        out1fmt("%-16s%s\n", optlist[i].name,
-                                optlist[i].val ? "on" : "off");
+                        out1fmt(psh, "%-16s%s\n", psh->optlist[i].name,
+                                psh->optlist[i].val ? "on" : "off");
         } else {
                 for (i = 0; i < NOPTS; i++)
-                        if (equal(name, optlist[i].name)) {
-                                set_opt_val(i, val);
+                        if (equal(name, psh->optlist[i].name)) {
+                                set_opt_val(psh, i, val);
                                 return;
                         }
-                error("Illegal option -o %s", name);
+                error(psh, "Illegal option -o %s", name);
         }
 }
@@ -238 +239 @@
 
 STATIC void
-setoption(int flag, int val)
+setoption(shinstance *psh, int flag, int val)
 {
         int i;
 
         for (i = 0; i < NOPTS; i++)
-                if (optlist[i].letter == flag) {
-                        set_opt_val( i, val );
+                if (psh->optlist[i].letter == flag) {
+                        set_opt_val(psh, i, val );
                         return;
                 }
-        error("Illegal option -%c", flag);
+        error(psh, "Illegal option -%c", flag);
         /* NOTREACHED */
 }
@@ -259 +260 @@
         int i;
 
-        for (i = 0; optlist[i].name; i++)
-                optlist[i].val = 0;
-        optschanged();
+        for (i = 0; psh->optlist[i].name; i++)
+                psh->optlist[i].val = 0;
+        optschanged(psh);
 
 }
@@ -272 +273 @@
 
 void
-setparam(char **argv)
+setparam(shinstance *psh, char **argv)
 {
         char **newparam;
@@ -285 +286 @@
         }
         *ap = NULL;
-        freeparam(&shellparam);
-        shellparam.malloc = 1;
-        shellparam.nparam = nparam;
-        shellparam.p = newparam;
-        shellparam.optnext = NULL;
+        freeparam(&psh->shellparam);
+        psh->shellparam.malloc = 1;
+        psh->shellparam.nparam = nparam;
+        psh->shellparam.p = newparam;
+        psh->shellparam.optnext = NULL;
 }
 
@@ -316 +317 @@
 
 int
-shiftcmd(int argc, char **argv)
+shiftcmd(shinstance *psh, int argc, char **argv)
 {
         int n;
@@ -323 +324 @@
         n = 1;
         if (argc > 1)
-                n = number(argv[1]);
-        if (n > shellparam.nparam)
-                error("can't shift that many");
+                n = number(psh, argv[1]);
+        if (n > psh->shellparam.nparam)
+                error(psh, "can't shift that many");
         INTOFF;
-        shellparam.nparam -= n;
-        for (ap1 = shellparam.p ; --n >= 0 ; ap1++) {
-                if (shellparam.malloc)
+        psh->shellparam.nparam -= n;
+        for (ap1 = psh->shellparam.p ; --n >= 0 ; ap1++) {
+                if (psh->shellparam.malloc)
                         ckfree(*ap1);
         }
-        ap2 = shellparam.p;
+        ap2 = psh->shellparam.p;
         while ((*ap2++ = *ap1++) != NULL);
-        shellparam.optnext = NULL;
+        psh->shellparam.optnext = NULL;
         INTON;
         return 0;
@@ -346 +347 @@
 
 int
-setcmd(int argc, char **argv)
+setcmd(shinstance *psh, int argc, char **argv)
 {
         if (argc == 1)
-                return showvars(0, 0, 1);
+                return showvars(psh, 0, 0, 1);
         INTOFF;
-        options(0);
-        optschanged();
-        if (*argptr != NULL) {
-                setparam(argptr);
+        options(psh, 0);
+        optschanged(psh);
+        if (*psh->argptr != NULL) {
+                setparam(psh, psh->argptr);
         }
         INTON;
@@ -362 +363 @@
 
 void
-getoptsreset(value)
-        const char *value;
-{
-        if (number(value) == 1) {
-                shellparam.optnext = NULL;
-                shellparam.reset = 1;
+getoptsreset(shinstance *psh, const char *value)
+{
+        if (number(psh, value) == 1) {
+                psh->shellparam.optnext = NULL;
+                psh->shellparam.reset = 1;
         }
 }
@@ -379 +379 @@
 
 int
-getoptscmd(int argc, char **argv)
+getoptscmd(shinstance *psh, int argc, char **argv)
 {
         char **optbase;
 
         if (argc < 3)
-                error("usage: getopts optstring var [arg]");
+                error(psh, "usage: getopts optstring var [arg]");
         else if (argc == 3)
-                optbase = shellparam.p;
+                optbase = psh->shellparam.p;
         else
                 optbase = &argv[3];
 
-        if (shellparam.reset == 1) {
-                shellparam.optnext = optbase;
-                shellparam.optptr = NULL;
-                shellparam.reset = 0;
-        }
-
-        return getopts(argv[1], argv[2], optbase, &shellparam.optnext,
-                       &shellparam.optptr);
+        if (psh->shellparam.reset == 1) {
+                psh->shellparam.optnext = optbase;
+                psh->shellparam.optptr = NULL;
+                psh->shellparam.reset = 0;
+        }
+
+        return getopts(psh, argv[1], argv[2], optbase, &psh->shellparam.optnext,
+                       &psh->shellparam.optptr);
 }
 
 STATIC int
-getopts(char *optstr, char *optvar, char **optfirst, char ***optnext, char **optpptr)
+getopts(shinstance *psh, char *optstr, char *optvar, char **optfirst, char ***optnext, char **optpptr)
 {
         char *p, *q;
@@ -417 +417 @@
                 if (p == NULL || *p != '-' || *++p == '\0') {
 atend:
-                        ind = *optnext - optfirst + 1;
+                        ind = (int)(*optnext - optfirst + 1);
                         *optnext = NULL;
                         p = NULL;
@@ -434 +434 @@
                                 s[0] = c;
                                 s[1] = '\0';
-                                err |= setvarsafe("OPTARG", s, 0);
+                                err |= setvarsafe(psh, "OPTARG", s, 0);
                         } else {
-                                outfmt(&errout, "Illegal option -%c\n", c);
-                                (void) unsetvar("OPTARG", 0);
+                                outfmt(&psh->errout, "Illegal option -%c\n", c);
+                                (void) unsetvar(psh, "OPTARG", 0);
                         }
                         c = '?';
@@ -451 +451 @@
                                 s[0] = c;
                                 s[1] = '\0';
-                                err |= setvarsafe("OPTARG", s, 0);
+                                err |= setvarsafe(psh, "OPTARG", s, 0);
                                 c = ':';
                         } else {
-                                outfmt(&errout, "No arg for -%c option\n", c);
-                                (void) unsetvar("OPTARG", 0);
+                                outfmt(&psh->errout, "No arg for -%c option\n", c);
+                                (void) unsetvar(psh, "OPTARG", 0);
                                 c = '?';
                         }
@@ -463 +463 @@
                 if (p == **optnext)
                         (*optnext)++;
-                err |= setvarsafe("OPTARG", p, 0);
+                err |= setvarsafe(psh, "OPTARG", p, 0);
                 p = NULL;
         } else
-                err |= setvarsafe("OPTARG", "", 0);
-        ind = *optnext - optfirst + 1;
+                err |= setvarsafe(psh, "OPTARG", "", 0);
+        ind = (int)(*optnext - optfirst + 1);
         goto out;
 
@@ -477 +477 @@
         *optpptr = p;
         fmtstr(s, sizeof(s), "%d", ind);
-        err |= setvarsafe("OPTIND", s, VNOFUNC);
+        err |= setvarsafe(psh, "OPTIND", s, VNOFUNC);
         s[0] = c;
         s[1] = '\0';
-        err |= setvarsafe(optvar, s, 0);
+        err |= setvarsafe(psh, optvar, s, 0);
         if (err) {
                 *optnext = NULL;
                 *optpptr = NULL;
-                output_flushall();
-                exraise(EXERROR);
+                output_flushall(psh);
+                exraise(psh, EXERROR);
         }
         return done;
@@ -502 +502 @@
 
 int
-nextopt(const char *optstring)
+nextopt(shinstance *psh, const char *optstring)
 {
         char *p;
@@ -508 +508 @@
         char c;
 
-        if ((p = optptr) == NULL || *p == '\0') {
-                p = *argptr;
+        if ((p = psh->optptr) == NULL || *p == '\0') {
+                p = *psh->argptr;
                 if (p == NULL || *p != '-' || *++p == '\0')
                         return '\0';
-                argptr++;
+                psh->argptr++;
                 if (p[0] == '-' && p[1] == '\0')        /* check for "--" */
                         return '\0';
@@ -519 +519 @@
         for (q = optstring ; *q != c ; ) {
                 if (*q == '\0')
-                        error("Illegal option -%c", c);
+                        error(psh, "Illegal option -%c", c);
                 if (*++q == ':')
                         q++;
         }
         if (*++q == ':') {
-                if (*p == '\0' && (p = *argptr++) == NULL)
-                        error("No arg for -%c option", c);
-                optionarg = p;
+                if (*p == '\0' && (p = *psh->argptr++) == NULL)
+                        error(psh, "No arg for -%c option", c);
+                psh->optionarg = p;
                 p = NULL;
         }
-        optptr = p;
+        psh->optptr = p;
         return c;
 }