search for: fb6b60ab

...ng 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;...

..., rather than the untruncated length. 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr/dash/output.c b/usr/dash/output.c index fb6b60ab..e9ee9b4d 100644 --- a/usr/dash/output.c +++ b/usr/dash/output.c @@ -286,7 +286,7 @@ fmtstr(char *outbuf, size_t length, const char *fmt, ...) va_start(ap, fmt); ret = xvsnprintf(outbuf, length, fmt, ap); va_end(ap); - return ret; + return ret > (int)length ? length : ret; }