mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-25 11:37:56 +00:00
Don't chop IO into small pieces, follow cp(1) and just use MAXPHYS.
This commit is contained in:
parent
3ddd7d96bb
commit
a23ffe9673
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=225954
24
bin/mv/mv.c
24
bin/mv/mv.c
@ -260,40 +260,34 @@ static int
|
||||
fastcopy(const char *from, const char *to, struct stat *sbp)
|
||||
{
|
||||
struct timeval tval[2];
|
||||
static u_int blen;
|
||||
static char *bp;
|
||||
static u_int blen = MAXPHYS;
|
||||
static char *bp = NULL;
|
||||
mode_t oldmode;
|
||||
int nread, from_fd, to_fd;
|
||||
|
||||
if ((from_fd = open(from, O_RDONLY, 0)) < 0) {
|
||||
warn("%s", from);
|
||||
warn("fastcopy: open() failed (from): %s", from);
|
||||
return (1);
|
||||
}
|
||||
if (blen < sbp->st_blksize) {
|
||||
if (bp != NULL)
|
||||
free(bp);
|
||||
if ((bp = malloc((size_t)sbp->st_blksize)) == NULL) {
|
||||
blen = 0;
|
||||
warnx("malloc failed");
|
||||
return (1);
|
||||
}
|
||||
blen = sbp->st_blksize;
|
||||
if (bp == NULL && (bp = malloc((size_t)blen)) == NULL) {
|
||||
warnx("malloc(%u) failed", blen);
|
||||
return (1);
|
||||
}
|
||||
while ((to_fd =
|
||||
open(to, O_CREAT | O_EXCL | O_TRUNC | O_WRONLY, 0)) < 0) {
|
||||
if (errno == EEXIST && unlink(to) == 0)
|
||||
continue;
|
||||
warn("%s", to);
|
||||
warn("fastcopy: open() failed (to): %s", to);
|
||||
(void)close(from_fd);
|
||||
return (1);
|
||||
}
|
||||
while ((nread = read(from_fd, bp, (size_t)blen)) > 0)
|
||||
if (write(to_fd, bp, (size_t)nread) != nread) {
|
||||
warn("%s", to);
|
||||
warn("fastcopy: write() failed: %s", to);
|
||||
goto err;
|
||||
}
|
||||
if (nread < 0) {
|
||||
warn("%s", from);
|
||||
warn("fastcopy: read() failed: %s", from);
|
||||
err: if (unlink(to))
|
||||
warn("%s: remove", to);
|
||||
(void)close(from_fd);
|
||||
|
Loading…
Reference in New Issue
Block a user