ash: output: Fix fmtstr return value

Upstream commit:

    Date: Sat, 19 May 2018 02:39:44 +0800
    output: Fix fmtstr return value

    The function fmtstr is meant to return the actual length of output
    produced, rather than the untruncated length.

    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

diff --git a/shell/ash.c b/shell/ash.c
index db7dffc72a6b6044f13e9e4d6c8a62d962111deb..a006a1c261ad714ac364c3b1737c5bf8e0576b20 100644 (file)
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -713,7 +713,7 @@ fmtstr(char *outbuf, size_t length, const char *fmt, ...)
        ret = vsnprintf(outbuf, length, fmt, ap);
        va_end(ap);
        INT_ON;
-       return ret;
+       return ret > (int)length ? length : ret;
 }
 
 static void