diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Src/Zle/zle.h | 2 | ||||
| -rw-r--r-- | Src/Zle/zle_main.c | 21 | ||||
| -rw-r--r-- | Src/Zle/zle_thingy.c | 7 |
4 files changed, 30 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 94875914b..f5b0f2ae2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2015-12-07 Peter Stephenson <p.stephenson@samsung.com> + * 37337: Src/Zle/zle.h, Src/Zle/zle_main.c, + Src/Zle/zle_thingy.c: Delay freeing widget until not in use. + * 37335: Test/D04parameter.ztst, Test/V09datetime.ztst: fix tests after 37314. diff --git a/Src/Zle/zle.h b/Src/Zle/zle.h index 2d672de3b..e9b14281d 100644 --- a/Src/Zle/zle.h +++ b/Src/Zle/zle.h @@ -213,6 +213,8 @@ struct widget { #define ZLE_KEEPSUFFIX (1<<9) /* DON'T remove added suffix */ #define ZLE_NOTCOMMAND (1<<10) /* widget should not alter lastcmd */ #define ZLE_ISCOMP (1<<11) /* usable for new style completion */ +#define WIDGET_INUSE (1<<12) /* widget is in use */ +#define WIDGET_FREE (1<<13) /* request to free when no longer in use */ /* thingies */ diff --git a/Src/Zle/zle_main.c b/Src/Zle/zle_main.c index 38427e8e3..1f0c07df4 100644 --- a/Src/Zle/zle_main.c +++ b/Src/Zle/zle_main.c @@ -1344,6 +1344,8 @@ execzlefunc(Thingy func, char **args, int set_bindk) eofsent = 1; ret = 1; } else { + int inuse = wflags & WIDGET_INUSE; + w->flags |= WIDGET_INUSE; if(!(wflags & ZLE_KEEPSUFFIX)) removesuffix(); if(!(wflags & ZLE_MENUCMP)) { @@ -1367,6 +1369,12 @@ execzlefunc(Thingy func, char **args, int set_bindk) ret = w->u.fn(args); unqueue_signals(); } + if (!inuse) { + if (w->flags & WIDGET_FREE) + freewidget(w); + else + w->flags &= ~WIDGET_INUSE; + } if (!(wflags & ZLE_NOTCOMMAND)) lastcmd = wflags; } @@ -1387,6 +1395,8 @@ execzlefunc(Thingy func, char **args, int set_bindk) int osc = sfcontext, osi = movefd(0); int oxt = isset(XTRACE); LinkList largs = NULL; + int inuse = w->flags & WIDGET_INUSE; + w->flags |= WIDGET_INUSE; if (*args) { largs = newlinklist(); @@ -1402,8 +1412,15 @@ execzlefunc(Thingy func, char **args, int set_bindk) opts[XTRACE] = oxt; sfcontext = osc; endparamscope(); - lastcmd = w->flags; - w->flags = 0; + lastcmd = w->flags & ~(WIDGET_INUSE|WIDGET_FREE); + if (inuse) { + w->flags &= WIDGET_INUSE|WIDGET_FREE; + } else { + if (w->flags & WIDGET_FREE) + freewidget(w); + else + w->flags = 0; + } r = 1; redup(osi, 0); } diff --git a/Src/Zle/zle_thingy.c b/Src/Zle/zle_thingy.c index 271fd8efc..21495b6f2 100644 --- a/Src/Zle/zle_thingy.c +++ b/Src/Zle/zle_thingy.c @@ -253,9 +253,14 @@ unbindwidget(Thingy t, int override) /* Free a widget. */ /**/ -static void +void freewidget(Widget w) { + if (w->flags & WIDGET_INUSE) { + w->flags |= WIDGET_FREE; + return; + } + if (w->flags & WIDGET_NCOMP) { zsfree(w->u.comp.wid); zsfree(w->u.comp.func); |