Prefer srcfile() over dosource()

sh.c

@@ -142,11 +142,6 @@ struct saved_state {
 };
 
 static int srccat (Char *, Char *);
-#ifndef WINNT_NATIVE
-static int srcfile (const char *, int, int, Char **);
-#else
-int srcfile (const char *, int, int, Char **);
-#endif /*WINNT_NATIVE*/
 static void srcunit (int, int, int, Char **);
 static void mailchk (void);
 #ifndef _PATH_DEFPATH
@@ -1544,11 +1539,7 @@ srccat(Char *cp, Char *dp)
 /*
  * Source to a file putting the file descriptor in a safe place (> 2).
  */
-#ifndef WINNT_NATIVE
-static int
-#else
 int
-#endif /*WINNT_NATIVE*/
 srcfile(const char *f, int onlyown, int flag, Char **av)
 {
  int unit;
@@ -1779,7 +1770,7 @@ srcunit(int unit, int onlyown, int hflg, Char **av)
  Char funcexit[] = { 'e', 'x', 'i', 't', 0 },
  funcmain[] = { 'm', 'a', 'i', 'n', 0 };
  struct Strbuf aword = Strbuf_INIT;
- Sgoal = fargv->v[2];
+ Sgoal = fargv->v[0];
  Stype = TC_GOTO;
  fargv->eof = 0;
 
@@ -1817,8 +1808,8 @@ srcunit(int unit, int onlyown, int hflg, Char **av)
  (void) getword(NULL);
  }
 
- setq(STRargv, &fargv->v[3], &shvhed, VAR_READWRITE);
- dogoto(&fargv->v[1], fargv->t);
+ setq(STRargv, &fargv->v[1], &shvhed, VAR_READWRITE);
+ gotolab(fargv->v[0]);
 
  {
  struct Ain a;

sh.func.c

@@ -2732,44 +2732,38 @@ dofunction(Char **v, struct command *t)
  if (!dolzero)
  stderror(ERR_FUNC);
 
- {
- int i, j;
- Char **vh;
-
- for (i = 0; v[i]; i++)
- ;
+ if (fargv) {
+ fargv->next = malloc(sizeof *fargv);
+ fargv->next->prev = fargv;
+ fargv = fargv->next;
+ } else {
+ fargv = malloc(sizeof *fargv);
+ fargv->prev = NULL;
+ }
 
- vh = xmalloc(sizeof(Char [i + 2]));
- vh[i + 1] = NULL;
+ {
+ int i = 0;
+ Char **vh = NULL;
 
- for (j = i--; i; i--, j--) {
- vh[j] = xmalloc(sizeof(Char [Strlen(v[i]) + 1]));
- Strcpy(vh[j], v[i]);
- }
- vh[1] = xmalloc(sizeof (Char [Strlen(ffile) + 1]));
- Strcpy(vh[1], ffile);
- *vh = xmalloc(sizeof (Char [Strlen(*v) + 1]));
- Strcpy(*vh, *v);
-
- if (fargv) {
- fargv->next = malloc(sizeof *fargv);
- fargv->next->prev = fargv;
- fargv = fargv->next;
- } else {
- fargv = malloc(sizeof *fargv);
- fargv->prev = NULL;
+ for (v++; *v; v++, i++) {
+ vh = xrealloc(vh, sizeof(Char *[i + 2]));
+ vh[i] = xmalloc(sizeof(Char [Strlen(*v) + 1]));
+ Strcpy(vh[i], *v);
  }
 
- dosource(fargv->v = vh, fargv->t = t);
- /* Reset STRargv on function exit. */
- setv(STRargv, NULL, VAR_READWRITE);
+ vh[i] = NULL;
+ fargv->v = vh;
+ }
 
- if (fargv->prev) {
- fargv = fargv->prev;
- free(fargv->next);
- } else {
- free(fargv);
- fargv = NULL;
- }
+ srcfile(short2str(ffile), 0, 0, NULL);
+ /* Reset STRargv on function exit. */
+ setv(STRargv, NULL, VAR_READWRITE);
+
+ if (fargv->prev) {
+ fargv = fargv->prev;
+ free(fargv->next);
+ } else {
+ free(fargv);
+ fargv = NULL;
  }
 }

sh.h

@@ -1310,11 +1310,11 @@ extern Char *Sgoal;
 extern int Stype;
 extern struct funcargs {
  Char **v;
- struct command *t;
+ int eof;
  struct funcargs *prev,
  *next;
- int eof;
 } *fargv;
 extern int getword(struct Strbuf *);
+extern int srcfile(const char *, int, int, Char **);
 
 #endif /* _h_sh */