diff options
| author | Douglas Gilbert <dgilbert@interlog.com> | 2019-12-27 18:18:48 +0000 |
|---|---|---|
| committer | Douglas Gilbert <dgilbert@interlog.com> | 2019-12-27 18:18:48 +0000 |
| commit | 660ac667940dc7bb188b4e2d0ec9c7f2dd444fc0 (patch) | |
| tree | d8a0e36993244d7797f3ab593b0b1945980b8d23 /src/sg_rbuf.c | |
| parent | 4b4f37348b25f04b6f2f898aeebc6f5246e56831 (diff) | |
| download | sg3_utils-660ac667940dc7bb188b4e2d0ec9c7f2dd444fc0.tar.gz | |
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
Diffstat (limited to 'src/sg_rbuf.c')
| -rw-r--r-- | src/sg_rbuf.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/sg_rbuf.c b/src/sg_rbuf.c index 2f5229f0..760129d8 100644 --- a/src/sg_rbuf.c +++ b/src/sg_rbuf.c @@ -57,7 +57,7 @@ #endif -static const char * version_str = "5.06 20190913"; +static const char * version_str = "5.07 20191226"; static struct option long_options[] = { {"buffer", required_argument, 0, 'b'}, @@ -359,7 +359,7 @@ main(int argc, char * argv[]) bool clear = true; #endif bool dio_incomplete = false; - int sg_fd, res, j, err; + int sg_fd, res, err; int buf_capacity = 0; int buf_size = 0; size_t psz; @@ -451,11 +451,11 @@ main(int argc, char * argv[]) io_hdr.sbp = sense_buffer; io_hdr.timeout = 60000; /* 60000 millisecs == 60 seconds */ if (op->verbose) { - pr2serr(" Read buffer (%sdescriptor) cdb: ", - (op->do_echo ? "echo " : "")); - for (k = 0; k < RB_CMD_LEN; ++k) - pr2serr("%02x ", rb_cdb[k]); - pr2serr("\n"); + char b[128]; + + pr2serr(" Read buffer (%sdescriptor) cdb: %s\n", + (op->do_echo ? "echo " : ""), + sg_get_command_str(rb_cdb, RB_CMD_LEN, false, sizeof(b), b)); } /* do normal IO to find RB size (not dio or mmap-ed at this stage) */ @@ -587,13 +587,13 @@ main(int argc, char * argv[]) else if (op->do_quick) io_hdr.flags |= SG_FLAG_NO_DXFER; if (op->verbose > 1) { - pr2serr(" Read buffer (%sdata) cdb: ", - (op->do_echo ? "echo " : "")); - for (j = 0; j < RB_CMD_LEN; ++j) - pr2serr("%02x ", rb_cdb[j]); - pr2serr("\n"); - } + char b[128]; + pr2serr(" Read buffer (%sdata) cdb: %s\n", + (op->do_echo ? "echo " : ""), + sg_get_command_str(rb_cdb, RB_CMD_LEN, false, + sizeof(b), b)); + } if (ioctl(sg_fd, SG_IO, &io_hdr) < 0) { if (ENOMEM == errno) { pr2serr("SG_IO data: out of memory, try a smaller buffer " |