diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2017-07-21 18:51:29 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2017-07-21 18:51:29 +0200 |
commit | da2244fe48b7f1223427a4c1e91d86e398bbceb4 (patch) | |
tree | ace4f9150179e9f56c3965751947dcedd1da974d | |
parent | fd5e66eb8eb4e39460a6cfde4b10dcab3870f26b (diff) | |
download | busybox-w32-da2244fe48b7f1223427a4c1e91d86e398bbceb4.tar.gz busybox-w32-da2244fe48b7f1223427a4c1e91d86e398bbceb4.tar.bz2 busybox-w32-da2244fe48b7f1223427a4c1e91d86e398bbceb4.zip |
ash: use mempcpy() where appropriate
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r-- | shell/ash.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/shell/ash.c b/shell/ash.c index a461bb7df..c8b2adf4e 100644 --- a/shell/ash.c +++ b/shell/ash.c | |||
@@ -2315,10 +2315,10 @@ setvar(const char *name, const char *val, int flags) | |||
2315 | 2315 | ||
2316 | INT_OFF; | 2316 | INT_OFF; |
2317 | nameeq = ckmalloc(namelen + vallen + 2); | 2317 | nameeq = ckmalloc(namelen + vallen + 2); |
2318 | p = memcpy(nameeq, name, namelen) + namelen; | 2318 | p = mempcpy(nameeq, name, namelen); |
2319 | if (val) { | 2319 | if (val) { |
2320 | *p++ = '='; | 2320 | *p++ = '='; |
2321 | p = memcpy(p, val, vallen) + vallen; | 2321 | p = mempcpy(p, val, vallen); |
2322 | } | 2322 | } |
2323 | *p = '\0'; | 2323 | *p = '\0'; |
2324 | setvareq(nameeq, flags | VNOSAVE); | 2324 | setvareq(nameeq, flags | VNOSAVE); |