klibc-bot for Herbert Xu
2020-Mar-28 21:48 UTC
[klibc] [klibc:update-dash] dash: [OUTPUT] Add ifdefs around MEM_OUT handling in outmem
Commit-ID: 5064a7b95ea5c2308b816818e513a0fbb363dc3a Gitweb: http://git.kernel.org/?p=libs/klibc/klibc.git;a=commit;h=5064a7b95ea5c2308b816818e513a0fbb363dc3a Author: Herbert Xu <herbert at gondor.apana.org.au> AuthorDate: Mon, 27 Oct 2014 15:44:51 +0800 Committer: Ben Hutchings <ben at decadent.org.uk> CommitDate: Sat, 28 Mar 2020 21:42:54 +0000 [klibc] dash: [OUTPUT] Add ifdefs around MEM_OUT handling in outmem [ dash commit 0f2b7ee05547fa06b9abb0643b0e3ca514050ab6 ] MEM_OUT is only used by forkless backtick processing which we do not currently support. Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au> Signed-off-by: Ben Hutchings <ben at decadent.org.uk> --- usr/dash/output.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/usr/dash/output.c b/usr/dash/output.c index f9d87a6a..fb6b60ab 100644 --- a/usr/dash/output.c +++ b/usr/dash/output.c @@ -154,10 +154,13 @@ buffered: if (!bufsize) { ; } else if (dest->buf == NULL) { +#ifdef notyet if (dest->fd == MEM_OUT && len > bufsize) { bufsize = len; } +#endif offset = 0; +#ifdef notyet goto alloc; } else if (dest->fd == MEM_OUT) { offset = bufsize; @@ -169,6 +172,7 @@ buffered: if (bufsize < offset) goto err; alloc: +#endif INTOFF; dest->buf = ckrealloc(dest->buf, bufsize); dest->bufsize = bufsize; @@ -184,7 +188,9 @@ alloc: goto buffered; if ((xwrite(dest->fd, p, len))) { +#ifdef notyet err: +#endif dest->flags |= OUTPUT_ERR; } #endif
Reasonably Related Threads
- [klibc:update-dash] [OUTPUT] Add ifdefs around MEM_OUT handling in outmem
- [klibc:update-dash] dash: [OUTPUT] Add likely tag in outmem
- [klibc:master] dash: output: Fix clang warnings about GNU old-style field designator
- [PATCH v2 5/5] Clean up clang warnings
- [klibc:update-dash] [OUTPUT] Add likely tag in outmem