io: fix fdo_write direct write path return value and index writing

fixes commit 395e92b6 "io: formalize apk_ostream_write() always writing full data"

1 files changed, 3 insertions, 4 deletions

diff --git a/src/io.c b/src/io.c
index c802ed5..77993a2 100644
--- a/src/io.c
+++ b/src/io.c
@@ -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);
 		}
 	}