From 6a15eb2350426d285130e4c9d84c0bdb6575547a Mon Sep 17 00:00:00 2001 From: David Gibson Date: Sat, 4 Jan 2014 10:04:19 +1100 Subject: Die on failed /incbin/ seeks Failing to open an input file, with /include/ or /incbin/ is treated as immediately fatal inside srcfile_relative_open(). However, filing to seek() to the requested offset in an /incbin/ is not. This is a bit oddly inconsistent, and leaves us with a strange case that's awkward to deal with down the line. So, get rid of it and have failed seeks on an /incbin/ be immediately fatal. Signed-off-by: David Gibson --- dtc-parser.y | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'dtc-parser.y') diff --git a/dtc-parser.y b/dtc-parser.y index efe81dd..bed857e 100644 --- a/dtc-parser.y +++ b/dtc-parser.y @@ -226,10 +226,9 @@ propdata: if ($6 != 0) if (fseek(f, $6, SEEK_SET) != 0) - print_error("Couldn't seek to offset %llu in \"%s\": %s", - (unsigned long long)$6, - $4.val, - strerror(errno)); + die("Couldn't seek to offset %llu in \"%s\": %s", + (unsigned long long)$6, $4.val, + strerror(errno)); d = data_copy_file(f, $8); -- cgit v1.1