diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | sg3_utils.spec | 2 | ||||
| -rw-r--r-- | src/sg_requests.c | 12 |
4 files changed, 12 insertions, 6 deletions
@@ -2,7 +2,7 @@ Each utility has its own version number, date of last change and some description at the top of its ".c" file. All utilities in the main directory have their own "man" pages. There is also a sg3_utils man page. -Changelog for released sg3_utils-1.46 [20210328] [svn: r887] +Changelog for released sg3_utils-1.46 [20210329] [svn: r891] - sg_rep_pip: new utility: report provisioning initialization pattern command - sg_turs: estimated time-to-ready [spc6r03] diff --git a/debian/changelog b/debian/changelog index f2c6eb08..0461543a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,7 @@ sg3-utils (1.46-0.1) unstable; urgency=low * New upstream version - -- Douglas Gilbert <dgilbert@interlog.com> Sun, 28 Mar 2021 18:00:00 -0400 + -- Douglas Gilbert <dgilbert@interlog.com> Mon, 29 Mar 2021 01:00:00 -0400 sg3-utils (1.45-0.1) unstable; urgency=low diff --git a/sg3_utils.spec b/sg3_utils.spec index 1df98afb..b3bc264b 100644 --- a/sg3_utils.spec +++ b/sg3_utils.spec @@ -84,7 +84,7 @@ fi %{_libdir}/*.la %changelog -* Sun Mar 28 2021 - dgilbert at interlog dot com +* Mon Mar 29 2021 - dgilbert at interlog dot com - track t10 changes * sg3_utils-1.46 diff --git a/src/sg_requests.c b/src/sg_requests.c index 37ce1668..fbb56cab 100644 --- a/src/sg_requests.c +++ b/src/sg_requests.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2020 Douglas Gilbert. + * Copyright (c) 2004-2021 Douglas Gilbert. * All rights reserved. * Use of this source code is governed by a BSD-style * license that can be found in the BSD_LICENSE file. @@ -34,7 +34,7 @@ * This program issues the SCSI command REQUEST SENSE to the given SCSI device. */ -static const char * version_str = "1.35 20200723"; +static const char * version_str = "1.36 20210329"; #define MAX_REQS_RESP_LEN 255 #define DEF_REQS_RESP_LEN 252 @@ -270,7 +270,13 @@ main(int argc, char * argv[]) } if (do_raw || do_hex) { not_raw_hex = false; - if (do_progress || do_time) { +#ifdef SG_LIB_MINGW + bool prog_time = do_progress; +#else + bool prog_time = do_progress || do_time; +#endif + + if (prog_time) { pr2serr("With either --raw or --hex, --progress and --time " "contradict\n"); ret = SG_LIB_CONTRADICT; |