Merge upstream.

This commit is contained in:
Oliver Jowett 2014-10-01 12:05:04 +01:00
commit 9691e7bf79
4 changed files with 10 additions and 7 deletions

View file

@ -838,7 +838,7 @@ int main(int argc, char **argv) {
} else {
if (Modes.filename[0] == '-' && Modes.filename[1] == '\0') {
Modes.fd = STDIN_FILENO;
} else if ((Modes.fd = open(Modes.filename,O_RDONLY)) == -1) {
} else if ((Modes.fd = open(Modes.filename, (O_RDONLY | O_BINARY))) == -1) {
perror("Opening data file");
exit(1);
}