emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2020-02-22 19:11:41 +01:00
parent c2058ec98c
commit 538ee4102b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
shell/ash.c
View File

@ -1761,7 +1761,7 @@ makestrspace(size_t newlen, char *p)
} }
static char * 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 = makestrspace(n, p);
p = (char *)mempcpy(p, s, n); p = (char *)mempcpy(p, s, n);
@ -1771,7 +1771,7 @@ stack_nputstr(const char *s, size_t n, char *p)
static char * static char *
stack_putstr(const char *s, char *p) stack_putstr(const char *s, char *p)
{ {
return stack_nputstr(s, strlen(s), p); return stnputs(s, strlen(s), p);
} }
static char * static char *
@ -6756,7 +6756,7 @@ argstr(char *p, int flags)
} }
if (length > 0) { if (length > 0) {
int newloc; int newloc;
expdest = stack_nputstr(p, length, expdest); expdest = stnputs(p, length, expdest);
newloc = expdest - (char *)stackblock(); newloc = expdest - (char *)stackblock();
if (breakall && !inquotes && newloc > startloc) { if (breakall && !inquotes && newloc > startloc) {
recordregion(startloc, newloc, 0); recordregion(startloc, newloc, 0);