summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Smirnov <andrew.smirnov@gmail.com>2019-07-09 00:22:53 -0700
committerSascha Hauer <s.hauer@pengutronix.de>2019-07-09 11:38:10 +0200
commitaa8a42ac0a259187c88e8a4aca5f3d4f4f4b753a (patch)
tree5537c2f3010ef8f7c78b0380cfbc1b64cbced9a4
parente7c33540d0c092c28b227d4b7602cef8ab203ef3 (diff)
downloadbarebox-aa8a42ac0a259187c88e8a4aca5f3d4f4f4b753a.tar.gz
lib: Add missing arguments to memcpy_parse_options()
Memcpy use-case differs from that of memcmp in default access type and destination file mode. This was missed in original commit that introduced memcpy_parse_options(). Add said parameters to memcpy_parse_options(), so the can be correctly specified depending on the use-case. Fixes: ddf4cca339 ("commands: Introduce memcpy_parse_options()") Reported-by: Peter Mamonov <pmamonov@gmail.com> Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--commands/memcmp.c3
-rw-r--r--commands/memcpy.c3
-rw-r--r--include/common.h3
-rw-r--r--lib/misc.c7
4 files changed, 10 insertions, 6 deletions
diff --git a/commands/memcmp.c b/commands/memcmp.c
index d1c4f52..76fbe07 100644
--- a/commands/memcmp.c
+++ b/commands/memcmp.c
@@ -42,7 +42,8 @@ static int do_memcmp(int argc, char *argv[])
int ret = 1;
int offset = 0;
- if (memcpy_parse_options(argc, argv, &sourcefd, &destfd, &count) < 0)
+ if (memcpy_parse_options(argc, argv, &sourcefd, &destfd, &count,
+ O_RWSIZE_1, O_RDONLY) < 0)
return 1;
buf = xmalloc(RW_BUF_SIZE + RW_BUF_SIZE);
diff --git a/commands/memcpy.c b/commands/memcpy.c
index 5f0047f..b2cea8c 100644
--- a/commands/memcpy.c
+++ b/commands/memcpy.c
@@ -41,7 +41,8 @@ static int do_memcpy(int argc, char *argv[])
int ret = 0;
char *buf;
- if (memcpy_parse_options(argc, argv, &sourcefd, &destfd, &count) < 0)
+ if (memcpy_parse_options(argc, argv, &sourcefd, &destfd, &count,
+ 0, O_WRONLY | O_CREAT) < 0)
return 1;
buf = xmalloc(RW_BUF_SIZE);
diff --git a/include/common.h b/include/common.h
index b129497..a947406 100644
--- a/include/common.h
+++ b/include/common.h
@@ -117,7 +117,8 @@ void shutdown_barebox(void);
int mem_parse_options(int argc, char *argv[], char *optstr, int *mode,
char **sourcefile, char **destfile, int *swab);
int memcpy_parse_options(int argc, char *argv[], int *sourcefd,
- int *destfd, loff_t *count);
+ int *destfd, loff_t *count,
+ int rwsize, int destmode);
#define RW_BUF_SIZE (unsigned)4096
extern const char version_string[];
diff --git a/lib/misc.c b/lib/misc.c
index 18153bb..7add1fe 100644
--- a/lib/misc.c
+++ b/lib/misc.c
@@ -173,10 +173,11 @@ int mem_parse_options(int argc, char *argv[], char *optstr, int *mode,
}
int memcpy_parse_options(int argc, char *argv[], int *sourcefd,
- int *destfd, loff_t *count)
+ int *destfd, loff_t *count,
+ int rwsize, int destmode)
{
loff_t dest, src;
- int mode = 0;
+ int mode = rwsize;
char *sourcefile = NULL;
char *destfile = NULL;
struct stat statbuf;
@@ -212,7 +213,7 @@ int memcpy_parse_options(int argc, char *argv[], int *sourcefd,
if (*sourcefd < 0)
return -1;
- *destfd = open_and_lseek(destfile, O_WRONLY | O_CREAT | mode, dest);
+ *destfd = open_and_lseek(destfile, mode | destmode, dest);
if (*destfd < 0) {
close(*sourcefd);
return -1;