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

ash: use mempcpy() in more places

Browse Source 
Most changes are taken from dash.

function                                             old     new   delta
single_quote                                         127     129      +2
stack_nputstr                                         28      29      +1
path_advance                                         209     202      -7
rmescapes                                            346     308     -38
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 2/2 up/down: 3/-45)             Total: -42 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2017-07-23 21:46:02 +02:00
parent e4f6bfd6fe
commit 5ace96a713
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
shell/ash.c
View File

@ -1658,7 +1658,7 @@ static char *
stack_nputstr(const char *s, size_t n, char *p) stack_nputstr(const char *s, size_t n, char *p)
{ {
p = makestrspace(n, p); p = makestrspace(n, p);
p = (char *)memcpy(p, s, n) + n; p = (char *)mempcpy(p, s, n);
return p; return p;
} }
@ -1761,7 +1761,7 @@ single_quote(const char *s)
q = p = makestrspace(len + 3, p); q = p = makestrspace(len + 3, p);
*q++ = '\''; *q++ = '\'';
q = (char *)memcpy(q, s, len) + len; q = (char *)mempcpy(q, s, len) + len;
*q++ = '\''; *q++ = '\'';
s += len; s += len;
@ -1775,7 +1775,7 @@ single_quote(const char *s)
q = p = makestrspace(len + 3, p); q = p = makestrspace(len + 3, p);
*q++ = '"'; *q++ = '"';
q = (char *)memcpy(q, s - len, len) + len; q = (char *)mempcpy(q, s - len, len);
*q++ = '"'; *q++ = '"';
STADJUST(q - p, p); STADJUST(q - p, p);
@ -2453,8 +2453,7 @@ path_advance(const char **path, const char *name)
growstackblock(); growstackblock();
q = stackblock(); q = stackblock();
if (p != start) { if (p != start) {
memcpy(q, start, p - start); q = mempcpy(q, start, p - start);
q += p - start;
*q++ = '/'; *q++ = '/';
} }
strcpy(q, name); strcpy(q, name);
@ -5949,7 +5948,7 @@ rmescapes(char *str, int flag)
} }
q = r; q = r;
if (len > 0) { if (len > 0) {
q = (char *)memcpy(q, str, len) + len; q = (char *)mempcpy(q, str, len);
} }
} }