Issue proper diagnostic on the short writes, also consider the
case of write reporting 0 bytes as short write. Reported and tested by: adreast MFC after: 1 week
This commit is contained in:
parent
9d232eec30
commit
5a21698e2c
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=237988
@ -55,6 +55,7 @@ __FBSDID("$FreeBSD$");
|
||||
#include <grp.h>
|
||||
#include <paths.h>
|
||||
#include <pwd.h>
|
||||
#include <stdint.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
@ -671,12 +672,19 @@ copy(int from_fd, const char *from_name, int to_fd, const char *to_name,
|
||||
if (size <= 8 * 1048576 && trymmap(from_fd) &&
|
||||
(p = mmap(NULL, (size_t)size, PROT_READ, MAP_SHARED,
|
||||
from_fd, (off_t)0)) != (char *)MAP_FAILED) {
|
||||
if ((nw = write(to_fd, p, size)) != size) {
|
||||
nw = write(to_fd, p, size);
|
||||
if (nw != size) {
|
||||
serrno = errno;
|
||||
(void)unlink(to_name);
|
||||
errno = nw > 0 ? EIO : serrno;
|
||||
if (nw >= 0) {
|
||||
errx(EX_OSERR,
|
||||
"short write to %s: %jd bytes written, %jd bytes asked to write",
|
||||
to_name, (uintmax_t)nw, (uintmax_t)size);
|
||||
} else {
|
||||
errno = serrno;
|
||||
err(EX_OSERR, "%s", to_name);
|
||||
}
|
||||
}
|
||||
done_copy = 1;
|
||||
}
|
||||
if (!done_copy) {
|
||||
@ -684,9 +692,16 @@ copy(int from_fd, const char *from_name, int to_fd, const char *to_name,
|
||||
if ((nw = write(to_fd, buf, nr)) != nr) {
|
||||
serrno = errno;
|
||||
(void)unlink(to_name);
|
||||
errno = nw > 0 ? EIO : serrno;
|
||||
if (nw >= 0) {
|
||||
errx(EX_OSERR,
|
||||
"short write to %s: %jd bytes written, %jd bytes asked to write",
|
||||
to_name, (uintmax_t)nw,
|
||||
(uintmax_t)size);
|
||||
} else {
|
||||
errno = serrno;
|
||||
err(EX_OSERR, "%s", to_name);
|
||||
}
|
||||
}
|
||||
if (nr != 0) {
|
||||
serrno = errno;
|
||||
(void)unlink(to_name);
|
||||
|
Loading…
Reference in New Issue
Block a user