mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-11-01 06:20:55 +01:00
Code Releases Activity

19218: extend 19216 to zle widgets

Browse source
This commit is contained in:
Peter Stephenson 2003-11-03 13:57:52 +00:00
parent d90e97e16a
commit a7b9b5f851
3 changed files with 19 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Src/exec.c
View file

@ -3436,17 +3436,22 @@ loadautofn(Shfunc shf, int fksh, int autol)
return shf;
}
/* execute a shell function */
/*
* execute a shell function
*
* If noreturnval is nonzero, then reset the current return
* value (lastval) to its value before the shell function
* was executed. However, in any case return the status value
* from the function (i.e. if noreturnval is not set, this
* will be the same as lastval).
*/
/**/
mod_export void
mod_export int
doshfunc(char *name, Eprog prog, LinkList doshargs, int flags, int noreturnval)
/* If noreturnval is nonzero, then reset the current return *
* value (lastval) to its value before the shell function *
* was executed. */
{
char **tab, **x, *oargv0;
int oldzoptind, oldlastval, oldoptcind, oldnumpipestats;
int oldzoptind, oldlastval, oldoptcind, oldnumpipestats, ret;
int *oldpipestats = NULL;
char saveopts[OPT_SIZE], *oldscriptname = scriptname, *fname = dupstring(name);
int obreaks;
@ -3577,6 +3582,7 @@ doshfunc(char *name, Eprog prog, LinkList doshargs, int flags, int noreturnval)
if (trapreturn < -1)
trapreturn++;
ret = lastval;
if (noreturnval) {
lastval = oldlastval;
numpipestats = oldnumpipestats;
@ -3599,6 +3605,8 @@ doshfunc(char *name, Eprog prog, LinkList doshargs, int flags, int noreturnval)
zexit(exit_pending >> 1, 0);
}
}
return ret;
}
/* This finally executes a shell function and any function wrappers *