diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2020-02-22 19:11:41 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2020-02-24 12:47:19 +0100 |
commit | 538ee4102b3eb046be1a74026d7c74642f9c7d13 (patch) | |
tree | 02e69e4d7932b4f45df86a5079b0e8f2905dc017 | |
parent | c2058ec98cf3f6722be4436cae07a386e3c7b48d (diff) | |
download | busybox-w32-538ee4102b3eb046be1a74026d7c74642f9c7d13.tar.gz busybox-w32-538ee4102b3eb046be1a74026d7c74642f9c7d13.tar.bz2 busybox-w32-538ee4102b3eb046be1a74026d7c74642f9c7d13.zip |
ash: rename stack_nputstr() back to stnputs() to match dash
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r-- | shell/ash.c | 6 |
1 files 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) | |||
1761 | } | 1761 | } |
1762 | 1762 | ||
1763 | static char * | 1763 | static char * |
1764 | stack_nputstr(const char *s, size_t n, char *p) | 1764 | stnputs(const char *s, size_t n, char *p) |
1765 | { | 1765 | { |
1766 | p = makestrspace(n, p); | 1766 | p = makestrspace(n, p); |
1767 | p = (char *)mempcpy(p, s, n); | 1767 | p = (char *)mempcpy(p, s, n); |
@@ -1771,7 +1771,7 @@ stack_nputstr(const char *s, size_t n, char *p) | |||
1771 | static char * | 1771 | static char * |
1772 | stack_putstr(const char *s, char *p) | 1772 | stack_putstr(const char *s, char *p) |
1773 | { | 1773 | { |
1774 | return stack_nputstr(s, strlen(s), p); | 1774 | return stnputs(s, strlen(s), p); |
1775 | } | 1775 | } |
1776 | 1776 | ||
1777 | static char * | 1777 | static char * |
@@ -6756,7 +6756,7 @@ argstr(char *p, int flags) | |||
6756 | } | 6756 | } |
6757 | if (length > 0) { | 6757 | if (length > 0) { |
6758 | int newloc; | 6758 | int newloc; |
6759 | expdest = stack_nputstr(p, length, expdest); | 6759 | expdest = stnputs(p, length, expdest); |
6760 | newloc = expdest - (char *)stackblock(); | 6760 | newloc = expdest - (char *)stackblock(); |
6761 | if (breakall && !inquotes && newloc > startloc) { | 6761 | if (breakall && !inquotes && newloc > startloc) { |
6762 | recordregion(startloc, newloc, 0); | 6762 | recordregion(startloc, newloc, 0); |