Dr. Werner Fink 2013-10-28 09:58:06 +00:00 committed by Git OBS Bridge
parent ec95268c82
commit 1521b041d6

View File

@ -1008,7 +1008,7 @@
sh_onstate(SH_NOLOG); sh_onstate(SH_NOLOG);
@@ -876,7 +878,7 @@ Pathcomp_t *path_absolute(Shell_t *shp,r @@ -876,7 +878,7 @@ Pathcomp_t *path_absolute(Shell_t *shp,r
{ {
nv_onattr(nv_open(name,sh_subfuntree(shp,1),NV_NOARRAY|NV_IDENT|NV_NOSCOPE),NV_LTOU|NV_FUNCTION); nv_onattr(nv_open(name,sh_subfuntree(1),NV_NOARRAY|NV_IDENT|NV_NOSCOPE),NV_LTOU|NV_FUNCTION);
funload(shp,f,name); funload(shp,f,name);
- close(f); - close(f);
+ sh_close(f); + sh_close(f);
@ -1525,15 +1525,6 @@
dup(savein); dup(savein);
shp->cur_line = 0; shp->cur_line = 0;
} }
@@ -2751,7 +2787,7 @@ int sh_exec(register const Shnode_t *t,
}
if(rp->sdict)
{
- Namval_t *mp, *nq;
+ Namval_t *nq;
shp->last_root = rp->sdict;
for(mp=(Namval_t*)dtfirst(rp->sdict);mp;mp=nq)
{
@@ -2910,6 +2946,15 @@ int sh_exec(register const Shnode_t *t, @@ -2910,6 +2946,15 @@ int sh_exec(register const Shnode_t *t,
break; break;
} }