diff options
author | Douglas Gilbert <dgilbert@interlog.com> | 2021-10-01 16:24:37 +0000 |
---|---|---|
committer | Douglas Gilbert <dgilbert@interlog.com> | 2021-10-01 16:24:37 +0000 |
commit | c1ce6d6c5f3f64038e17dfd65380aa728c5d994d (patch) | |
tree | caa5d29c5efc7f8e60ff1683c0dff408dbe7be64 /src | |
parent | 20704a875ab548d2861227256ed4ba9b068aa0ac (diff) | |
download | sg3_utils-c1ce6d6c5f3f64038e17dfd65380aa728c5d994d.tar.gz |
sg_requests: fix bug in output
git-svn-id: https://svn.bingwo.ca/repos/sg3_utils/trunk@915 6180dd3e-e324-4e3e-922d-17de1ae2f315
Diffstat (limited to 'src')
-rw-r--r-- | src/sg_decode_sense.c | 13 | ||||
-rw-r--r-- | src/sg_requests.c | 4 |
2 files changed, 9 insertions, 8 deletions
diff --git a/src/sg_decode_sense.c b/src/sg_decode_sense.c index 18b4ef6e..e3db2094 100644 --- a/src/sg_decode_sense.c +++ b/src/sg_decode_sense.c @@ -30,7 +30,7 @@ #include "sg_unaligned.h" -static const char * version_str = "1.22 20210610"; +static const char * version_str = "1.23 20211001"; #define MAX_SENSE_LEN 1024 /* max descriptor format actually: 255+8 */ @@ -282,7 +282,7 @@ write2wfn(FILE * fp, struct opts_t * op) int main(int argc, char *argv[]) { - int k, err; + int k, err, blen; int ret = 0; unsigned int ui; size_t s; @@ -293,8 +293,9 @@ main(int argc, char *argv[]) struct opts_t opts; op = &opts; + blen = sizeof(b); memset(op, 0, sizeof(opts)); - memset(b, 0, sizeof(b)); + memset(b, 0, blen); ret = parse_cmd_line(op, argc, argv); #ifdef DEBUG @@ -339,7 +340,7 @@ main(int argc, char *argv[]) } if (op->do_status) { - sg_get_scsi_status_str(op->sstatus, sizeof(b) - 1, b); + sg_get_scsi_status_str(op->sstatus, blen, b); printf("SCSI status: %s\n", b); } @@ -421,10 +422,10 @@ main(int argc, char *argv[]) sa = op->sense[1] & 0x1f; else sa = 0; - sg_get_opcode_sa_name(opcode, sa, 0, sizeof(b), b); + sg_get_opcode_sa_name(opcode, sa, 0, blen, b); } else sg_get_sense_str(NULL, op->sense, op->sense_len, - op->verbose, sizeof(b) - 1, b); + op->verbose, blen, b); printf("%s\n", b); } fini: diff --git a/src/sg_requests.c b/src/sg_requests.c index 99e42dd9..a0afd365 100644 --- a/src/sg_requests.c +++ b/src/sg_requests.c @@ -34,7 +34,7 @@ * This program issues the SCSI command REQUEST SENSE to the given SCSI device. */ -static const char * version_str = "1.37 20210830"; +static const char * version_str = "1.38 20211001"; #define MAX_REQS_RESP_LEN 255 #define DEF_REQS_RESP_LEN 252 @@ -478,7 +478,7 @@ main(int argc, char * argv[]) sg_get_sense_str(NULL, rsBuff, act_din_len, false, sizeof(bb), bb); - pr2serr("data-in decoded as sense:\n%s\n", b); + pr2serr("data-in decoded as sense:\n%s\n", bb); } } } |