From: Christian Lamparter <chunkeey@googlemail.com>
Date: Mon, 30 Aug 2010 04:05:06 +0000 (+0200)
Subject: carl9170 firmware tools: fix crash if source is a directory
X-Git-Tag: 1.8.8.1~1
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=aed989a12b5cea537e40b7a5d2e7ee92385d2f3f;p=carl9170fw.git

carl9170 firmware tools: fix crash if source is a directory

The tools will no longer crash if the "firmware" file is
a directory.

Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
---

diff --git a/tools/lib/carlfw.c b/tools/lib/carlfw.c
index de94221..694e8d8 100644
--- a/tools/lib/carlfw.c
+++ b/tools/lib/carlfw.c
@@ -170,7 +170,7 @@ static int __carlfw_load(struct carlfw_file *file, const char *name, const char
 
 	err = fread(file->data, file->len, 1, fh);
 	if (err != 1)
-		return ferror(fh);
+		return -ferror(fh);
 
 	file->name = strdup(name);
 	fclose(fh);
@@ -563,14 +563,14 @@ int carlfw_store(struct carlfw *fw)
 
 		err = fwrite(iter->data, elen, 1, fh);
 		if (err != 1) {
-			err = ferror(fh);
+			err = -ferror(fh);
 			goto close_out;
 		}
 	}
 
 	err = fwrite(&last_desc, sizeof(last_desc), 1, fh);
 	if (err != 1) {
-		err = ferror(fh);
+		err = -ferror(fh);
 		goto close_out;
 	}