mirror of
git://git.code.sf.net/p/zsh/code
synced 2026-01-07 22:11:15 +01:00
zsh-3.1.5-pws-2
This commit is contained in:
parent
a61dc2074a
commit
f13624e0f8
27 changed files with 852 additions and 375 deletions
22
Src/exec.c
22
Src/exec.c
|
|
@ -1004,11 +1004,12 @@ void
|
|||
untokenize(char *s)
|
||||
{
|
||||
for (; *s; s++)
|
||||
if (itok(*s))
|
||||
if (itok(*s)) {
|
||||
if (*s == Nularg)
|
||||
chuck(s--);
|
||||
else
|
||||
*s = ztokens[*s - Pound];
|
||||
}
|
||||
}
|
||||
|
||||
/* Open a file for writing redicection */
|
||||
|
|
@ -1923,22 +1924,8 @@ save_params(Cmd cmd, LinkList *restore_p, LinkList *remove_p)
|
|||
} else if (!(pm->flags & PM_READONLY) &&
|
||||
(unset(RESTRICTED) || !(pm->flags & PM_RESTRICTED))) {
|
||||
Param tpm = (Param) alloc(sizeof *tpm);
|
||||
|
||||
tpm->nam = s;
|
||||
tpm->flags = pm->flags;
|
||||
switch (PM_TYPE(pm->flags)) {
|
||||
case PM_SCALAR:
|
||||
tpm->u.str = ztrdup(pm->gets.cfn(pm));
|
||||
break;
|
||||
case PM_INTEGER:
|
||||
tpm->u.val = pm->gets.ifn(pm);
|
||||
break;
|
||||
case PM_ARRAY:
|
||||
PERMALLOC {
|
||||
tpm->u.arr = arrdup(pm->gets.afn(pm));
|
||||
} LASTALLOC;
|
||||
break;
|
||||
}
|
||||
copyparam(tpm, pm, 1);
|
||||
pm = tpm;
|
||||
}
|
||||
addlinknode(*remove_p, s);
|
||||
|
|
@ -1989,6 +1976,9 @@ restore_params(LinkList restorelist, LinkList removelist)
|
|||
case PM_ARRAY:
|
||||
tpm->sets.afn(tpm, pm->u.arr);
|
||||
break;
|
||||
case PM_HASHED:
|
||||
tpm->sets.hfn(tpm, pm->u.hash);
|
||||
break;
|
||||
}
|
||||
} else
|
||||
paramtab->addnode(paramtab, pm->nam, pm);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue