diff options
author | Qi.Chen@windriver.com <Qi.Chen@windriver.com> | 2015-09-18 13:41:06 +0800 |
---|---|---|
committer | Joe MacDonald <joe_macdonald@mentor.com> | 2015-10-21 12:13:03 -0400 |
commit | 395519075d3b713f13e8b695b3783c9ca5c7f821 (patch) | |
tree | 85df49b2f20165992434d20dc116dd9e673595e8 | |
parent | 47f7d287a09329734629cb9d194ef4e077117d79 (diff) | |
download | meta-openembedded-395519075d3b713f13e8b695b3783c9ca5c7f821.tar.gz |
inetutils: fix rcp to work with large file
This issue occurs When we copy file by rcp command between target and host,
if the file > 2GB, it will fail.
The cause is that it used incorrect data type on file size in sink() of rcp.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
-rw-r--r-- | meta-networking/recipes-connectivity/inetutils/inetutils/0001-rcp-fix-to-work-with-large-files.patch | 31 | ||||
-rw-r--r-- | meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb | 1 |
2 files changed, 32 insertions, 0 deletions
diff --git a/meta-networking/recipes-connectivity/inetutils/inetutils/0001-rcp-fix-to-work-with-large-files.patch b/meta-networking/recipes-connectivity/inetutils/inetutils/0001-rcp-fix-to-work-with-large-files.patch new file mode 100644 index 0000000000..d4764f5867 --- /dev/null +++ b/meta-networking/recipes-connectivity/inetutils/inetutils/0001-rcp-fix-to-work-with-large-files.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Subject: rcp: fix to work with large files | ||
4 | |||
5 | When we copy file by rcp command, if the file > 2GB, it will fail. | ||
6 | The cause is that it used incorrect data type on file size in sink() of rcp. | ||
7 | |||
8 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
9 | --- | ||
10 | src/rcp.c | 4 ++-- | ||
11 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
12 | |||
13 | diff --git a/src/rcp.c b/src/rcp.c | ||
14 | index 21f55b6..bafa35f 100644 | ||
15 | --- a/src/rcp.c | ||
16 | +++ b/src/rcp.c | ||
17 | @@ -876,9 +876,9 @@ sink (int argc, char *argv[]) | ||
18 | enum | ||
19 | { YES, NO, DISPLAYED } wrerr; | ||
20 | BUF *bp; | ||
21 | - off_t i, j; | ||
22 | + off_t i, j, size; | ||
23 | int amt, count, exists, first, mask, mode, ofd, omode; | ||
24 | - int setimes, size, targisdir, wrerrno; | ||
25 | + int setimes, targisdir, wrerrno; | ||
26 | char ch, *cp, *np, *targ, *vect[1], buf[BUFSIZ]; | ||
27 | const char *why; | ||
28 | |||
29 | -- | ||
30 | 1.9.1 | ||
31 | |||
diff --git a/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb b/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb index adfc940103..50aedd30d4 100644 --- a/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb +++ b/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb | |||
@@ -20,6 +20,7 @@ SRC_URI = "${GNU_MIRROR}/inetutils/inetutils-${PV}.tar.gz \ | |||
20 | file://tftpd.xinetd.inetutils \ | 20 | file://tftpd.xinetd.inetutils \ |
21 | file://inetutils-1.9-PATH_PROCNET_DEV.patch \ | 21 | file://inetutils-1.9-PATH_PROCNET_DEV.patch \ |
22 | file://inetutils-only-check-pam_appl.h-when-pam-enabled.patch \ | 22 | file://inetutils-only-check-pam_appl.h-when-pam-enabled.patch \ |
23 | file://0001-rcp-fix-to-work-with-large-files.patch \ | ||
23 | " | 24 | " |
24 | 25 | ||
25 | SRC_URI[md5sum] = "04852c26c47cc8c6b825f2b74f191f52" | 26 | SRC_URI[md5sum] = "04852c26c47cc8c6b825f2b74f191f52" |