aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Denys Vlasenko <vda.linux@googlemail.com>2020-02-16 18:06:20 +0100
committerGravatar Denys Vlasenko <vda.linux@googlemail.com>2020-02-16 19:14:45 +0100
commit3f7fb2c89ad75bbdd3b69e302124c8179c273bb4 (patch)
tree3aee03325f2422ef780c80bbec5082610fe0b16c
parent970470e235fd2a00d4b020378ddccf769ce534ec (diff)
downloadbusybox-3f7fb2c89ad75bbdd3b69e302124c8179c273bb4.tar.gz
busybox-3f7fb2c89ad75bbdd3b69e302124c8179c273bb4.tar.bz2
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>
-rw-r--r--shell/ash.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/shell/ash.c b/shell/ash.c
index db7dffc72..a006a1c26 100644
--- 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