|
 |
ebf9b31 |
diff -up ksh-20120801/src/cmd/ksh93/include/name.h.memlik3 ksh-20120801/src/cmd/ksh93/include/name.h
|
|
|
ebf9b31 |
--- ksh-20120801/src/cmd/ksh93/include/name.h.memlik3 2012-05-10 18:33:41.000000000 +0200
|
|
|
ebf9b31 |
+++ ksh-20120801/src/cmd/ksh93/include/name.h 2014-01-22 14:14:32.774483776 +0100
|
|
|
ebf9b31 |
@@ -215,7 +215,7 @@ extern Namval_t *nv_mount(Namval_t*, co
|
|
|
ebf9b31 |
extern Namval_t *nv_arraychild(Namval_t*, Namval_t*, int);
|
|
|
ebf9b31 |
extern int nv_compare(Dt_t*, Void_t*, Void_t*, Dtdisc_t*);
|
|
|
ebf9b31 |
extern void nv_outnode(Namval_t*,Sfio_t*, int, int);
|
|
|
ebf9b31 |
-extern int nv_subsaved(Namval_t*);
|
|
|
ebf9b31 |
+extern int nv_subsaved(Namval_t*,int);
|
|
|
ebf9b31 |
extern void nv_typename(Namval_t*, Sfio_t*);
|
|
|
ebf9b31 |
extern void nv_newtype(Namval_t*);
|
|
|
ebf9b31 |
extern int nv_istable(Namval_t*);
|
|
|
ebf9b31 |
diff -up ksh-20120801/src/cmd/ksh93/sh/name.c.memlik3 ksh-20120801/src/cmd/ksh93/sh/name.c
|
|
|
ebf9b31 |
--- ksh-20120801/src/cmd/ksh93/sh/name.c.memlik3 2014-01-22 14:14:32.751483987 +0100
|
|
|
ebf9b31 |
+++ ksh-20120801/src/cmd/ksh93/sh/name.c 2014-01-22 14:14:32.775483767 +0100
|
|
|
ebf9b31 |
@@ -1297,7 +1297,7 @@ void nv_delete(Namval_t* np, Dt_t *root,
|
|
|
ebf9b31 |
{
|
|
|
ebf9b31 |
if(dtdelete(root,np))
|
|
|
ebf9b31 |
{
|
|
|
ebf9b31 |
- if(!(flags&NV_NOFREE) && ((flags&NV_FUNCTION) || !nv_subsaved(np)))
|
|
|
ebf9b31 |
+ if(!(flags&NV_NOFREE) && ((flags&NV_FUNCTION) || !nv_subsaved(np,flags&NV_TABLE)))
|
|
|
ebf9b31 |
free((void*)np);
|
|
|
ebf9b31 |
}
|
|
|
ebf9b31 |
#if 0
|
|
|
ebf9b31 |
@@ -2461,14 +2461,14 @@ static void table_unset(Shell_t *shp, re
|
|
|
ebf9b31 |
{
|
|
|
ebf9b31 |
_nv_unset(nq,flags);
|
|
|
ebf9b31 |
npnext = (Namval_t*)dtnext(root,nq);
|
|
|
ebf9b31 |
- nv_delete(nq,root,0);
|
|
|
ebf9b31 |
+ nv_delete(nq,root,NV_TABLE);
|
|
|
ebf9b31 |
}
|
|
|
ebf9b31 |
}
|
|
|
ebf9b31 |
npnext = (Namval_t*)dtnext(root,np);
|
|
|
ebf9b31 |
if(nv_arrayptr(np))
|
|
|
ebf9b31 |
nv_putsub(np,NIL(char*),ARRAY_SCAN);
|
|
|
ebf9b31 |
_nv_unset(np,flags);
|
|
|
ebf9b31 |
- nv_delete(np,root,0);
|
|
|
ebf9b31 |
+ nv_delete(np,root,NV_TABLE);
|
|
|
ebf9b31 |
}
|
|
|
ebf9b31 |
}
|
|
|
ebf9b31 |
|
|
|
ebf9b31 |
diff -up ksh-20120801/src/cmd/ksh93/sh/subshell.c.memlik3 ksh-20120801/src/cmd/ksh93/sh/subshell.c
|
|
|
ebf9b31 |
--- ksh-20120801/src/cmd/ksh93/sh/subshell.c.memlik3 2014-01-22 14:14:32.768483831 +0100
|
|
|
ebf9b31 |
+++ ksh-20120801/src/cmd/ksh93/sh/subshell.c 2014-01-22 14:20:50.810236676 +0100
|
|
|
ebf9b31 |
@@ -218,16 +218,28 @@ void sh_subfork(void)
|
|
|
ebf9b31 |
}
|
|
|
ebf9b31 |
}
|
|
|
ebf9b31 |
|
|
|
ebf9b31 |
-int nv_subsaved(register Namval_t *np)
|
|
|
ebf9b31 |
+int nv_subsaved(register Namval_t *np,int table)
|
|
|
ebf9b31 |
{
|
|
|
ebf9b31 |
register struct subshell *sp;
|
|
|
ebf9b31 |
- register struct Link *lp;
|
|
|
ebf9b31 |
+ register struct Link *lp, *lpprev;
|
|
|
ebf9b31 |
for(sp = (struct subshell*)subshell_data; sp; sp=sp->prev)
|
|
|
ebf9b31 |
{
|
|
|
ebf9b31 |
- for(lp=sp->svar; lp; lp = lp->next)
|
|
|
ebf9b31 |
+ lpprev = 0;
|
|
|
ebf9b31 |
+ for(lp=sp->svar; lp; lpprev=lp, lp=lp->next)
|
|
|
ebf9b31 |
{
|
|
|
ebf9b31 |
if(lp->node==np)
|
|
|
ebf9b31 |
+ {
|
|
|
ebf9b31 |
+ if(table&NV_TABLE)
|
|
|
ebf9b31 |
+ {
|
|
|
ebf9b31 |
+ if(lpprev)
|
|
|
ebf9b31 |
+ lpprev->next = lp->next;
|
|
|
ebf9b31 |
+ else
|
|
|
ebf9b31 |
+ sp->svar = lp->next;
|
|
|
ebf9b31 |
+ free((void*)np);
|
|
|
ebf9b31 |
+ free((void*)lp);
|
|
|
ebf9b31 |
+ }
|
|
|
ebf9b31 |
return(1);
|
|
|
ebf9b31 |
+ }
|
|
|
ebf9b31 |
}
|
|
|
ebf9b31 |
}
|
|
|
ebf9b31 |
return(0);
|