From 511bab97aa31b60fa00a4d96398db331a511046c Mon Sep 17 00:00:00 2001
From: Lucjan Bryndza <lucjan.bryndza@mudita.com>
Date: Fri, 4 Jun 2021 09:36:30 +0200
Subject: [PATCH] [EGD-6897] Add force flag to the pureflash

On some devices like ESCSI minor device id is not
properly recognized.
This patch add --force flag for skip checking minor
device numbers (partitions).

Signed-off-by: Lucjan Bryndza <lucjan.bryndza@mudita.com>
---
 host-tools/pure-flash/pure-flash.c | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/host-tools/pure-flash/pure-flash.c b/host-tools/pure-flash/pure-flash.c
index b09c929e9..2fe51c956 100644
--- a/host-tools/pure-flash/pure-flash.c
+++ b/host-tools/pure-flash/pure-flash.c
@@ -7,6 +7,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
+#include <stdbool.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -19,7 +20,8 @@
 
 static void syntax(char **argv)
 {
-    fprintf(stderr, "%s [filename] [blkdev]\n", argv[0]);
+    fprintf(stderr, "%s [--force] filename blkdev\n", argv[0]);
+    fprintf(stderr, "\t--force Skip check partitons (optional)\n");
 }
 
 static struct fiemap *read_fiemap(int fd)
@@ -223,7 +225,7 @@ static int verify_image(const char *image_file, const char *block_device)
     return (result ? EXIT_FAILURE : EXIT_SUCCESS);
 }
 
-static int write_image(const char *image_file, const char *block_device)
+static int write_image(const char *image_file, const char *block_device, bool force)
 {
     struct stat sbuf;
     if (stat(image_file, &sbuf)) {
@@ -242,7 +244,7 @@ static int write_image(const char *image_file, const char *block_device)
         fprintf(stderr, "Error: %s is not a block device\n", block_device);
         return EXIT_FAILURE;
     }
-    if (gnu_dev_minor(sbuf.st_rdev)) {
+    if (gnu_dev_minor(sbuf.st_rdev) && !force) {
         fprintf(stderr, "Error: %s is partition device not a disc\n", block_device);
         fprintf(stderr, "Please specify disk device instead of a partition\n");
         return EXIT_FAILURE;
@@ -307,14 +309,26 @@ static int write_image(const char *image_file, const char *block_device)
 
 int main(int argc, char **argv)
 {
-    if (argc < 3) {
+    const char *img_file, *blk_dev;
+    bool force;
+    if (argc == 4 && !strcmp(argv[1], "--force")) {
+        force    = true;
+        img_file = argv[2];
+        blk_dev  = argv[3];
+    }
+    else if (argc == 3) {
+        force    = false;
+        img_file = argv[1];
+        blk_dev  = argv[2];
+    }
+    else {
         syntax(argv);
         return EXIT_FAILURE;
     }
-    if (write_image(argv[1], argv[2])) {
+    if (write_image(img_file, blk_dev, force)) {
         return EXIT_FAILURE;
     }
-    int result = verify_image(argv[1], argv[2]);
-    fprintf(stderr, "Write image %s to %s %s\n", argv[1], argv[2], result ? "FAILED" : "SUCCESS");
+    int result = verify_image(img_file, blk_dev);
+    fprintf(stderr, "Write image %s to %s %s\n", img_file, blk_dev, result ? "FAILED" : "SUCCESS");
     return result;
 }