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

1 files changed, 31 insertions, 8 deletions

diff --git a/src/sg_get_config.c b/src/sg_get_config.c
index 3c5db7d1..28af720a 100644
--- a/src/sg_get_config.c
+++ b/src/sg_get_config.c
@@ -31,7 +31,7 @@
 
 */
 
-static const char * version_str = "0.48 20180510";    /* mmc6r02 */
+static const char * version_str = "0.49 20180626";    /* mmc6r02 */
 
 #define MX_ALLOC_LEN 8192
 #define NAME_BUFF_SZ 64
@@ -947,17 +947,19 @@ list_known(bool brief)
 int
 main(int argc, char * argv[])
 {
+    bool brief = false;
+    bool inner_hex = false;
+    bool list = false;
+    bool do_raw = false;
+    bool readonly = false;
+    bool verbose_given = false;
+    bool version_given = false;
     int sg_fd, res, c, len;
     int peri_type = 0;
     int rt = 0;
     int starting = 0;
     int verbose = 0;
-    bool brief = false;
     int do_hex = 0;
-    bool inner_hex = false;
-    bool list = false;
-    bool do_raw = false;
-    bool readonly = false;
     const char * device_name = NULL;
     char buff[64];
     const char * cp;
@@ -1013,11 +1015,12 @@ main(int argc, char * argv[])
             }
             break;
         case 'v':
+            verbose_given = true;
             ++verbose;
             break;
         case 'V':
-            pr2serr(ME "version: %s\n", version_str);
-            return 0;
+            version_given = true;
+            break;
         default:
             pr2serr("unrecognised option code 0x%x ??\n", c);
             usage();
@@ -1036,6 +1039,26 @@ 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;
+        verbose = 0;
+    } else if (! verbose_given) {
+        pr2serr("set '-vv'\n");
+        verbose = 2;
+    } else
+        pr2serr("keep verbose=%d\n", verbose);
+#else
+    if (verbose_given && version_given)
+        pr2serr("Not in DEBUG mode, so '-vV' has no special action\n");
+#endif
+    if (version_given) {
+        pr2serr(ME "version: %s\n", version_str);
+        return 0;
+    }
 
     if (list) {
         list_known(brief);