diff options
| author | Barton E. Schaefer <schaefer@zsh.org> | 2014-09-29 17:52:33 -0700 |
|---|---|---|
| committer | Barton E. Schaefer <schaefer@zsh.org> | 2014-09-29 17:52:33 -0700 |
| commit | 32473f59a38631c4bb2403d835b9e007c8a0ddc7 (patch) | |
| tree | 72df8959fcde37e5968a6c6301f8a98a9f860e5f /Src/hashtable.c | |
| parent | 60e31a45b0c015d42e9dc8ca2c991930c3f7fd66 (diff) | |
| parent | 8cb67e721b3f02779bf4cf0d6a368f67c49c11f8 (diff) | |
| download | zsh-32473f59a38631c4bb2403d835b9e007c8a0ddc7.tar.gz zsh-32473f59a38631c4bb2403d835b9e007c8a0ddc7.tar.xz zsh-32473f59a38631c4bb2403d835b9e007c8a0ddc7.zip | |
Merge branch 'master' of git://git.code.sf.net/p/zsh/code
Conflicts: ChangeLog
Diffstat (limited to 'Src/hashtable.c')
| -rw-r--r-- | Src/hashtable.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/Src/hashtable.c b/Src/hashtable.c index ef187927b..7a430629d 100644 --- a/Src/hashtable.c +++ b/Src/hashtable.c @@ -887,6 +887,8 @@ freeshfuncnode(HashNode hn) zsfree(shf->node.nam); if (shf->funcdef) freeeprog(shf->funcdef); + if (shf->redir) + freeeprog(shf->redir); zsfree(shf->filename); if (shf->sticky) { if (shf->sticky->n_on_opts) @@ -954,10 +956,19 @@ printshfuncnode(HashNode hn, int printflags) printf(" \"$@\""); } } - printf("\n}\n"); + printf("\n}"); } else { - printf(" () { }\n"); + printf(" () { }"); } + if (f->redir) { + t = getpermtext(f->redir, NULL, 1); + if (t) { + zputs(t, stdout); + zsfree(t); + } + } + + putchar('\n'); } /**************************************/ |