From 660ac667940dc7bb188b4e2d0ec9c7f2dd444fc0 Mon Sep 17 00:00:00 2001 From: Douglas Gilbert Date: Fri, 27 Dec 2019 18:18:48 +0000 Subject: sg_lib: add sg_get_command_str() and sg_print_command_len(); sg_verify+sg_write_same: fix and --ff option; sg_dd+sgh_dd: add --verify support git-svn-id: https://svn.bingwo.ca/repos/sg3_utils/trunk@837 6180dd3e-e324-4e3e-922d-17de1ae2f315 --- src/sg_sanitize.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/sg_sanitize.c') diff --git a/src/sg_sanitize.c b/src/sg_sanitize.c index b4a10682..00d6b59d 100644 --- a/src/sg_sanitize.c +++ b/src/sg_sanitize.c @@ -33,7 +33,7 @@ #include "sg_unaligned.h" #include "sg_pr2serr.h" -static const char * version_str = "1.13 20190913"; +static const char * version_str = "1.14 20191220"; /* Not all environments support the Unix sleep() */ #if defined(MSC_VER) || defined(__MINGW32__) @@ -183,7 +183,7 @@ do_sanitize(int sg_fd, const struct opts_t * op, const void * param_lstp, int param_lst_len) { bool immed; - int k, ret, res, sense_cat, timeout; + int ret, res, sense_cat, timeout; uint8_t san_cdb[SANITIZE_OP_LEN]; uint8_t sense_b[SENSE_BUFF_LEN]; struct sg_pt_base * ptvp; @@ -217,10 +217,11 @@ do_sanitize(int sg_fd, const struct opts_t * op, const void * param_lstp, sg_put_unaligned_be16((uint16_t)param_lst_len, san_cdb + 7); if (op->verbose > 1) { - pr2serr(" Sanitize cdb: "); - for (k = 0; k < SANITIZE_OP_LEN; ++k) - pr2serr("%02x ", san_cdb[k]); - pr2serr("\n"); + char b[128]; + + pr2serr(" Sanitize cdb: %s\n", + sg_get_command_str(san_cdb, SANITIZE_OP_LEN, false, + sizeof(b), b)); if (op->verbose > 2) { if (param_lst_len > 0) { pr2serr(" Parameter list contents:\n"); -- cgit v1.2.3