22d3150: move remaining parts to st_restore

Krush206 · Jun 6, 2024 · 911ed6e · 911ed6e
1 parent d0167d4
commit 911ed6e
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/sh.c b/sh.c
@@ -1670,6 +1670,11 @@ st_restore(void *xst)
 
  xclose(SHIN);
 
+ if (insource == 2) {
+ xclose(fpipe);
+ fpipe = st->fpipe;
+ fdecl = st->fdecl;
+ }
  insource = st->insource;
  SHIN = st->SHIN;
  if (st->OLDSTD != -1)

diff --git a/sh.func.c b/sh.func.c
@@ -2732,7 +2732,7 @@ getYN(const char *prompt)
  return doit;
 }
 
-int fpipe;
+int fpipe = -1;
 Char *fdecl;
 
 void
@@ -2758,8 +2758,6 @@ dofunction(Char **v, struct command *c)
  stderror(ERR_NAME | ERR_FUNCALNUM);
  if ((varp = adrof1(Sgoal, &functions))) {
  static int l;
- int pvsav;
- Char *fsav;
 
  if (l == 100) {
  l = 0;
@@ -2768,16 +2766,13 @@ dofunction(Char **v, struct command *c)
  mypipe(pv);
  cleanup_push(&st, st_restore);
  st_save(&st, pv[0], 0, &fdecl, v);
- pvsav = fpipe;
+ st.fpipe = fpipe;
  fpipe = pv[1];
- fsav = fdecl;
+ st.fdecl = fdecl;
  fdecl = *varp->vec;
  l++;
  process(0);
  cleanup_until(&st);
- xclose(pv[1]);
- fpipe = pvsav;
- fdecl = fsav;
  l--;
 
  return;
@@ -2851,7 +2846,7 @@ dofunction(Char **v, struct command *c)
  cleanup_until(&aword);
  if (!func.len)
  return;
- func.s[--func.len] = 0;
+ Strbuf_terminate(&func);
  **(varvec = xcalloc(1, sizeof *varvec -
  (sizeof **varvec * 2))) =
  func.s;

diff --git a/sh.h b/sh.h
@@ -1294,6 +1294,8 @@ struct saved_state {
  int cantell;
  struct Bin B;
  int justpr;
+ int fpipe;
+ Char *fdecl;
 };
 
 #include "sh.decls.h"

diff --git a/sh.lex.c b/sh.lex.c
@@ -1717,7 +1717,7 @@ bgetc(void)
  buf = (int) feobp / BUFSIZE;
  balloc(buf);
  roomleft = BUFSIZE - off;
- if (fpipe) {
+ if (insource == 2) {
  if (!*fdecl)
  return CHAR_ERR;
  (void) xwrite(fpipe, fdecl++, (size_t) 1);