forked from lix-project/lix
* Fix handling of pipes (read(2) may not return the required
number of bytes in one call).
This commit is contained in:
parent
822c072cfa
commit
c834a5c597
12
src/nix.cc
12
src/nix.cc
|
@ -250,11 +250,13 @@ struct StdinSource : RestoreSource
|
||||||
{
|
{
|
||||||
virtual void operator () (const unsigned char * data, unsigned int len)
|
virtual void operator () (const unsigned char * data, unsigned int len)
|
||||||
{
|
{
|
||||||
ssize_t res = read(STDIN_FILENO, (char *) data, len);
|
while (len) {
|
||||||
if (res == -1)
|
ssize_t res = read(STDIN_FILENO, (char *) data, len);
|
||||||
throw SysError("reading from stdin");
|
if (res == -1) throw SysError("reading from stdin");
|
||||||
if (res != (ssize_t) len)
|
if (res == 0) throw SysError("unexpected end-of-file on stdin");
|
||||||
throw Error("not enough data available on stdin");
|
len -= res;
|
||||||
|
data += res;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue