Commit 40e7b3ce authored by André Przywara's avatar André Przywara Committed by Tom Rini
Browse files

tools: mkenvimage: Fix reading from slow pipe



It is perfectly fine for the read(2) syscall to return with less than
the requested number of bytes read (short read, see the "RETURN VALUE"
section of the man page). This typically happens with slow input
(keyboard, network) or with complex pipes.

So far mkenvimage expects the exact number of requested bytes to be
read, assuming an end-of-file condition otherwise. This wrong behaviour
can be easily shown with:
$ (echo "foo=bar"; sleep 1; echo "bar=baz") | mkenvimage -s 256 -o out -
The second line will be missing from the output.

Correct this by checking for any positive, non-zero return value.

This fixes a problem with a complex pipe in one of my scripts, where
the environment consist of two parts.
Signed-off-by: André Przywara's avatarAndre Przywara <andre.przywara@arm.com>
Acked-by: Alexander Dahl's avatarAlexander Dahl <ada@thorsis.com>
parent bdfc9e8a
......@@ -173,8 +173,7 @@ int main(int argc, char **argv)
return EXIT_FAILURE;
}
filesize += readbytes;
} while (readbytes == readlen);
} while (readbytes > 0);
} else {
txt_filename = argv[optind];
txt_fd = open(txt_filename, O_RDONLY);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment