From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Sat, 22 Feb 2020 18:11:41 +0000 (+0100)
Subject: ash: rename stack_nputstr() back to stnputs() to match dash
X-Git-Tag: 1_32_0~40
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=538ee4102b3eb046be1a74026d7c74642f9c7d13;p=oweals%2Fbusybox.git

ash: rename stack_nputstr() back to stnputs() to match dash

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/shell/ash.c b/shell/ash.c
index 01346108a..b290b6dbc 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -1761,7 +1761,7 @@ makestrspace(size_t newlen, char *p)
 }
 
 static char *
-stack_nputstr(const char *s, size_t n, char *p)
+stnputs(const char *s, size_t n, char *p)
 {
 	p = makestrspace(n, p);
 	p = (char *)mempcpy(p, s, n);
@@ -1771,7 +1771,7 @@ stack_nputstr(const char *s, size_t n, char *p)
 static char *
 stack_putstr(const char *s, char *p)
 {
-	return stack_nputstr(s, strlen(s), p);
+	return stnputs(s, strlen(s), p);
 }
 
 static char *
@@ -6756,7 +6756,7 @@ argstr(char *p, int flags)
 		}
 		if (length > 0) {
 			int newloc;
-			expdest = stack_nputstr(p, length, expdest);
+			expdest = stnputs(p, length, expdest);
 			newloc = expdest - (char *)stackblock();
 			if (breakall && !inquotes && newloc > startloc) {
 				recordregion(startloc, newloc, 0);