From 3ef8550a26c95c97f9fdc4ef249a5767fd573e7a Mon Sep 17 00:00:00 2001
From: Douglas Gilbert <dgilbert@interlog.com>
Date: Fri, 29 Jun 2018 09:46:13 +0000
Subject: sg_opcode: support MLU, Multiple Logical Units (18-045r1); sg_lib:
 sg_simple_inquiry_pt(); ./configure: option --enable-debug added for testing

git-svn-id: https://svn.bingwo.ca/repos/sg3_utils/trunk@779 6180dd3e-e324-4e3e-922d-17de1ae2f315
---
 src/sg_unmap.c | 33 +++++++++++++++++++++++++++++----
 1 file changed, 29 insertions(+), 4 deletions(-)

(limited to 'src/sg_unmap.c')

diff --git a/src/sg_unmap.c b/src/sg_unmap.c
index 8451c468..726eb239 100644
--- a/src/sg_unmap.c
+++ b/src/sg_unmap.c
@@ -44,7 +44,7 @@
  * logical blocks. Note that DATA MAY BE LOST.
  */
 
-static const char * version_str = "1.16 20180523";
+static const char * version_str = "1.17 20180628";
 
 
 #define DEF_TIMEOUT_SECS 60
@@ -360,8 +360,10 @@ main(int argc, char * argv[])
 {
     bool anchor = false;
     bool do_force = false;
-    bool err_printed = false;
     bool dry_run = false;
+    bool err_printed = false;
+    bool verbose_given = false;
+    bool version_given = false;
     int res, c, num, k, j;
     int sg_fd = -1;
     int grpnum = 0;
@@ -467,11 +469,12 @@ main(int argc, char * argv[])
                 timeout = DEF_TIMEOUT_SECS;
             break;
         case 'v':
+            verbose_given = true;
             ++vb;
             break;
         case 'V':
-            pr2serr("version: %s\n", version_str);
-            return 0;
+            version_given = true;
+            break;
         default:
             pr2serr("unrecognised option code 0x%x ??\n", c);
             usage();
@@ -490,6 +493,28 @@ main(int argc, char * argv[])
             return SG_LIB_SYNTAX_ERROR;
         }
     }
+
+#ifdef DEBUG
+    pr2serr("In DEBUG mode, ");
+    if (verbose_given && version_given) {
+        pr2serr("but override: '-vV' given, zero verbose and continue\n");
+        verbose_given = false;
+        version_given = false;
+        vb = 0;
+    } else if (! verbose_given) {
+        pr2serr("set '-vv'\n");
+        vb = 2;
+    } else
+        pr2serr("keep verbose=%d\n", vb);
+#else
+    if (verbose_given && version_given)
+        pr2serr("Not in DEBUG mode, so '-vV' has no special action\n");
+#endif
+    if (version_given) {
+        pr2serr("version: %s\n", version_str);
+        return 0;
+    }
+
     if (NULL == device_name) {
         pr2serr("missing device name!\n\n");
         usage();
-- 
cgit v1.2.3