mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-04 10:41:11 +02:00
Code Releases Activity

zsh-workers/7978

Browse source
This commit is contained in:
Tanaka Akira 1999-09-22 13:08:37 +00:00
parent fa7abedb5d
commit f98b1581a4
3 changed files with 34 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
Src/exec.c
View file

@ -1412,6 +1412,27 @@ addvars(LinkList l, int export)
}
}
/**/
void
setunderscore(char *str)
{
if (str && *str) {
int l = strlen(str) + 1;
if (l > underscorelen || l < (underscorelen >> 2)) {
zfree(underscore, underscorelen);
underscore = (char *) zalloc(underscorelen = l);
}
strcpy(underscore, str);
underscoreused = l;
} else {
zfree(underscore, underscorelen);
underscore = (char *) zalloc(underscorelen = 32);
*underscore = '\0';
underscoreused = 1;
}
}
/**/
static void
execcmd(Cmd cmd, int input, int output, int how, int last1)
@ -1629,21 +1650,8 @@ execcmd(Cmd cmd, int input, int output, int how, int last1)
text = NULL;
/* Set up special parameter $_ */
if (args && nonempty(args)) {
char *u = (char *) getdata(lastnode(args));
if (u) {
int ul = strlen(u);
if (ul >= underscorelen) {
zfree(underscore, underscorelen);
underscore = (char *) zalloc(underscorelen = ul + 32);
}
strcpy(underscore, u);
} else
*underscore = '\0';
} else
*underscore = '\0';
setunderscore((args && nonempty(args)) ? ((char *) getdata(lastnode(args))) : "");
/* Warn about "rm *" */
if (type == SIMPLE && interact && unset(RMSTARSILENT)
@ -3016,7 +3024,9 @@ void
runshfunc(List list, FuncWrap wrap, char *name)
{
int cont;
VARARR(char, ou, underscorelen);
VARARR(char, ou, underscoreused);
memcpy(ou, underscore, underscoreused);
while (wrap) {
wrap->module->wrapper++;
@ -3032,9 +3042,8 @@ runshfunc(List list, FuncWrap wrap, char *name)
wrap = wrap->next;
}
startparamscope();
strcpy(ou, underscore);
execlist(list, 1, 0);
strcpy(underscore, ou);
setunderscore(ou);
endparamscope();
}
@ -3233,7 +3242,7 @@ execrestore(void)
trapreturn = exstack->trapreturn;
noerrs = exstack->noerrs;
subsh_close = exstack->subsh_close;
strcpy(underscore, exstack->underscore);
setunderscore(exstack->underscore);
zsfree(exstack->underscore);
en = exstack->next;
free(exstack);

3
Src/init.c
View file

@ -43,7 +43,7 @@ int noexitct = 0;
char *underscore;
/**/
int underscorelen;
int underscorelen, underscoreused;
/* what level of sourcing we are at */
@ -625,6 +625,7 @@ setupvals(void)
wordchars = ztrdup(DEFAULT_WORDCHARS);
postedit = ztrdup("");
underscore = (char *) zalloc(underscorelen = 32);
underscoreused = 1;
*underscore = '\0';
zoptarg = ztrdup("");

13
Src/utils.c
View file

@ -752,14 +752,11 @@ checkmailpath(char **s)
fprintf(shout, "You have new mail.\n");
fflush(shout);
} else {
VARARR(char, usav, underscorelen);
int sl = strlen(*s);
VARARR(char, usav, underscoreused);
if (sl >= underscorelen) {
zfree(underscore, underscorelen);
underscore = (char *) zalloc(underscorelen = sl + 32);
}
strcpy(underscore, *s);
memcpy(usav, underscore, underscoreused);
setunderscore(*s);
HEAPALLOC {
u = dupstring(u);
if (! parsestr(u)) {
@ -769,7 +766,7 @@ checkmailpath(char **s)
fflush(shout);
}
} LASTALLOC;
strcpy(underscore, usav);
setunderscore(usav);
}
}
if (isset(MAILWARNING) && st.st_atime > st.st_mtime &&