diff options
| author | Douglas Gilbert <dgilbert@interlog.com> | 2014-04-26 05:13:33 +0000 |
|---|---|---|
| committer | Douglas Gilbert <dgilbert@interlog.com> | 2014-04-26 05:13:33 +0000 |
| commit | d43013ef6274b5797cfc340ecf0f49b7e5bce5ae (patch) | |
| tree | 9d0e560e0f135cd2530d5f9c6bf97f00fd21dceb /lib/sg_lib.c | |
| parent | e4aa6f27ed29206248d4b165d27342183321104a (diff) | |
| download | sg3_utils-d43013ef6274b5797cfc340ecf0f49b7e5bce5ae.tar.gz | |
sg_opcodes: add --mask option; sg_rbuf: add --echo option; sg_lib: fix output truncation error
git-svn-id: https://svn.bingwo.ca/repos/sg3_utils/trunk@570 6180dd3e-e324-4e3e-922d-17de1ae2f315
Diffstat (limited to 'lib/sg_lib.c')
| -rw-r--r-- | lib/sg_lib.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/lib/sg_lib.c b/lib/sg_lib.c index f5169222..fba0fd84 100644 --- a/lib/sg_lib.c +++ b/lib/sg_lib.c @@ -1280,7 +1280,7 @@ sg_get_opcode_sa_name(unsigned char cmd_byte0, int service_action, vnp = get_value_name(sg_lib_read_buff_arr, service_action, peri_type); if (vnp) - my_snprintf(buff, buff_len, "Read buffer (%s)\n", vnp->name); + my_snprintf(buff, buff_len, "Read buffer, %s", vnp->name); else my_snprintf(buff, buff_len, "Read buffer, mode=0x%x", service_action); @@ -1290,11 +1290,20 @@ sg_get_opcode_sa_name(unsigned char cmd_byte0, int service_action, vnp = get_value_name(sg_lib_write_buff_arr, service_action, peri_type); if (vnp) - my_snprintf(buff, buff_len, "Write buffer (%s)\n", vnp->name); + my_snprintf(buff, buff_len, "Write buffer, %s", vnp->name); else my_snprintf(buff, buff_len, "Write buffer, mode=0x%x", service_action); break; + case SG_SANITIZE: + vnp = get_value_name(sg_lib_sanitize_sa_arr, service_action, + peri_type); + if (vnp) + my_snprintf(buff, buff_len, "%s", vnp->name); + else + my_snprintf(buff, buff_len, "Sanitize, service action=0x%x", + service_action); + break; default: sg_get_opcode_name(cmd_byte0, peri_type, buff_len, buff); break; @@ -1430,7 +1439,7 @@ dStrHexFp(const char* str, int len, int no_ascii, FILE * fp) if (len <= 0) return; blen = (int)sizeof(buff); - formatstr = (0 == no_ascii) ? "%.76s\n" : "%.48s\n"; + formatstr = (0 == no_ascii) ? "%.76s\n" : "%.58s\n"; memset(buff, ' ', 80); buff[80] = '\0'; if (no_ascii < 0) { |