2014-04-01 Richard Biener <rguenther@suse.de>
libiberty/ * simple-object.c (simple_object_internal_write): Handle EINTR and short writes. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@208972 138bc75d-0d04-0410-961f-82ee72b054a4
This commit is contained in:
parent
81ad11e32c
commit
c3c3c691f2
2 changed files with 22 additions and 8 deletions
|
@ -1,3 +1,8 @@
|
|||
2014-04-01 Richard Biener <rguenther@suse.de>
|
||||
|
||||
* simple-object.c (simple_object_internal_write): Handle
|
||||
EINTR and short writes.
|
||||
|
||||
2014-03-28 Richard Biener <rguenther@suse.de>
|
||||
|
||||
* simple-object.c (simple_object_internal_read): Handle
|
||||
|
|
|
@ -107,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";
|
||||
|
@ -116,15 +114,26 @@ simple_object_internal_write (int descriptor, off_t offset,
|
|||
return 0;
|
||||
}
|
||||
|
||||
wrote = write (descriptor, buffer, size);
|
||||
if (wrote < 0)
|
||||
do
|
||||
{
|
||||
*errmsg = "write";
|
||||
*err = errno;
|
||||
return 0;
|
||||
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;
|
||||
|
|
Loading…
Reference in a new issue