package/mtd/0001-mtd-utils-ubinize-Always-return-error-code-at-least-.patch

   1 From 5f50207231414bfdbac8f0f974a2824f24177d6e Mon Sep 17 00:00:00 2001
   2 From: Enrico Jorns <ejo@pengutronix.de>
   3 Date: Fri, 11 Sep 2015 15:28:13 +0200
   4 Subject: [PATCH] mtd-utils: ubinize: Always return error code (at least -1) in
   5  case of an error
   6
   7 ubinize should not fail silenty, this can be very annoying when using
   8 it from other tools that rely on the exit code for determining the
   9 success of their operation.
  10
  11 Signed-off-by: Enrico Jorns <ejo@pengutronix.de>
  12 Signed-off-by: Brian Norris <computersforpeace@gmail.com>
  13 Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
  14 ---
  15  ubi-utils/ubinize.c | 5 +++++
  16  1 file changed, 5 insertions(+)
  17
  18 diff --git a/ubi-utils/ubinize.c b/ubi-utils/ubinize.c
  19 index 34f465a..60bbd9a 100644
  20 --- a/ubi-utils/ubinize.c
  21 +++ b/ubi-utils/ubinize.c
  22 @@ -519,6 +519,7 @@ int main(int argc, char * const argv[])
  23          */
  24         seek = ui.peb_size * 2;
  25         if (lseek(args.out_fd, seek, SEEK_SET) != seek) {
  26 +               err = -1;
  27                 sys_errmsg("cannot seek file \"%s\"", args.f_out);
  28                 goto out_free;
  29         }
  30 @@ -530,6 +531,7 @@ int main(int argc, char * const argv[])
  31                 int fd, j;
  32
  33                 if (!sname) {
  34 +                       err = -1;
  35                         errmsg("ini-file parsing error (iniparser_getsecname)");
  36                         goto out_free;
  37                 }
  38 @@ -550,6 +552,7 @@ int main(int argc, char * const argv[])
  39                  */
  40                 for (j = 0; j < i; j++) {
  41                         if (vi[i].id == vi[j].id) {
  42 +                               err = -1;
  43                                 errmsg("volume IDs must be unique, but ID %d "
  44                                        "in section \"%s\" is not",
  45                                        vi[i].id, sname);
  46 @@ -557,6 +560,7 @@ int main(int argc, char * const argv[])
  47                         }
  48
  49                         if (!strcmp(vi[i].name, vi[j].name)) {
  50 +                               err = -1;
  51                                 errmsg("volume name must be unique, but name "
  52                                        "\"%s\" in section \"%s\" is not",
  53                                        vi[i].name, sname);
  54 @@ -580,6 +584,7 @@ int main(int argc, char * const argv[])
  55                 if (img) {
  56                         fd = open(img, O_RDONLY);
  57                         if (fd == -1) {
  58 +                               err = fd;
  59                                 sys_errmsg("cannot open \"%s\"", img);
  60                                 goto out_free;
  61                         }
  62 --
  63 1.9.1
  64