diff options
| author | Douglas Gilbert <dgilbert@interlog.com> | 2022-10-28 16:35:35 +0000 |
|---|---|---|
| committer | Douglas Gilbert <dgilbert@interlog.com> | 2022-10-28 16:35:35 +0000 |
| commit | 7b73fc26be3892abf1e91243cd107ff5bcef4a0b (patch) | |
| tree | d8736cd8dc278c94fc559e3957fc5c19d42ce61f /src | |
| parent | 7ce49e15a453f598ce6cc08933c5d961dcf86b46 (diff) | |
| download | sg3_utils-7b73fc26be3892abf1e91243cd107ff5bcef4a0b.tar.gz | |
sg_stream_ctl: --get fix better; sg_rem_rest_elem: cleanup
git-svn-id: https://svn.bingwo.ca/repos/sg3_utils/trunk@977 6180dd3e-e324-4e3e-922d-17de1ae2f315
Diffstat (limited to 'src')
| -rw-r--r-- | src/sg_rem_rest_elem.c | 24 | ||||
| -rw-r--r-- | src/sg_stream_ctl.c | 4 |
2 files changed, 21 insertions, 7 deletions
diff --git a/src/sg_rem_rest_elem.c b/src/sg_rem_rest_elem.c index c2ed6012..eae79798 100644 --- a/src/sg_rem_rest_elem.c +++ b/src/sg_rem_rest_elem.c @@ -37,7 +37,7 @@ * - RESTORE ELEMENTS AND REBUILD */ -static const char * version_str = "1.00 20220610"; +static const char * version_str = "1.01 20221027"; #define REMOVE_ELEM_SA 0x18 #define RESTORE_ELEMS_SA 0x19 @@ -68,9 +68,9 @@ usage() pr2serr("Usage: " "sg_rem_rest_elem [--capacity=RC] [--element=EID] [--help] " "[--quick]\n" - " [--remove] [--restore] [--verbose] " + " [--remove] [--restore] [--verbose] " "[--version]\n" - " DEVICE\n"); + " DEVICE\n"); pr2serr(" where:\n" " --capacity=RC|-c RC RC is requested capacity (unit: " "block; def: 0)\n" @@ -283,8 +283,22 @@ main(int argc, char * argv[]) ret = sg_convert_errno(err); goto fini; } - if (! quick) - sg_warn_and_wait(cmd_name, device_name, false); + if (! quick) { + int k; + char b[80] SG_C_CPP_ZERO_INIT; + char ch; + + for (k = 0; k < (int)sizeof(b) - 1; ++k) { + ch = cmd_name[k]; + if ('\0' == ch) + break; + else if (islower(ch)) + b[k] = toupper(ch); + else + b[k] = ch; + } + sg_warn_and_wait(b, device_name, false); + } res = sg_ll_rem_rest_elem(sg_fd, sa, req_cap, e_id, true, verbose); ret = res; diff --git a/src/sg_stream_ctl.c b/src/sg_stream_ctl.c index 1f353e96..77f78eb6 100644 --- a/src/sg_stream_ctl.c +++ b/src/sg_stream_ctl.c @@ -35,7 +35,7 @@ * to the given SCSI device. Based on sbc4r15.pdf . */ -static const char * version_str = "1.12 20221026"; +static const char * version_str = "1.13 20221028"; #define STREAM_CONTROL_SA 0x14 #define GET_STREAM_STATUS_SA 0x16 @@ -457,7 +457,7 @@ main(int argc, char * argv[]) printf("Number of open streams: %u\n", num_streams); } maxlen = ((uint32_t)maxlen < param_dl) ? maxlen : (int)param_dl; - for (k = 8; k < (maxlen - 8); k += 8) { + for (k = 8; k < maxlen; k += 8) { stream_id = sg_get_unaligned_be16(arr + k + 2); if (do_brief) printf("%u\n", stream_id); |