lib/download.c: fix digest for continued downloads

This commit is contained in:
Duncan Overbruck 2020-01-18 16:33:58 +01:00
parent 7493b06cbb
commit 013177cec3
No known key found for this signature in database
GPG Key ID: 335C1D17EC3D6E35

View File

@ -215,7 +215,7 @@ xbps_fetch_file_dest_digest(struct xbps_handle *xhp, const char *uri, const char
* If restarting, open the file for appending otherwise create it. * If restarting, open the file for appending otherwise create it.
*/ */
if (restart) if (restart)
fd = open(tempfile, O_WRONLY|O_APPEND|O_CLOEXEC); fd = open(tempfile, O_RDWR|O_CLOEXEC);
else else
fd = open(tempfile, O_WRONLY|O_CREAT|O_CLOEXEC|O_TRUNC, 0644); fd = open(tempfile, O_WRONLY|O_CREAT|O_CLOEXEC|O_TRUNC, 0644);
@ -223,6 +223,27 @@ xbps_fetch_file_dest_digest(struct xbps_handle *xhp, const char *uri, const char
rv = -1; rv = -1;
goto fetch_file_out; goto fetch_file_out;
} }
/*
* If restarting and digest was requested, read the current data
* and feed into sha256 hash.
*/
if (restart) {
if (digest) {
while ((bytes_read = read(fd, buf, sizeof(buf))) > 0) {
SHA256_Update(&sha256, buf, bytes_read);
}
if (bytes_read == -1) {
xbps_dbg_printf(xhp, "IO error while reading %s: %s\n",
tempfile, strerror(errno));
errno = EIO;
rv = -1;
goto fetch_file_out;
}
}
lseek(fd, 0, SEEK_END);
}
/* /*
* Initialize data for the fetch progress function callback * Initialize data for the fetch progress function callback
* and let the user know that the transfer is going to start * and let the user know that the transfer is going to start