|
 |
503c26 |
diff -up ksh-20120801/src/cmd/ksh93/sh/array.c.memlik ksh-20120801/src/cmd/ksh93/sh/array.c
|
|
|
503c26 |
--- ksh-20120801/src/cmd/ksh93/sh/array.c.memlik 2012-06-07 00:00:42.000000000 +0200
|
|
|
503c26 |
+++ ksh-20120801/src/cmd/ksh93/sh/array.c 2013-06-11 16:52:47.557123973 +0200
|
|
|
503c26 |
@@ -1701,7 +1701,11 @@ void *nv_associative(register Namval_t *
|
|
|
503c26 |
ap->header.scope = 0;
|
|
|
503c26 |
}
|
|
|
503c26 |
else
|
|
|
503c26 |
- dtclose(ap->header.table);
|
|
|
503c26 |
+ {
|
|
|
503c26 |
+ if((ap->header.nelem&ARRAY_MASK)==0 && (ap->cur=nv_search("0",ap->header.table,0)))
|
|
|
503c26 |
+ nv_associative(np,(char*)0,NV_ADELETE);
|
|
|
503c26 |
+ dtclose(ap->header.table);
|
|
|
503c26 |
+ }
|
|
|
503c26 |
return((void*)ap);
|
|
|
503c26 |
case NV_ANEXT:
|
|
|
503c26 |
if(!ap->pos)
|
|
|
503c26 |
diff -up ksh-20120801/src/cmd/ksh93/sh/name.c.memlik ksh-20120801/src/cmd/ksh93/sh/name.c
|
|
|
503c26 |
--- ksh-20120801/src/cmd/ksh93/sh/name.c.memlik 2012-07-23 18:21:57.000000000 +0200
|
|
|
503c26 |
+++ ksh-20120801/src/cmd/ksh93/sh/name.c 2013-06-11 16:19:41.036648218 +0200
|
|
|
503c26 |
@@ -2465,6 +2465,8 @@ static void table_unset(Shell_t *shp, re
|
|
|
503c26 |
}
|
|
|
503c26 |
}
|
|
|
503c26 |
npnext = (Namval_t*)dtnext(root,np);
|
|
|
503c26 |
+ if(nv_arrayptr(np))
|
|
|
503c26 |
+ nv_putsub(np,NIL(char*),ARRAY_SCAN);
|
|
|
503c26 |
_nv_unset(np,flags);
|
|
|
503c26 |
nv_delete(np,root,0);
|
|
|
503c26 |
}
|
|
|
503c26 |
@@ -3326,7 +3328,7 @@ int nv_rename(register Namval_t *np, int
|
|
|
503c26 |
shp->last_root = last_root;
|
|
|
503c26 |
if(flags&NV_MOVE)
|
|
|
503c26 |
{
|
|
|
503c26 |
- if(arraynp && !nv_isattr(np,NV_MINIMAL) && (mp=(Namval_t*)np->nvenv) && (ap=nv_arrayptr(mp)))
|
|
|
503c26 |
+ if(arraynp && !nv_isattr(np,NV_MINIMAL) && (mp=(Namval_t*)np->nvenv) && (ap=nv_arrayptr(mp)) && !ap->fun)
|
|
|
503c26 |
ap->nelem++;
|
|
|
503c26 |
}
|
|
|
503c26 |
if((nv_arrayptr(nr) && !arraynr) || nv_isvtree(nr))
|