Browse Source

Letting lfs_read() retry if read(2) returns a short byte count.

release-1.5.4.branch
Thomas Schmitt 7 years ago
parent
commit
210b5817cb
  1. 3
      libisofs/eltorito.c
  2. 29
      libisofs/fs_local.c

3
libisofs/eltorito.c

@ -1194,6 +1194,9 @@ int iso_patch_eltoritos(Ecma119Image *t)
ret = iso_stream_read(original, buf, size);
iso_stream_close(original);
if (ret != (int) size) {
if (ret >= 0)
iso_msg_submit(t->image->id, ISO_FILE_READ_ERROR, 0,
"Cannot read all bytes from El Torito boot image for boot info table");
return (ret < 0) ? ret : (int) ISO_FILE_READ_ERROR;
}

29
libisofs/fs_local.c

@ -282,6 +282,9 @@ static
int lfs_read(IsoFileSource *src, void *buf, size_t count)
{
_LocalFsFileSource *data;
size_t to_read, done = 0;
int ret;
uint8_t *buf8;
if (src == NULL || buf == NULL) {
return ISO_NULL_POINTER;
@ -293,28 +296,28 @@ int lfs_read(IsoFileSource *src, void *buf, size_t count)
data = src->data;
switch (data->openned) {
case 1: /* not dir */
{
int ret;
ret = read(data->info.fd, buf, count);
buf8 = (uint8_t *) buf; /* for pointer arithmetic */
for (to_read = count; to_read > 0; to_read = count - done) {
if (to_read > 1024 * 1024)
to_read = 1024 * 1024;
ret = read(data->info.fd, buf8 + done, to_read);
if (ret < 0) {
/* error on read */
switch (errno) {
case EINTR:
ret = ISO_INTERRUPTED;
break;
return ISO_INTERRUPTED;
case EFAULT:
ret = ISO_OUT_OF_MEM;
break;
return ISO_OUT_OF_MEM;
case EIO:
ret = ISO_FILE_READ_ERROR;
break;
default:
ret = ISO_FILE_ERROR;
break;
return ISO_FILE_READ_ERROR;
}
return ISO_FILE_ERROR;
}
return ret;
if (ret == 0) /* EOF */
break;
done += ret;
}
return done;
case 2: /* directory */
return ISO_FILE_IS_DIR;
default:

Loading…
Cancel
Save