Author: kib
Date: Mon Jul 2 09:53:57 2012
New Revision: 237988
URL: http://svn.freebsd.org/changeset/base/237988
Log:
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
Modified:
head/usr.bin/xinstall/xinstall.c
Modified: head/usr.bin/xinstall/xinstall.c
==============================================================================
--- head/usr.bin/xinstall/xinstall.c Mon Jul 2 09:53:08 2012 (r237987)
+++ head/usr.bin/xinstall/xinstall.c Mon Jul 2 09:53:57 2012 (r237988)
@@ -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,11 +672,18 @@ copy(int from_fd, const char *from_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;
- err(EX_OSERR, "%s", to_name);
+ 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;
}
@@ -684,8 +692,15 @@ copy(int from_fd, const char *from_name,
if ((nw = write(to_fd, buf, nr)) != nr) {
serrno = errno;
(void)unlink(to_name);
- errno = nw > 0 ? EIO : serrno;
- err(EX_OSERR, "%s", to_name);
+ 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;