binutils-2.26

git-svn-id: svn://kolibrios.org@6324 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Sergey Semyonov (Serge)
2016-03-12 03:07:23 +00:00
parent d818239c29
commit 3b53803119
572 changed files with 128744 additions and 64154 deletions

View File

@@ -63,8 +63,6 @@ simple_object_internal_read (int descriptor, off_t offset,
unsigned char *buffer, size_t size,
const char **errmsg, int *err)
{
ssize_t got;
if (lseek (descriptor, offset, SEEK_SET) < 0)
{
*errmsg = "lseek";
@@ -72,15 +70,26 @@ simple_object_internal_read (int descriptor, off_t offset,
return 0;
}
got = read (descriptor, buffer, size);
if (got < 0)
do
{
ssize_t got = read (descriptor, buffer, size);
if (got == 0)
break;
else if (got > 0)
{
buffer += got;
size -= got;
}
else if (errno != EINTR)
{
*errmsg = "read";
*err = errno;
return 0;
}
}
while (size > 0);
if ((size_t) got < size)
if (size > 0)
{
*errmsg = "file too short";
*err = 0;
@@ -98,8 +107,6 @@ simple_object_internal_write (int descriptor, off_t offset,
const unsigned char *buffer, size_t size,
const char **errmsg, int *err)
{
ssize_t wrote;
if (lseek (descriptor, offset, SEEK_SET) < 0)
{
*errmsg = "lseek";
@@ -107,15 +114,26 @@ simple_object_internal_write (int descriptor, off_t offset,
return 0;
}
wrote = write (descriptor, buffer, size);
if (wrote < 0)
do
{
ssize_t wrote = write (descriptor, buffer, size);
if (wrote == 0)
break;
else if (wrote > 0)
{
buffer += wrote;
size -= wrote;
}
else if (errno != EINTR)
{
*errmsg = "write";
*err = errno;
return 0;
}
}
while (size > 0);
if ((size_t) wrote < size)
if (size > 0)
{
*errmsg = "short write";
*err = 0;