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

Timestamp:

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

Author:

bird

Message:

moving globals into shinstance...

File:

• trunk/src/kash/histedit.c (modified) (6 diffs)

trunk/src/kash/histedit.c

@@ -91 +91 @@
         FILE *el_err;
 
-#define editing (Eflag || Vflag)
-
-        if (iflag) {
+#define editing (Eflag(psh) || Vflag(psh))
+
+        if (iflag(psh)) {
                 if (!hist) {
                         /*
@@ -154 +154 @@
                 }
                 if (el) {
-                        if (Vflag)
+                        if (Vflag(psh))
                                 el_set(el, EL_EDITOR, "vi");
-                        else if (Eflag)
+                        else if (Eflag(psh))
                                 el_set(el, EL_EDITOR, "emacs");
                         el_set(el, EL_BIND, "^I",
-                            tabcomplete ? "rl-complete" : "ed-insert", NULL);
+                            tabcomplete(psh) ? "rl-complete" : "ed-insert", NULL);
                         el_source(el, NULL);
                 }
@@ -418 +418 @@
                                 }
 
-                                evalstring(strcpy(stalloc(strlen(s) + 1), s), 0);
+                                evalstring(strcpy(stalloc(psh, strlen(s) + 1), s), 0);
                                 if (displayhist && hist) {
                                         /*
@@ -440 +440 @@
 
                 fclose(efp);
-                editcmd = stalloc(strlen(editor) + strlen(editfile) + 2);
+                editcmd = stalloc(psh, strlen(editor) + strlen(editfile) + 2);
                 sprintf(editcmd, "%s %s", editor, editfile);
                 evalstring(editcmd, 0); /* XXX - should use no JC command */
@@ -461 +461 @@
         int plen = strlen(p);
 
-        STARTSTACKSTR(dest);
+        STARTSTACKSTR(psh, dest);
         while (*s) {
                 if (*s == *p && strncmp(s, p, plen) == 0) {
                         while (*r)
-                                STPUTC(*r++, dest);
+                                STPUTC(psh, *r++, dest);
                         s += plen;
                         *p = '\0';      /* so no more matches */
                 } else
-                        STPUTC(*s++, dest);
-        }
-        STACKSTRNUL(dest);
-        dest = grabstackstr(dest);
+                        STPUTC(psh, *s++, dest);
+        }
+        STACKSTRNUL(psh, dest);
+        dest = grabstackstr(psh, dest);
 
         return (dest);
@@ -537 +537 @@
 #else
 int
-histcmd(int argc, char **argv)
-{
-        error("not compiled with history support");
+histcmd(shinstance *psh, int argc, char **argv)
+{
+        error(psh, "not compiled with history support");
         /* NOTREACHED */
+        return -1;
 }
 int
-inputrc(int argc, char **argv)
-{
-        error("not compiled with history support");
+inputrc(shinstance *psh, int argc, char **argv)
+{
+        error(psh, "not compiled with history support");
         /* NOTREACHED */
-}
-#endif
+        return -1;
+}
+#endif