file_io.c: set errno=EINVAL on unexpected end of file

diff --git a/src/file_io.c b/src/file_io.c
index 3176ce6f64d4ba6e15c4ec6349f55b80be6468ef..f641aa28d1947569e304536cf475cd145a81a862 100644 (file)
--- a/src/file_io.c
+++ b/src/file_io.c
@@ -38,7 +38,7 @@
  * Return values:
  *     WIMLIB_ERR_SUCCESS                      (0)
  *     WIMLIB_ERR_READ                         (errno set)
  * Return values:
  *     WIMLIB_ERR_SUCCESS                      (0)
  *     WIMLIB_ERR_READ                         (errno set)

- *     WIMLIB_ERR_UNEXPECTED_END_OF_FILE       (errno set to 0)
+ *     WIMLIB_ERR_UNEXPECTED_END_OF_FILE       (errno set to EINVAL)

  */
 int
 full_read(struct filedes *fd, void *buf, size_t count)
  */
 int
 full_read(struct filedes *fd, void *buf, size_t count)


@@ -47,7 +47,7 @@ full_read(struct filedes *fd, void *buf, size_t count)
                ssize_t ret = read(fd->fd, buf, count);
                if (unlikely(ret <= 0)) {
                        if (ret == 0) {
                ssize_t ret = read(fd->fd, buf, count);
                if (unlikely(ret <= 0)) {
                        if (ret == 0) {

-                               errno = 0;
+                               errno = EINVAL;

                                return WIMLIB_ERR_UNEXPECTED_END_OF_FILE;
                        }
                        if (errno == EINTR)
                                return WIMLIB_ERR_UNEXPECTED_END_OF_FILE;
                        }
                        if (errno == EINTR)


@@ -100,7 +100,7 @@ pipe_read(struct filedes *fd, void *buf, size_t count, off_t offset)
  * Return values:
  *     WIMLIB_ERR_SUCCESS                      (0)
  *     WIMLIB_ERR_READ                         (errno set)
  * Return values:
  *     WIMLIB_ERR_SUCCESS                      (0)
  *     WIMLIB_ERR_READ                         (errno set)

- *     WIMLIB_ERR_UNEXPECTED_END_OF_FILE       (errno set to 0)
+ *     WIMLIB_ERR_UNEXPECTED_END_OF_FILE       (errno set to EINVAL)

  *     WIMLIB_ERR_RESOURCE_ORDER               (errno set to ESPIPE)
  */
 int
  *     WIMLIB_ERR_RESOURCE_ORDER               (errno set to ESPIPE)
  */
 int


@@ -113,7 +113,7 @@ full_pread(struct filedes *fd, void *buf, size_t count, off_t offset)
                ssize_t ret = pread(fd->fd, buf, count, offset);
                if (unlikely(ret <= 0)) {
                        if (ret == 0) {
                ssize_t ret = pread(fd->fd, buf, count, offset);
                if (unlikely(ret <= 0)) {
                        if (ret == 0) {

-                               errno = 0;
+                               errno = EINVAL;

                                return WIMLIB_ERR_UNEXPECTED_END_OF_FILE;
                        }
                        if (errno == EINTR)
                                return WIMLIB_ERR_UNEXPECTED_END_OF_FILE;
                        }
                        if (errno == EINTR)

diff --git a/src/resource.c b/src/resource.c
index a4cc6c1291c669da3715f51d5132f6dfb03f6349..9afa25ffc626842a55883d566a3474a1b83318d1 100644 (file)
--- a/src/resource.c
+++ b/src/resource.c
@@ -103,7 +103,7 @@ struct data_range {
  *
  *     WIMLIB_ERR_SUCCESS (0)
  *     WIMLIB_ERR_READ                   (errno set)
  *
  *     WIMLIB_ERR_SUCCESS (0)
  *     WIMLIB_ERR_READ                   (errno set)

- *     WIMLIB_ERR_UNEXPECTED_END_OF_FILE (errno set to 0)
+ *     WIMLIB_ERR_UNEXPECTED_END_OF_FILE (errno set to EINVAL)

  *     WIMLIB_ERR_NOMEM                  (errno set to ENOMEM)
  *     WIMLIB_ERR_DECOMPRESSION          (errno set to EINVAL)
  *     WIMLIB_ERR_INVALID_CHUNK_SIZE     (errno set to EINVAL)
  *     WIMLIB_ERR_NOMEM                  (errno set to ENOMEM)
  *     WIMLIB_ERR_DECOMPRESSION          (errno set to EINVAL)
  *     WIMLIB_ERR_INVALID_CHUNK_SIZE     (errno set to EINVAL)