diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2022-12-21 00:12:33 +0200 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2022-12-21 00:22:59 +0200 |
| commit | 5abb95ef83769d379dda99dbe8643ff7e63b0c11 (patch) | |
| tree | 2e655f5d542d4d9d86a615948c9ecfd4f96387b8 /src | |
| parent | a77e28ab60f7fec2290405ffb1c32d1b673dd8b2 (diff) | |
| download | apk-tools-5abb95ef83769d379dda99dbe8643ff7e63b0c11.tar.gz apk-tools-5abb95ef83769d379dda99dbe8643ff7e63b0c11.tar.bz2 apk-tools-5abb95ef83769d379dda99dbe8643ff7e63b0c11.tar.xz apk-tools-5abb95ef83769d379dda99dbe8643ff7e63b0c11.zip | |
io: fix fdo_write direct write path return value and index writing
fixes commit 395e92b6 "io: formalize apk_ostream_write() always writing full data"
Diffstat (limited to 'src')
| -rw-r--r-- | src/io.c | 7 | ||||
| -rw-r--r-- | src/package.c | 2 |
2 files changed, 4 insertions, 5 deletions
@@ -936,12 +936,11 @@ static int fdo_write(struct apk_ostream *os, const void *ptr, size_t size) if (size + fos->bytes >= sizeof(fos->buffer)) { r = fdo_flush(fos); - if (r != 0) - return r; + if (r != 0) return r; if (size >= sizeof(fos->buffer) / 2) { r = apk_write_fully(fos->fd, ptr, size); - if (r != size) apk_ostream_cancel(&fos->os, r < 0 ? r : -ENOSPC); - return r; + if (r == size) return 0; + return apk_ostream_cancel(&fos->os, r < 0 ? r : -ENOSPC); } } diff --git a/src/package.c b/src/package.c index b160176..19d49c7 100644 --- a/src/package.c +++ b/src/package.c @@ -954,7 +954,7 @@ int apk_pkg_write_index_entry(struct apk_package *info, return apk_ostream_cancel(os, -ENOBUFS); bbuf = apk_blob_pushed(APK_BLOB_BUF(buf), bbuf); - if (apk_ostream_write(os, bbuf.ptr, bbuf.len) || + if (apk_ostream_write(os, bbuf.ptr, bbuf.len) < 0 || write_depends(os, "D:", info->depends) || write_depends(os, "p:", info->provides) || write_depends(os, "i:", info->install_if)) |