[git commit] ash: rename stack_nputstr() back to stnputs() to match dash
Denys Vlasenko
vda.linux at googlemail.com
Mon Feb 24 11:47:19 UTC 2020
commit: https://git.busybox.net/busybox/commit/?id=538ee4102b3eb046be1a74026d7c74642f9c7d13
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master
Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
shell/ash.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
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);
More information about the busybox-cvs
mailing list