sync to upstream sdparm svn rev 387

See ChangeLog file for pre-release sdparm-1.13 [20231023]

ChangeLog

@@ -2,7 +2,7 @@ The version number is hardcoded into sdparm.c (in a C string);
 the rpm spec file: sdparm.spec ; the debian/changelog file;
 and the configure.ac file (in the AC_INIT item).
 
-ChangeLog for pre-release sdparm-1.13 [20230808] [svn: r384]
+ChangeLog for pre-release sdparm-1.13 [20231023] [svn: r387]
   - add --json[=JO] and --js-file=JFN options
     - apart from with a real device, json output can be
       requested with --enumerate or --inhex=FN
@@ -17,15 +17,20 @@ ChangeLog for pre-release sdparm-1.13 [20230808] [svn: r384]
   - zoned block device characteristics vpd: add Zone
     alignment method and Zone starting LBA granularity
     fields [zbc2r11,zbc2r12]
+  - improve mpage descriptor handling in full pages
+    - indent all but first descriptor fields by 2 spaces
+    - use json array elements for each descriptor
   - add CAPPID bit in device-specific parameter field
+  - add ST_EN bit in IO advice hints mpage
+  - add RSCS field to Block limits ext. vpage [sbc5r5]
   - add --inner-hex option to take overloading from --hex
     - use with -j for more searchable mode page names
   - device identification VPD page: change IEEE OUI to AOI
   - act on LAST bit in App tag mpage descriptors to stop
     output of further descriptors, override this
     truncation with --flexible option
   - experimental: add NetBSD support
-  - point svn:externals to sg3_utils revision 1046
+  - point svn:externals to sg3_utils revision 1057
   - remove the imtermediate files generated by ./autogen.sh
     - this reduces size of svn and git repositories but still
       plan to have these intermediate files in release tarballs

debian/changelog

@@ -2,7 +2,7 @@ sdparm (1.13-0.1) unstable; urgency=low
 
   * see ChangeLog
 
- -- Douglas Gilbert <[email protected]>  Fri, 23 Jun 2023 22:00:00 -0400
+ -- Douglas Gilbert <[email protected]>  Mon, 23 Oct 2023 23:00:00 -0400
 
 sdparm (1.12-0.1) unstable; urgency=low
 

doc/sdparm.8

@@ -1,4 +1,4 @@
-.TH SDPARM "8" "June 2023" "sdparm\-1.13" SDPARM
+.TH SDPARM "8" "October 2023" "sdparm\-1.13" SDPARM
 .SH NAME
 sdparm \- access SCSI modes pages; read VPD pages; send simple SCSI commands
 .SH SYNOPSIS

doc/sdparm_json.8

@@ -1,4 +1,4 @@
-.TH SDPARM_JSON "8" "May 2023" "sdparm\-1.13" SDPARM
+.TH SDPARM_JSON "8" "October 2023" "sdparm\-1.13" SDPARM
 .SH NAME
 sdparm_json \- JSON output options for the sdparm utility
 .SH SYNOPSIS

include/sg_lib.h

@@ -521,6 +521,8 @@ bool sg_exit2str(int exit_status, bool longer, int b_len, char * b);
 #define SG_LIB_CAT_MISCOMPARE 14 /* sense key, probably verify
                                   *       [sk,asc,ascq: 0xe,*,*] */
 #define SG_LIB_FILE_ERROR 15    /* device or other file problem */
+#define SG_LIB_PROGRESS_NOT_READY 16 /* could be a long time ... */
+	/* [sk,asc,ascq: 0x2,0x4,<some>] (most 'in progress' variants */
 /* for 17 and 18, see below */
 #define SG_LIB_CAT_INVALID_PARAM 19 /* illegal req, invalid field in parameter
                                      * list [sk,asc,ascq: 0x5,0x26,0x0] */

inhex/sdp_io_hints.hex

@@ -0,0 +1,149 @@
+#
+# Emulated SCSI IO advice hints grouping mode page
+# within a MODE SENSE(10) response
+#
+
+# Mode parameter header(10) and block descriptor(s), llbaa=1:
+04 26 00 10 01 00 00 10  00 00 00 00 00 80 00 00
+00 00 00 00 00 00 02 00
+
+# 16 byte header, SPF=1 mode page [0xa,0x5], page length: 0x40c + 4
+4a 05 4 0c 0 0 0 0  0 0 0 0 0 0 0 0
+
+# 64 IO advice hints group descriptors
+#
+# group 0
+0 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0
+# group 1
+0 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0
+# group 2
+0 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0
+# group 3
+0 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0
+# group 4
+0 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0
+# group 5
+0 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0
+# group 6
+0 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0
+# group 7
+0 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0
+#
+# group 8
+0 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0
+# group 9
+0 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0
+# group 10
+0 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0
+# group 11
+0 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0
+# group 12
+0 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0
+# group 13
+0 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0
+# group 14
+0 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0
+# group 15
+0 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0
+#
+# group 16
+0 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0
+# group 17
+0 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0
+# group 18
+0 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0
+# group 19
+0 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0
+# group 20
+0 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0
+# group 21
+0 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0
+# group 22
+0 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0
+# group 23
+0 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0
+#
+# group 24
+0 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0
+# group 25
+0 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0
+# group 26
+0 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0
+# group 27
+0 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0
+# group 28
+0 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0
+# group 29
+0 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0
+# group 30
+0 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0
+# group 31
+0 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0
+#
+# group 32
+0 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0
+# group 33
+0 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0
+# group 34
+0 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0
+# group 35
+0 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0
+# group 36
+0 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0
+# group 37
+0 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0
+# group 38
+0 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0
+# group 39
+0 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0
+#
+# group 40
+0 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0
+# group 41
+0 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0
+# group 42
+0 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0
+# group 43
+0 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0
+# group 44
+0 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0
+# group 45
+0 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0
+# group 46
+0 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0
+# group 47
+0 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0
+#
+# group 48
+0 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0
+# group 49
+0 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0
+# group 50
+0 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0
+# group 51
+0 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0
+# group 52
+0 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0
+# group 53
+0 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0
+# group 54
+0 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0
+# group 55
+0 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0
+#
+# group 56
+0 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0
+# group 57
+0 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0
+# group 58
+0 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0
+# group 59
+0 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0
+# group 60
+0 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0
+# group 61
+0 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0
+# group 62
+0 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0
+# group 63
+0 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0

lib/Makefile.am

@@ -100,6 +100,7 @@ AM_CFLAGS = -Wall -W $(DBG_CFLAGS)
 # AM_CFLAGS = -Wall -W -pedantic -std=c++11
 # AM_CFLAGS = -Wall -W -pedantic -std=c++14
 # AM_CFLAGS = -Wall -W -pedantic -std=c++17 $(DBG_CXXFLAGS)
+# AM_CFLAGS = -Wall -W -pedantic -std=c++20 -fanalyzer $(DBG_CXXFLAGS)
 # AM_CFLAGS = -Wall -W -pedantic -std=c++20 --analyze $(DBG_CXXFLAGS)
 # AM_CFLAGS = -Wall -W -pedantic -std=c++20 $(DBG_CXXFLAGS)
 # AM_CFLAGS = -Wall -W -pedantic -std=c++23 $(DBG_CXXFLAGS)

lib/sg_cmds_basic.c

@@ -128,6 +128,7 @@ sg_cmds_process_helper(const char * leadin, int req_din_x, int act_din_x,
     case SG_LIB_CAT_MISCOMPARE:
     case SG_LIB_CAT_STANDBY:
     case SG_LIB_CAT_UNAVAILABLE:
+    case SG_LIB_PROGRESS_NOT_READY:
         n = false;
         break;
     case SG_LIB_CAT_RECOVERED: