diff options
| author | Douglas Gilbert <dgilbert@interlog.com> | 2018-06-29 09:46:13 +0000 |
|---|---|---|
| committer | Douglas Gilbert <dgilbert@interlog.com> | 2018-06-29 09:46:13 +0000 |
| commit | 3ef8550a26c95c97f9fdc4ef249a5767fd573e7a (patch) | |
| tree | ae1e82f2ff36a06a02184a3eeb19cffe217fcb2f /src/sg_vpd.c | |
| parent | 11f6f1f439415e57696f473b1475f190018741c7 (diff) | |
| download | sg3_utils-3ef8550a26c95c97f9fdc4ef249a5767fd573e7a.tar.gz | |
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
Diffstat (limited to 'src/sg_vpd.c')
| -rw-r--r-- | src/sg_vpd.c | 31 |
1 files changed, 28 insertions, 3 deletions
diff --git a/src/sg_vpd.c b/src/sg_vpd.c index 1056c0c9..35233747 100644 --- a/src/sg_vpd.c +++ b/src/sg_vpd.c @@ -38,7 +38,7 @@ */ -static const char * version_str = "1.44 20180528"; /* spc5r19 + sbc4r15 */ +static const char * version_str = "1.45 20180628"; /* spc5r19 + sbc4r15 */ /* standard VPD pages, in ascending page number order */ #define VPD_SUPPORTED_VPDS 0x0 @@ -109,6 +109,8 @@ struct opts_t { bool do_force; bool do_long; bool do_quiet; + bool verbose_given; + bool version_given; int do_hex; int vpd_pn; int do_ident; @@ -3688,11 +3690,12 @@ main(int argc, char * argv[]) ++op->do_raw; break; case 'v': + op->verbose_given = true; ++op->verbose; break; case 'V': - pr2serr("version: %s\n", version_str); - return 0; + op->version_given = true; + break; default: pr2serr("unrecognised option code 0x%x ??\n", c); usage(); @@ -3711,6 +3714,28 @@ main(int argc, char * argv[]) return SG_LIB_SYNTAX_ERROR; } } + +#ifdef DEBUG + pr2serr("In DEBUG mode, "); + if (op->verbose_given && op->version_given) { + pr2serr("but override: '-vV' given, zero verbose and continue\n"); + op->verbose_given = false; + op->version_given = false; + op->verbose = 0; + } else if (! op->verbose_given) { + pr2serr("set '-vv'\n"); + op->verbose = 2; + } else + pr2serr("keep verbose=%d\n", op->verbose); +#else + if (op->verbose_given && op->version_given) + pr2serr("Not in DEBUG mode, so '-vV' has no special action\n"); +#endif + if (op->version_given) { + pr2serr("version: %s\n", version_str); + return 0; + } + if (op->do_enum) { if (op->device_name) pr2serr("Device name %s ignored when --enumerate given\n", |