Dr. Werner Fink 2012-02-21 13:53:32 +00:00 committed by Git OBS Bridge
parent b4455b8398
commit 674977cbdf

View File

@ -510,9 +510,19 @@
chmodf = lchmod;
goto commit;
#else
--- src/lib/libcmd/vmstate.c
+++ src/lib/libcmd/vmstate.c 2012-02-21 13:10:56.085934573 +0000
@@ -50,6 +50,7 @@ USAGE_LICENSE
#include <cmd.h>
#include <vmalloc.h>
+#include <sfdisc.h>
typedef struct State_s
{
--- src/cmd/ksh93/sh/init.c
+++ src/cmd/ksh93/sh/init.c 2012-02-20 10:33:24.362018545 +0000
@@ -508,24 +508,30 @@ static void put_cdpath(register Namval_t
@@ -508,25 +508,26 @@ static void put_cdpath(register Namval_t
static void put_ifs(register Namval_t* np,const char *val,int flags,Namfun_t *fp)
{
register struct ifs *ip = (struct ifs*)fp;
@ -534,23 +544,22 @@
- if(val != np->nvalue.cp)
- nv_putv(np, val, flags, fp);
- if(!val)
+ nv_putv(np, NIL(char*), flags, NIL(Namfun_t*));
+
+ if((xp = nv_stack(np, NIL(Namfun_t*))) != fp)
+ sfprintf(sfstderr, "BUG in %s:%s(%d) xp(%p) != fp(%p)\n",
+ __FILE__, __FUNCTION__, __LINE__, xp, fp);
+ if(fp && !fp->nofree)
+ {
{
- fp->next = np->nvfun;
- np->nvfun = fp;
+ free((void*)fp);
+ fp = NIL(Namfun_t*);
+ }
+ if(fp)
{
fp->next = np->nvfun;
np->nvfun = fp;
}
- else if(!val)
+ else
np->nvfun = 0;
- np->nvfun = 0;
+ nv_putv(np, NIL(char*), flags, fp);
+ if(fp)
+ fp->next = np->nvfun;
+ np->nvfun = fp;
}
/*