From: Richard Titmuss <richard_titmuss@logitech.com>
Date: Tue, 23 Sep 2008 20:32:10 +0000 (+0100)
Subject: ubinize: allow an absent 'image' in the ubinize configuration.
X-Git-Tag: v1.3.0~129
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d92356a3823632812b1094aead137cda827ff42e;p=mtd-utils.git

ubinize: allow an absent 'image' in the ubinize configuration.

Some recent changes to ubinize prevent the 'image' parameter from being
absent in the configuration file. The following patch fixes that.

Signed-off-by: Richard Titmuss <richard.titmuss@logitech.com>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
---

diff --git a/ubi-utils/new-utils/src/ubinize.c b/ubi-utils/new-utils/src/ubinize.c
index 5115db3..ebd5aa0 100644
--- a/ubi-utils/new-utils/src/ubinize.c
+++ b/ubi-utils/new-utils/src/ubinize.c
@@ -561,20 +561,22 @@ int main(int argc, char * const argv[])
 			goto out_free;
 		}
 
-		fd = open(img, O_RDONLY);
-		if (fd == -1) {
-			sys_errmsg("cannot open \"%s\"", img);
-			goto out_free;
-		}
+		if (img) {
+			fd = open(img, O_RDONLY);
+			if (fd == -1) {
+				sys_errmsg("cannot open \"%s\"", img);
+				goto out_free;
+			}
 
-		verbose(args.verbose, "writing volume %d", vi[i].id);
-		verbose(args.verbose, "image file: %s", img);
+			verbose(args.verbose, "writing volume %d", vi[i].id);
+			verbose(args.verbose, "image file: %s", img);
 
-		err = ubigen_write_volume(&ui, &vi[i], args.ec, st.st_size, fd, args.out_fd);
-		close(fd);
-		if (err) {
-			errmsg("cannot write volume for section \"%s\"", sname);
-			goto out_free;
+			err = ubigen_write_volume(&ui, &vi[i], args.ec, st.st_size, fd, args.out_fd);
+			close(fd);
+			if (err) {
+				errmsg("cannot write volume for section \"%s\"", sname);
+				goto out_free;
+			}
 		}
 
 		if (args.verbose)