Merge ~rafaeldtinoco/ubuntu/+source/sg3-utils:lp1879761-focal into ubuntu/+source/sg3-utils:ubuntu/devel

[Rafael David Tinoco]

BUG: https://bugs.launchpad.net/ubuntu/+source/sg3-utils/+bug/1879761
PPA: https://launchpad.net/~rafaeldtinoco/+archive/ubuntu/lp1879761

Unmerged commits

096e82e... by Rafael David Tinoco on 2020-05-21

update-maintainer

2e41354... by Rafael David Tinoco on 2020-05-21

reconstruct-changelog

597f4ae... by Rafael David Tinoco on 2020-05-21

merge-changelogs

7a3d3c8... by Rafael David Tinoco on 2020-05-21

* Dropped:
  - Fix a typo in a udev rule that leads to truncated ID_SERIAL values
    in udev. (LP: #1859858)
    [merged in Debian 1.45-1]

b6e9b3a... by Andreas Hasenack on 2019-06-17

    - debian/sg3-udeb.install: install the right binaries for sg3-udeb.

279b6f3... by Andreas Hasenack on 2019-06-17

    - debian/control, debian/rules: build a sg3-udeb installer package again.

6336879... by Ritesh Raj Sarraf on 2020-04-10

Import patches-unapplied version 1.45-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 8b01a5a7611173cd1c0acbb8373ec721965230bf

New changelog entries:
  [ Debian Janitor ]
  * Trim trailing whitespace.
  * Bump debhelper from old 9 to 12.
  * Set upstream metadata fields: Bug-Submit.
  * Drop unnecessary dependency on dh-autoconf.
  * Use canonical URL in Vcs-Browser.
  [ Ritesh Raj Sarraf ]
  * Add filter for the debian folder
  * New upstream version 1.45
  * Drop quilt based patch fix-udevadm-path.patch
  * Add patch to fix path for udevadm
  * Update symbol list for 1.45

diff --git a/BSD_LICENSE b/BSD_LICENSE
index 7f1906b..eef2b04 100644
--- a/BSD_LICENSE
+++ b/BSD_LICENSE
@@ -1,5 +1,5 @@
 
-Copyright (c) 1999-2018, Douglas Gilbert
+Copyright (c) 1999-2019, Douglas Gilbert
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -22,3 +22,6 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+
+Above is the:
+SPDX-License-Identifier: BSD-2-Clause
diff --git a/COVERAGE b/COVERAGE
index 84bd4d4..2d5a7e3 100644
--- a/COVERAGE
+++ b/COVERAGE
@@ -21,6 +21,7 @@ COPY OPERATION ABORT    ddptctl, ++
 EXTENDED COPY(LID1)    sg_xcopy, ddpt, ++
 GET CONFIGURATION   sg_get_config, ++
 GET LBA STATUS      sg_get_lba_status, ++
+GET PHYSICAL ELEMENT STATUS      sg_get_elem_status, ++
 GET STREAM STATUS   sg_stream_ctl
 INQUIRY             sg_dd, sg_format, sg_inq, sginfo,
                     sg_logs, sg_map('-i'), sg_modes, sg_opcodes,
@@ -28,6 +29,7 @@ INQUIRY             sg_dd, sg_format, sg_inq, sginfo,
 FINISH ZONE         sg_zone
 FORMAT MEDIUM       sg_format, ++ [SSC]
 FORMAT UNIT         sg_format, ++ [SBC]
+FORMAT WITH PRESET    sg_format, ++ [SBC]
 LOG SELECT          sg_logs('-r' or '-select'), ++
 LOG SENSE           sg_logs, ++
 MODE SELECT(6)      sdparm, sg_wr_mode, sginfo, sg_format,
@@ -158,4 +160,4 @@ THIRD PARTY COPY IN (0x83).
 
 
 Douglas Gilbert
-6th May 2018
+24th January 2020
diff --git a/CREDITS b/CREDITS
index beefb4c..e48eb44 100644
--- a/CREDITS
+++ b/CREDITS
@@ -11,6 +11,10 @@ Bart Van Assche <bart dot vanassche at sandisk dot com>
         configure.ac and Makefile.am cleanup plus sgp_dd code
         to replace pthread_cancel with pthread_kill [20180102]
 
+Bean Huo <beanhuo dot micron dot com>
+        sg_write_buffer: patch to allow comma or period separated bytes
+        (in decimal or hex) to be decoded when given as standard input.
+
 Brian Bunker <Brian dot Bunker at netapp dot com> contributed
         sg_read_block_limits and the target reset addition to sg_reset
         [20090615]
@@ -103,6 +107,8 @@ Mark Knibbs <markk at clara dot co dot uk>
 
 Martin Schwenke <martin at meltin dot net> added the raw switch "-r" to sg_inq
 
+Martin Wilck <mwilck at suse dot com> contributed script files [20190425]
+
 Nate Dailey < Nate dot Dailey at stratus dot com > extended sg_map for sparse
         disk node names (e.g. /dev/sdaaa) [20050511]
 
@@ -139,6 +145,9 @@ Tom Steudten <steudten at gmx dot ch> sginfo addition: add '-Fhead' option
 Trent Piepho <xyzzy at speakeasy dot org> print out some "sense key specific"
         data and "-6" switch for sg_modes
 
+Xose Vazquez Perez <xose dot vazquez at gmail dot com>
+	documentation corrections [20200117]
+
 
 Douglas Gilbert
-2nd January 2018
+17th January 2020
diff --git a/ChangeLog b/ChangeLog
index 08f598c..3dbfda2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,108 @@ 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 sg3_utils-1.45 [20200229] [svn: r843]
+  - sg_get_elem_status: new utility [sbc4r16]
+  - sg_ses: bug: --page= being overridden when --control
+    and --data= also given; fix
+    - document explicit Element type codes and example
+    - rename 'SAS SlimLine' to SlimSAS [ses4r02]
+    - add --inhex=FN, equivalent to --data=@FN, for
+      compatibility with other utilities
+    - 'fan speed factor' field added in 20-013r1
+  - sg_opcodes: expand MLU (now 2 bits, spc5r20)
+    - include RWCDLP field as extension of CDLP
+      field (spc5r01)
+  - sg_write_buffer: allow comma and period separated
+    lists when input from stdin
+  - sg_inq: update version descriptors to spc5r21
+    - add some NVMe 1.4 snippets to ctl identify
+  - sg_format: add --dcrt used twice (FOV=1 DCRT=0)
+    - add support for FORMAT WITH PRESET (sbc4r18)
+  - sg_raw: fix --send bug when using stdin
+  - sg_vpd: 3pc VPD page add copy group descriptor
+    - add --examine option
+    - new zoned block device char. field (zbc2r04)
+  - sg_read_buffer: decode read microcode status page
+    - add --inhex=FN option
+  - sg_request: add --error option, replaces opcode
+    with 0xff (or skips call to pass-through)
+  - sg_get_lba_status: add --inhex=FN option
+  - sg_xcopy: add --fco (fast copy only) (spc5r20)
+    - implement --app=1 (append) on regular OFILE type
+  - sg_scan (win32): expand limits for big arrays
+  - sg_modes: placeholders for Command duration limit
+    T2A and T2B mpages (sbc4r17)
+    - improve zbc support (e.g. caching mpage)
+  - sg_logs: add Command duration limits statistics
+    lpage (spc6r01)
+    - zoned block device statistics log page: shorten
+      counter fields from 8 to 4 bytes (zbc2r02)
+      - new field in this log page (zbc2r04)
+    - change '-ll' option to suppress subpages=0xff
+      apart from page 0x0,0xff. Used three times:
+      list all pages and subpages names reported
+  - sg_reassign: for defect list format 6 (vendor
+    specific) don't try to decode
+  - sg_rep_zones: expand some fields per zbc2r04
+    - add --num= and --wp options
+  - sg_verify: correct so issues VERIFY(16)
+    - add --0 and --ff options and implement
+      bytchk=3 properly
+  - sg_write_same: add --ff for 0xff fill
+  - sg_luns: report new "target commands" w-lun (19-117)
+  - sg_dd: add --verify support
+  - sgp_dd: support memory-mapped IO via mmap flag
+  - inhex directory: new, contains ASCII hex files
+    that can be used with the '--inhex=' option
+  - sg_lib: add sg_t10_uuid_desig2str()
+    - add sg_get_command_str and sg_print_command_len()
+    - speed up sg_print_command()
+    - sg_scsi_normalize_sense(): populate byte4,5,6
+    - tweak sg_pt interface to better handle bidi
+    - sg_cmds_process_resp(): two arguments removed
+    - add ${PACKAGE_VERSION} to '.so' name
+    - add sg_f2hex_arr()
+    - update some tables for NVMe 1.4
+    - sg_get_num()+sg_get_llnum(): add 'e' decoding,
+    - asc/ascq match asc-num.txt @t10 20191014
+      exabytes; allow addition (e.g. --count=3+1k)
+    - new zbc2r04 service actions
+  - sg_pt_freebsd: fixes for FreeBSD 12.0 release
+  - scripts: update 54-before-scsi-sg3_id.rules,
+    scsi-enable-target-scan.sh and
+    59-fc-wwpn-id.rules
+  - linux: add nanosecond durations when
+    SG3_UTILS_LINUX_NANO environment variable given
+    and Linux sg driver >= 4.0.30
+  - rescan-scsi-bus: widen LUN 0 only scanning
+    - multiple patches to sync with Suse
+  - testing/sg_tst_async: fix free_list issue
+  - testing/sg_tst_ioctl: for sg 4.0 driver
+  - testing/sg_tst_bidi: for sg 4.0 driver
+  - testing/sgh_dd: test request sharing, mreqs...
+    - add --verify support
+  - testing/sgs_dd: back from archive, for testing
+  - testing/sg_chk_asc: allow LF and CR/LF in asc-num.txt
+  - testing: 'make' now builds both C and C++ programs
+    SIGPOLL (SIGIO) and realtime (RT) signals
+  - sg_pt: add sg_get_opcode_translation() to replace
+    global pointer to array: sg_opcode_info_arr[]
+    - extend small SNTL to support read capacity
+  - utils/hxascdmp: add -o=<offset> option
+    - add -1, -2 and -q options
+  - sg_io_linux (sg_lib): add sg_linux_sense_print()
+  - sg_pt_linux: uses sg v4 interface if sg driver
+    >= 4.0.0 . Force sg v3 always by building with
+    './configure --disable-linux-sgv4'
+    - add sg_linux_get_sg_version() function
+  - add: 'SPDX-License-Identifier: BSD-2-Clause'
+    or a small number of 'GPL-2.0-or-later'
+  - gcc-9: suppress (pointless) warnings
+  - automake: upgrade to version 1.16.1
+  - autoconf: upgrade to version 2.69
+  - sync with fixes from Redhat, via github
+
 Changelog for sg3_utils-1.44 [20180912] [svn: r791]
   - same code as release 1.43 20180911 svn rev 789;
     new release due to sync problem with git mirror at:
diff --git a/Makefile.am b/Makefile.am
index 0417ee9..77b0716 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,4 +10,6 @@ EXTRA_DIST=autogen.sh COVERAGE CREDITS
 distclean-local:
 	rm -rf autom4te.cache
 	rm -f build-stamp configure-stamp
+	rm -rf lib/.deps
+	rm -rf src/.deps
 
diff --git a/Makefile.in b/Makefile.in
index fb215b2..ddb8090 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -134,7 +134,7 @@ am__recursive_targets = \
   $(RECURSIVE_CLEAN_TARGETS) \
   $(am__extra_recursive_targets)
 AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	cscope distdir dist dist-all distcheck
+	cscope distdir distdir-am dist dist-all distcheck
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
 	$(LISP)config.h.in
 # Read a list of newline-separated strings from the standard input,
@@ -354,8 +354,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' $(SHELL) ./config.status'; \
 	    $(SHELL) ./config.status;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -497,7 +497,10 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
 
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	$(am__remove_distdir)
 	test -d "$(distdir)" || mkdir "$(distdir)"
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -815,6 +818,8 @@ uninstall-am:
 distclean-local:
 	rm -rf autom4te.cache
 	rm -f build-stamp configure-stamp
+	rm -rf lib/.deps
+	rm -rf src/.deps
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/README b/README
index 8a741e3..b88dd44 100644
--- a/README
+++ b/README
@@ -203,7 +203,7 @@ and disable the creation of the shared library (libsgutils<num>.so) this
 invocation could be used: "./configure --prefix=/usr --disable-shared".
 To reduce the size of an executable as well try this:
 "./configure --prefix=/usr --disable-shared --disable-scsistrings".
-Also --disable-shared will produce (realtively) "static" executables in
+Also --disable-shared will produce (relatively) "static" executables in
 the src directory that are easier to debug. And
 "./configure --enable-debug" will compile with more debug type options,
 including more compiler checks and defining "DEBUG" within the src and
@@ -259,13 +259,14 @@ Here is list in alphabetical order of utilities found in the 'src'
 subdirectory of the sg3_utils package:
     sginfo, sg_bt_ctl, sg_compare_and_write, sg_copy_results, sgm_dd, sgp_dd,
     sg_dd, sg_decode_sense, sg_emc_trespass, sg_format, sg_get_config,
-    sg_get_lba_status, sg_ident, sg_inq, sg_logs, sg_luns, sg_map, sg_map26,
-    sg_modes, sg_opcodes, sg_persist, sg_prevent, sg_raw, sg_rbuf, sg_rdac,
-    sg_read, sg_read_attr, sg_readcap, sg_read_block_limits, sg_read_buffer,
-    sg_read_long, sg_reassign, sg_referrals, sg_request, sg_reset, sg_rmsn,
-    sg_rtpg, sg_safte, sg_sanitize, sg_sat_identify, sg_sat_phy_event,
-    sg_sat_read_gplog, sg_sat_set_features, sg_scan, sg_seek, sg_senddiag,
-    sg_ses, sg_ses_microcode, sg_start, sg_stpg, sg_stream_ctl, sg_sync,
+    sg_get_elem_status, sg_get_lba_status, sg_ident, sg_inq, sg_logs,
+    sg_luns, sg_map, sg_map26, sg_modes, sg_opcodes, sg_persist, sg_prevent,
+    sg_raw, sg_rbuf, sg_rdac, sg_read, sg_read_attr, sg_readcap,
+    sg_read_block_limits, sg_read_buffer, sg_read_long, sg_reassign,
+    sg_referrals, sg_request, sg_reset, sg_rmsn, sg_rtpg, sg_safte,
+    sg_sanitize, sg_sat_identify, sg_sat_phy_event, sg_sat_read_gplog,
+    sg_sat_set_features, sg_scan, sg_seek, sg_senddiag, sg_ses,
+    sg_ses_microcode, sg_start, sg_stpg, sg_stream_ctl, sg_sync,
     sg_test_rwbuff, sg_timestamp, sg_turs, sg_unmap, sg_verify, sg_vpd,
     sg_write_buffer, sg_write_long, sg_write_same, sg_write_verify,
     sg_write_x, sg_wr_mode, sg_xcopy, sg_zone
@@ -304,15 +305,14 @@ a "compliant jitter tolerance pattern" (CJTPAT).
 The 'testing' subdirectory contains source and a Makefiles to test
 kernel pass-through and associated drivers, mainly for Linux. There is
 both C code (with the extension ".c") and C++ code (with the extension
-".cpp"). There is a "Makefile" to build the C code and a "Makefile.cplus"
-to build the C++ code. Both depend on some object files from the "lib"
-subdirectory. So a sequence like this may be required prior to invoking
-one of the Makefiles in the directory: "cd <top_of_package> ;
+".cpp"). There is a "Makefile" to build the C + C++ code. The Makefile
+depends on some object files from the "lib" subdirectory. So a sequence
+like this may be required prior to invoking make: "cd <top_of_package> ;
 ./configure ; cd lib ; make ; cd ../testing".
 
 Here is a list in alphabetical order of utilities found in the 'testing'
 subdirectory:
-  - bsg_queue_tst, sg_iovec_tst, sg_queue_tst, sg_sense_tst,
+  - bsg_queue_tst, sgh_dd (C++), sg_iovec_tst, sg_queue_tst, sg_sense_tst,
     sg_tst_async (C++), sg_tst_context (C++), sg_tst_excl (C++),
     sg_tst_excl2 (C++), sg_tst_excl3 (C++)
 
@@ -399,6 +399,28 @@ queue limit of 16). Multiple threads doing the same thing act as a
 multiplier to that queue limit.
 
 
+NVME Support
+============
+Firstly the author has no intention of extending this package to contain
+general purpose NVMe utilities. That leaves the areas where SCSI overlaps
+with NVMe. There was a SCSI to NVMe Translation Layer (SNTL) driver in the
+Linux kernel based on a white paper from NVM Express. Intel has withdrawn
+that driver and T10 (SCSI) and NVM Express have made no further attempts
+to standardize a SNTL. Given the SCSI to ATA Translation Layer (SATL) which
+is standardized by T10, it is pretty clear what a SNTL should do.
+
+The NVMe Management Interface (NVME-MI) committee have decided to use SES-3
+standard from T10 via the newly added SES Send and SES Receive MI commands.
+So the sg_ses utility and this package's library have been extended to use
+these commands when a NVMe device (typically a disk enclosure) is detected.
+This has been tested by a disk vendor who is happy with the results. Other
+user reports are welcome as the author does not have equipment to test
+this.
+
+Other utilities in this package that use the SES Send and Receive commands,
+or the SNTL in the library are sg_senddiag, sg_inq and sg_readcap.
+
+
 Command line processing
 =======================
 These utilities can be divided into 3 groups when their handling of command
@@ -519,4 +541,4 @@ See http://sg.danny.cz/sg/tools.html
 
 
 Douglas Gilbert
-28th June 2018
+17 September 2019
diff --git a/README.freebsd b/README.freebsd
index 7ca25e9..4a720a7 100644
--- a/README.freebsd
+++ b/README.freebsd
@@ -18,6 +18,7 @@ Here is a list of utilities that have been ported:
     sg_decode_sense
     sg_format
     sg_get_config
+    sg_get_elem_status
     sg_get_lba_status
     sg_ident
     sg_inq          [dropped ATA IDENTIFY DEVICE capability]
@@ -142,4 +143,4 @@ utilities.
 
 
 Douglas Gilbert
-27th January 2018
+9th September 2019
diff --git a/README.solaris b/README.solaris
index 15e6fec..dac22dc 100644
--- a/README.solaris
+++ b/README.solaris
@@ -35,6 +35,7 @@ Here is a list of utilities that have been ported:
     sg_decode_sense
     sg_format
     sg_get_config
+    sg_get_elem_status
     sg_get_lba_status
     sg_ident
     sg_inq          [dropped ATA IDENTIFY DEVICE capability]
@@ -163,4 +164,4 @@ disks to accept SCSI commands including the SCSI ATA PASS THROUGH commands.
 
 
 Douglas Gilbert
-27th January 2018
+9th September 2019
diff --git a/README.win32 b/README.win32
index 41173b6..4711525 100644
--- a/README.win32
+++ b/README.win32
@@ -38,6 +38,7 @@ Here is a list of utilities that have been ported:
     sg_decode_sense
     sg_format
     sg_get_config
+    sg_get_elem_status
     sg_get_lba_status
     sg_ident
     sg_inq          [dropped ATA IDENTIFY DEVICE capability]
@@ -242,4 +243,4 @@ mode" with the setmode() Windows command.
 
 
 Douglas Gilbert
-27th January 2018
+9th September 2019
diff --git a/aclocal.m4 b/aclocal.m4
index 087efba..a0e5eda 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.16.1 -*- Autoconf -*-
 
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -4077,7 +4077,8 @@ _LT_EOF
   if AC_TRY_EVAL(ac_compile); then
     # Now try to grab the symbols.
     nlist=conftest.nm
-    if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
+    $ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&AS_MESSAGE_LOG_FD
+    if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&AS_MESSAGE_LOG_FD && test -s "$nlist"; then
       # Try sorting and uniquifying the output.
       if sort "$nlist" | uniq > "$nlist"T; then
 	mv -f "$nlist"T "$nlist"
@@ -6448,7 +6449,7 @@ if test yes != "$_lt_caught_CXX_error"; then
       # Commands to make compiler produce verbose output that lists
       # what "hidden" libraries, object files and flags are used when
       # linking a shared library.
-      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
 
     else
       GXX=no
@@ -6823,7 +6824,7 @@ if test yes != "$_lt_caught_CXX_error"; then
             # explicitly linking system object files so we need to strip them
             # from the output so that they don't get included in the library
             # dependencies.
-            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
             ;;
           *)
             if test yes = "$GXX"; then
@@ -6888,7 +6889,7 @@ if test yes != "$_lt_caught_CXX_error"; then
 	    # explicitly linking system object files so we need to strip them
 	    # from the output so that they don't get included in the library
 	    # dependencies.
-	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
 	    ;;
           *)
 	    if test yes = "$GXX"; then
@@ -7227,7 +7228,7 @@ if test yes != "$_lt_caught_CXX_error"; then
 	      # Commands to make compiler produce verbose output that lists
 	      # what "hidden" libraries, object files and flags are used when
 	      # linking a shared library.
-	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
 
 	    else
 	      # FIXME: insert proper C++ library support
@@ -7311,7 +7312,7 @@ if test yes != "$_lt_caught_CXX_error"; then
 	        # Commands to make compiler produce verbose output that lists
 	        # what "hidden" libraries, object files and flags are used when
 	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
 	      else
 	        # g++ 2.7 appears to require '-G' NOT '-shared' on this
 	        # platform.
@@ -7322,7 +7323,7 @@ if test yes != "$_lt_caught_CXX_error"; then
 	        # Commands to make compiler produce verbose output that lists
 	        # what "hidden" libraries, object files and flags are used when
 	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
 	      fi
 
 	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir'
@@ -9067,7 +9068,7 @@ m4_ifndef([_LT_PROG_F77],		[AC_DEFUN([_LT_PROG_F77])])
 m4_ifndef([_LT_PROG_FC],		[AC_DEFUN([_LT_PROG_FC])])
 m4_ifndef([_LT_PROG_CXX],		[AC_DEFUN([_LT_PROG_CXX])])
 
-# Copyright (C) 2002-2017 Free Software Foundation, Inc.
+# Copyright (C) 2002-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -9079,10 +9080,10 @@ m4_ifndef([_LT_PROG_CXX],		[AC_DEFUN([_LT_PROG_CXX])])
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.15'
+[am__api_version='1.16'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.15.1], [],
+m4_if([$1], [1.16.1], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -9098,12 +9099,12 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.15.1])dnl
+[AM_AUTOMAKE_VERSION([1.16.1])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
-# Copyright (C) 2011-2017 Free Software Foundation, Inc.
+# Copyright (C) 2011-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -9165,7 +9166,7 @@ AC_SUBST([AR])dnl
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -9217,7 +9218,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd`
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997-2017 Free Software Foundation, Inc.
+# Copyright (C) 1997-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -9248,7 +9249,7 @@ AC_CONFIG_COMMANDS_PRE(
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -9439,13 +9440,12 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
 
-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-
 # _AM_OUTPUT_DEPENDENCY_COMMANDS
 # ------------------------------
 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
@@ -9453,49 +9453,41 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
   # Older Autoconf quotes --file arguments for eval, but not when files
   # are listed without --file.  Let's play safe and only enable the eval
   # if we detect the quoting.
-  case $CONFIG_FILES in
-  *\'*) eval set x "$CONFIG_FILES" ;;
-  *)   set x $CONFIG_FILES ;;
-  esac
+  # TODO: see whether this extra hack can be removed once we start
+  # requiring Autoconf 2.70 or later.
+  AS_CASE([$CONFIG_FILES],
+          [*\'*], [eval set x "$CONFIG_FILES"],
+          [*], [set x $CONFIG_FILES])
   shift
-  for mf
+  # Used to flag and report bootstrapping failures.
+  am_rc=0
+  for am_mf
   do
     # Strip MF so we end up with the name of the file.
-    mf=`echo "$mf" | sed -e 's/:.*$//'`
-    # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named 'Makefile.in', but
-    # some people rename them; so instead we look at the file content.
-    # Grep'ing the first line is not enough: some people post-process
-    # each Makefile.in and add a new line on top of each file to say so.
-    # Grep'ing the whole file is not good either: AIX grep has a line
+    am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'`
+    # Check whether this is an Automake generated Makefile which includes
+    # dependency-tracking related rules and includes.
+    # Grep'ing the whole file directly is not great: AIX grep has a line
     # limit of 2048, but all sed's we know have understand at least 4000.
-    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-      dirpart=`AS_DIRNAME("$mf")`
-    else
-      continue
-    fi
-    # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running 'make'.
-    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-    test -z "$DEPDIR" && continue
-    am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "$am__include" && continue
-    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # Find all dependency output files, they are included files with
-    # $(DEPDIR) in their names.  We invoke sed twice because it is the
-    # simplest approach to changing $(DEPDIR) to its actual value in the
-    # expansion.
-    for file in `sed -n "
-      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
-      # Make sure the directory exists.
-      test -f "$dirpart/$file" && continue
-      fdir=`AS_DIRNAME(["$file"])`
-      AS_MKDIR_P([$dirpart/$fdir])
-      # echo "creating $dirpart/$file"
-      echo '# dummy' > "$dirpart/$file"
-    done
+    sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
+      || continue
+    am_dirpart=`AS_DIRNAME(["$am_mf"])`
+    am_filepart=`AS_BASENAME(["$am_mf"])`
+    AM_RUN_LOG([cd "$am_dirpart" \
+      && sed -e '/# am--include-marker/d' "$am_filepart" \
+        | $MAKE -f - am--depfiles]) || am_rc=$?
   done
+  if test $am_rc -ne 0; then
+    AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments
+    for automatic dependency tracking.  Try re-running configure with the
+    '--disable-dependency-tracking' option to at least be able to build
+    the package (albeit without support for automatic dependency tracking).])
+  fi
+  AS_UNSET([am_dirpart])
+  AS_UNSET([am_filepart])
+  AS_UNSET([am_mf])
+  AS_UNSET([am_rc])
+  rm -f conftest-deps.mk
 }
 ])# _AM_OUTPUT_DEPENDENCY_COMMANDS
 
@@ -9504,18 +9496,17 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
 # -----------------------------
 # This macro should only be invoked once -- use via AC_REQUIRE.
 #
-# This code is only required when automatic dependency tracking
-# is enabled.  FIXME.  This creates each '.P' file that we will
-# need in order to bootstrap the dependency handling code.
+# This code is only required when automatic dependency tracking is enabled.
+# This creates each '.Po' and '.Plo' makefile fragment that we'll need in
+# order to bootstrap the dependency handling code.
 AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 [AC_CONFIG_COMMANDS([depfiles],
      [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
+     [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])])
 
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -9602,8 +9593,8 @@ AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
 AC_REQUIRE([AC_PROG_MKDIR_P])dnl
 # For better backward compatibility.  To be removed once Automake 1.9.x
 # dies out for good.  For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
 AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
 # We need awk for the "check" target (and possibly the TAP driver).  The
 # system "awk" is bad on some platforms.
@@ -9670,7 +9661,7 @@ END
 Aborting the configuration process, to ensure you take notice of the issue.
 
 You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
+that behaves properly: <https://www.gnu.org/software/coreutils/>.
 
 If you want to complete the configuration process using your problematic
 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
@@ -9712,7 +9703,7 @@ for _am_header in $config_headers :; do
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -9733,7 +9724,7 @@ if test x"${install_sh+set}" != xset; then
 fi
 AC_SUBST([install_sh])])
 
-# Copyright (C) 2003-2017 Free Software Foundation, Inc.
+# Copyright (C) 2003-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -9755,7 +9746,7 @@ AC_SUBST([am__leading_dot])])
 # Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
 # From Jim Meyering
 
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -9790,7 +9781,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
 
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
 
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -9798,49 +9789,42 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
 
 # AM_MAKE_INCLUDE()
 # -----------------
-# Check to see how make treats includes.
+# Check whether make has an 'include' directive that can support all
+# the idioms we need for our automatic dependency tracking code.
 AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
+[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive])
+cat > confinc.mk << 'END'
 am__doit:
-	@echo this is the am__doit target
+	@echo this is the am__doit target >confinc.out
 .PHONY: am__doit
 END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
 am__include="#"
 am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from 'make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
-  am__include=include
-  am__quote=
-  _am_result=GNU
-  ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   case `$am_make -s -f confmf 2> /dev/null` in #(
-   *the\ am__doit\ target*)
-     am__include=.include
-     am__quote="\""
-     _am_result=BSD
-     ;;
-   esac
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
+# BSD make does it like this.
+echo '.include "confinc.mk" # ignored' > confmf.BSD
+# Other make implementations (GNU, Solaris 10, AIX) do it like this.
+echo 'include confinc.mk # ignored' > confmf.GNU
+_am_result=no
+for s in GNU BSD; do
+  AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out])
+  AS_CASE([$?:`cat confinc.out 2>/dev/null`],
+      ['0:this is the am__doit target'],
+      [AS_CASE([$s],
+          [BSD], [am__include='.include' am__quote='"'],
+          [am__include='include' am__quote=''])])
+  if test "$am__include" != "#"; then
+    _am_result="yes ($s style)"
+    break
+  fi
+done
+rm -f confinc.* confmf.*
+AC_MSG_RESULT([${_am_result}])
+AC_SUBST([am__include])])
+AC_SUBST([am__quote])])
 
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997-2017 Free Software Foundation, Inc.
+# Copyright (C) 1997-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -9881,7 +9865,7 @@ fi
 # Obsolete and "removed" macros, that must however still report explicit
 # error messages when used, to smooth transition.
 #
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -9908,7 +9892,7 @@ AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES])
 
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -9937,7 +9921,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -9984,7 +9968,7 @@ AC_LANG_POP([C])])
 # For backward compatibility.
 AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
 
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -10003,7 +9987,7 @@ AC_DEFUN([AM_RUN_LOG],
 
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -10084,7 +10068,7 @@ AC_CONFIG_COMMANDS_PRE(
 rm -f conftest.file
 ])
 
-# Copyright (C) 2009-2017 Free Software Foundation, Inc.
+# Copyright (C) 2009-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -10144,7 +10128,7 @@ AC_SUBST([AM_BACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
 ])
 
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -10172,7 +10156,7 @@ fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006-2017 Free Software Foundation, Inc.
+# Copyright (C) 2006-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -10191,7 +10175,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004-2017 Free Software Foundation, Inc.
+# Copyright (C) 2004-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff --git a/ar-lib b/ar-lib
index 05094d3..0baa4f6 100755
--- a/ar-lib
+++ b/ar-lib
@@ -4,7 +4,7 @@
 me=ar-lib
 scriptversion=2012-03-01.08; # UTC
 
-# Copyright (C) 2010-2017 Free Software Foundation, Inc.
+# Copyright (C) 2010-2018 Free Software Foundation, Inc.
 # Written by Peter Rosin <[e-mail]>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -18,7 +18,7 @@ scriptversion=2012-03-01.08; # UTC
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
diff --git a/archive/align_b4_memalign.c b/archive/align_b4_memalign.c
index 8760202..1cd4032 100644
--- a/archive/align_b4_memalign.c
+++ b/archive/align_b4_memalign.c
@@ -1,5 +1,6 @@
-/* Code fragment of how to get a buffer of heap that has a specific
- * alignment, typically 'page' size which is 4096 bytes. */
+/* Code fragment of how to get a buffer from the heap that has a specific
+ * alignment. The typical alignment is to a "page" whose size is often
+ * 4096 bytes. */
 
     uint8_t * wrkBuff;	/* will get pointer to heap allocation */
     uint8_t * wrkPos;	/* will get aligned pointer within wrkBuff */
@@ -17,3 +18,7 @@
    /* perhaps use posix_memalign() instead. Yes but not always available */
     wrkBuff = (uint8_t *)malloc(sz_of_aligned + psz);
     wrkPos = (uint8_t *)(((sg_uintptr_t)wrkBuff + psz - 1) & (~(psz - 1)));
+
+/* The disadvantage of this approach is that it needs both wrkBuff and wrkPos
+ * to be held by the application. The wrkBuff is only needed for the
+ * corresponding free(), all other uses should be via wrkPos. */
diff --git a/compile b/compile
index a85b723..99e5052 100755
--- a/compile
+++ b/compile
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2012-10-14.11; # UTC
+scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
 # Written by Tom Tromey <[e-mail]>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@ scriptversion=2012-10-14.11; # UTC
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -255,7 +255,8 @@ EOF
     echo "compile $scriptversion"
     exit $?
     ;;
-  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+  icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
     func_cl_wrapper "$@"      # Doesn't return...
     ;;
 esac
@@ -339,9 +340,9 @@ exit $ret
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:
diff --git a/config.h.in b/config.h.in
index ab0eb00..4173c07 100644
--- a/config.h.in
+++ b/config.h.in
@@ -27,6 +27,9 @@
 /* Define to 1 if you have the <linux/nvme_ioctl.h> header file. */
 #undef HAVE_LINUX_NVME_IOCTL_H
 
+/* Have Linux sg v4 header */
+#undef HAVE_LINUX_SG_V4_HDR
+
 /* Define to 1 if you have the <linux/types.h> header file. */
 #undef HAVE_LINUX_TYPES_H
 
@@ -81,6 +84,9 @@
 /* option ignored */
 #undef IGNORE_LINUX_BSG
 
+/* even if Linux sg v4 available, use v3 instead */
+#undef IGNORE_LINUX_SGV4
+
 /* compile out NVMe support */
 #undef IGNORE_NVME
 
diff --git a/configure b/configure
index 97207eb..45ee88a 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for sg3_utils 1.44.
+# Generated by GNU Autoconf 2.69 for sg3_utils 1.45.
 #
 # Report bugs to <[e-mail]>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='sg3_utils'
 PACKAGE_TARNAME='sg3_utils'
-PACKAGE_VERSION='1.44'
-PACKAGE_STRING='sg3_utils 1.44'
+PACKAGE_VERSION='1.45'
+PACKAGE_STRING='sg3_utils 1.45'
 PACKAGE_BUGREPORT='[e-mail]'
 PACKAGE_URL=''
 
@@ -692,7 +692,6 @@ am__nodep
 AMDEPBACKSLASH
 AMDEP_FALSE
 AMDEP_TRUE
-am__quote
 am__include
 DEPDIR
 OBJEXT
@@ -770,7 +769,8 @@ PACKAGE_VERSION
 PACKAGE_TARNAME
 PACKAGE_NAME
 PATH_SEPARATOR
-SHELL'
+SHELL
+am__quote'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
@@ -791,6 +791,7 @@ enable_win32_spt_direct
 enable_scsistrings
 enable_nvme_supp
 enable_fast_lebe
+enable_linux_sgv4
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1352,7 +1353,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures sg3_utils 1.44 to adapt to many kinds of systems.
+\`configure' configures sg3_utils 1.45 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1423,7 +1424,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of sg3_utils 1.44:";;
+     short | recursive ) echo "Configuration of sg3_utils 1.45:";;
    esac
   cat <<\_ACEOF
 
@@ -1453,6 +1454,8 @@ Optional Features:
                           strings
   --disable-nvme-supp     remove all or most NVMe code
   --disable-fast-lebe     use generic little-endian/big-endian code instead
+  --disable-linux-sgv4    for Linux sg driver avoid v4 interface even if
+                          available
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -1544,7 +1547,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-sg3_utils configure 1.44
+sg3_utils configure 1.45
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1913,7 +1916,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by sg3_utils $as_me 1.44, which was
+It was created by sg3_utils $as_me 1.45, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2262,7 +2265,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-am__api_version='1.15'
+am__api_version='1.16'
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -2777,7 +2780,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='sg3_utils'
- VERSION='1.44'
+ VERSION='1.45'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2807,8 +2810,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
 # For better backward compatibility.  To be removed once Automake 1.9.x
 # dies out for good.  For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
 mkdir_p='$(MKDIR_P)'
 
 # We need awk for the "check" target (and possibly the TAP driver).  The
@@ -2859,7 +2862,7 @@ END
 Aborting the configuration process, to ensure you take notice of the issue.
 
 You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
+that behaves properly: <https://www.gnu.org/software/coreutils/>.
 
 If you want to complete the configuration process using your problematic
 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
@@ -3747,45 +3750,45 @@ DEPDIR="${am__leading_dot}deps"
 
 ac_config_commands="$ac_config_commands depfiles"
 
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5
+$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; }
+cat > confinc.mk << 'END'
 am__doit:
-	@echo this is the am__doit target
+	@echo this is the am__doit target >confinc.out
 .PHONY: am__doit
 END
-# If we don't find an include directive, just comment out the code.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
-$as_echo_n "checking for style of include used by $am_make... " >&6; }
 am__include="#"
 am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from 'make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
-  am__include=include
-  am__quote=
-  _am_result=GNU
-  ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   case `$am_make -s -f confmf 2> /dev/null` in #(
-   *the\ am__doit\ target*)
-     am__include=.include
-     am__quote="\""
-     _am_result=BSD
+# BSD make does it like this.
+echo '.include "confinc.mk" # ignored' > confmf.BSD
+# Other make implementations (GNU, Solaris 10, AIX) do it like this.
+echo 'include confinc.mk # ignored' > confmf.GNU
+_am_result=no
+for s in GNU BSD; do
+  { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5
+   (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+  case $?:`cat confinc.out 2>/dev/null` in #(
+  '0:this is the am__doit target') :
+    case $s in #(
+  BSD) :
+    am__include='.include' am__quote='"' ;; #(
+  *) :
+    am__include='include' am__quote='' ;;
+esac ;; #(
+  *) :
      ;;
-   esac
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
-$as_echo "$_am_result" >&6; }
-rm -f confinc confmf
+esac
+  if test "$am__include" != "#"; then
+    _am_result="yes ($s style)"
+    break
+  fi
+done
+rm -f confinc.* confmf.*
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5
+$as_echo "${_am_result}" >&6; }
 
 # Check whether --enable-dependency-tracking was given.
 if test "${enable_dependency_tracking+set}" = set; then :
@@ -6285,11 +6288,8 @@ _LT_EOF
   test $ac_status = 0; }; then
     # Now try to grab the symbols.
     nlist=conftest.nm
-    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
-  (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s "$nlist"; then
+    $ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&5
+    if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&5 && test -s "$nlist"; then
       # Try sorting and uniquifying the output.
       if sort "$nlist" | uniq > "$nlist"T; then
 	mv -f "$nlist"T "$nlist"
@@ -12585,6 +12585,28 @@ done
 
 }
 
+check_for_linux_sg_v4_hdr() {
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+ # include <scsi/sg.h>
+		  #ifdef SG_IOSUBMIT
+		   found
+		  #endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "found" >/dev/null 2>&1; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_LINUX_SG_V4_HDR 1
+_ACEOF
+
+fi
+rm -f conftest*
+
+
+}
+
 case "${host}" in
 	*-*-android*)
 
@@ -12597,6 +12619,7 @@ cat >>confdefs.h <<_ACEOF
 #define SG_LIB_LINUX 1
 _ACEOF
 
+		check_for_linux_sg_v4_hdr
 		check_for_linux_nvme_headers;;
         *-*-freebsd*|*-*-kfreebsd*-gnu*)
 
@@ -12659,6 +12682,7 @@ cat >>confdefs.h <<_ACEOF
 #define SG_LIB_LINUX 1
 _ACEOF
 
+		check_for_linux_sg_v4_hdr
                 check_for_linux_nvme_headers;;
 esac
 
@@ -12793,6 +12817,16 @@ _ACEOF
 fi
 
 
+# Check whether --enable-linux-sgv4 was given.
+if test "${enable_linux_sgv4+set}" = set; then :
+  enableval=$enable_linux_sgv4;
+cat >>confdefs.h <<_ACEOF
+#define IGNORE_LINUX_SGV4 1
+_ACEOF
+
+fi
+
+
 
 ac_config_files="$ac_config_files Makefile include/Makefile lib/Makefile src/Makefile doc/Makefile scripts/Makefile"
 
@@ -13361,7 +13395,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by sg3_utils $as_me 1.44, which was
+This file was extended by sg3_utils $as_me 1.45, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -13427,7 +13461,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-sg3_utils config.status 1.44
+sg3_utils config.status 1.45
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -13546,7 +13580,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 #
 # INIT-COMMANDS
 #
-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"
 
 
 # The HP-UX ksh and POSIX shell print the target directory to stdout
@@ -14447,29 +14481,35 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
   # Older Autoconf quotes --file arguments for eval, but not when files
   # are listed without --file.  Let's play safe and only enable the eval
   # if we detect the quoting.
-  case $CONFIG_FILES in
-  *\'*) eval set x "$CONFIG_FILES" ;;
-  *)   set x $CONFIG_FILES ;;
-  esac
+  # TODO: see whether this extra hack can be removed once we start
+  # requiring Autoconf 2.70 or later.
+  case $CONFIG_FILES in #(
+  *\'*) :
+    eval set x "$CONFIG_FILES" ;; #(
+  *) :
+    set x $CONFIG_FILES ;; #(
+  *) :
+     ;;
+esac
   shift
-  for mf
+  # Used to flag and report bootstrapping failures.
+  am_rc=0
+  for am_mf
   do
     # Strip MF so we end up with the name of the file.
-    mf=`echo "$mf" | sed -e 's/:.*$//'`
-    # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named 'Makefile.in', but
-    # some people rename them; so instead we look at the file content.
-    # Grep'ing the first line is not enough: some people post-process
-    # each Makefile.in and add a new line on top of each file to say so.
-    # Grep'ing the whole file is not good either: AIX grep has a line
+    am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'`
+    # Check whether this is an Automake generated Makefile which includes
+    # dependency-tracking related rules and includes.
+    # Grep'ing the whole file directly is not great: AIX grep has a line
     # limit of 2048, but all sed's we know have understand at least 4000.
-    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-      dirpart=`$as_dirname -- "$mf" ||
-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$mf" : 'X\(//\)[^/]' \| \
-	 X"$mf" : 'X\(//\)$' \| \
-	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$mf" |
+    sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
+      || continue
+    am_dirpart=`$as_dirname -- "$am_mf" ||
+$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$am_mf" : 'X\(//\)[^/]' \| \
+	 X"$am_mf" : 'X\(//\)$' \| \
+	 X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$am_mf" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -14487,53 +14527,48 @@ $as_echo X"$mf" |
 	    q
 	  }
 	  s/.*/./; q'`
-    else
-      continue
-    fi
-    # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running 'make'.
-    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-    test -z "$DEPDIR" && continue
-    am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "$am__include" && continue
-    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # Find all dependency output files, they are included files with
-    # $(DEPDIR) in their names.  We invoke sed twice because it is the
-    # simplest approach to changing $(DEPDIR) to its actual value in the
-    # expansion.
-    for file in `sed -n "
-      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
-      # Make sure the directory exists.
-      test -f "$dirpart/$file" && continue
-      fdir=`$as_dirname -- "$file" ||
-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$file" : 'X\(//\)[^/]' \| \
-	 X"$file" : 'X\(//\)$' \| \
-	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
+    am_filepart=`$as_basename -- "$am_mf" ||
+$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$am_mf" : 'X\(//\)$' \| \
+	 X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$am_mf" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
 	  }
-	  /^X\(\/\/\)$/{
+	  /^X\/\(\/\/\)$/{
 	    s//\1/
 	    q
 	  }
-	  /^X\(\/\).*/{
+	  /^X\/\(\/\).*/{
 	    s//\1/
 	    q
 	  }
 	  s/.*/./; q'`
-      as_dir=$dirpart/$fdir; as_fn_mkdir_p
-      # echo "creating $dirpart/$file"
-      echo '# dummy' > "$dirpart/$file"
-    done
+    { echo "$as_me:$LINENO: cd "$am_dirpart" \
+      && sed -e '/# am--include-marker/d' "$am_filepart" \
+        | $MAKE -f - am--depfiles" >&5
+   (cd "$am_dirpart" \
+      && sed -e '/# am--include-marker/d' "$am_filepart" \
+        | $MAKE -f - am--depfiles) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } || am_rc=$?
   done
+  if test $am_rc -ne 0; then
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "Something went wrong bootstrapping makefile fragments
+    for automatic dependency tracking.  Try re-running configure with the
+    '--disable-dependency-tracking' option to at least be able to build
+    the package (albeit without support for automatic dependency tracking).
+See \`config.log' for more details" "$LINENO" 5; }
+  fi
+  { am_dirpart=; unset am_dirpart;}
+  { am_filepart=; unset am_filepart;}
+  { am_mf=; unset am_mf;}
+  { am_rc=; unset am_rc;}
+  rm -f conftest-deps.mk
 }
  ;;
     "libtool":C)
diff --git a/configure.ac b/configure.ac
index 1b4df71..8d641eb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(sg3_utils, 1.44, [e-mail])
+AC_INIT(sg3_utils, 1.45, [e-mail])
 
 AM_INIT_AUTOMAKE([-Wall -Werror foreign])
 AM_MAINTAINER_MODE
@@ -59,10 +59,22 @@ check_for_linux_nvme_headers() {
 		     ]])
 }
 
+check_for_linux_sg_v4_hdr() {
+	AC_EGREP_CPP(found,
+		[ # include <scsi/sg.h>
+		  #ifdef SG_IOSUBMIT
+		   found
+		  #endif
+		],
+		[AC_DEFINE_UNQUOTED(HAVE_LINUX_SG_V4_HDR, 1, [Have Linux sg v4 header]) ])
+
+}
+
 case "${host}" in
 	*-*-android*)
 		AC_DEFINE_UNQUOTED(SG_LIB_ANDROID, 1, [sg3_utils on android])
 		AC_DEFINE_UNQUOTED(SG_LIB_LINUX, 1, [sg3_utils on linux])
+		check_for_linux_sg_v4_hdr
 		check_for_linux_nvme_headers;;
         *-*-freebsd*|*-*-kfreebsd*-gnu*)
 		AC_DEFINE_UNQUOTED(SG_LIB_FREEBSD, 1, [sg3_utils on FreeBSD])
@@ -85,6 +97,7 @@ case "${host}" in
                 CFLAGS="$CFLAGS -D__USE_MINGW_ANSI_STDIO";;
         *-*-linux-gnu* | *-*-linux* | *)
                 AC_DEFINE_UNQUOTED(SG_LIB_LINUX, 1, [sg3_utils on linux])
+		check_for_linux_sg_v4_hdr
                 check_for_linux_nvme_headers;;
 esac
 
@@ -128,6 +141,10 @@ AC_ARG_ENABLE([fast-lebe],
   AC_HELP_STRING([--disable-fast-lebe], [use generic little-endian/big-endian code instead]),
   [AC_DEFINE_UNQUOTED(IGNORE_FAST_LEBE, 1, [use generic little-endian/big-endian instead], )], [])
 
+AC_ARG_ENABLE([linux-sgv4],
+  AC_HELP_STRING([--disable-linux-sgv4], [for Linux sg driver avoid v4 interface even if available]),
+  [AC_DEFINE_UNQUOTED(IGNORE_LINUX_SGV4, 1, [even if Linux sg v4 available, use v3 instead], )], [])
+
 
 AC_OUTPUT(Makefile include/Makefile lib/Makefile src/Makefile doc/Makefile scripts/Makefile)
 
diff --git a/debian/changelog b/debian/changelog
index 0a711ed..6127ad3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,36 @@
+<<<<<<< debian/changelog
+=======
+sg3-utils (1.45-1ubuntu1) groovy; urgency=medium
+
+  * Merge with Debian unstable (LP: #1879761). Remaining changes:
+    - debian/control, debian/rules: build a sg3-udeb installer package again.
+    - debian/sg3-udeb.install: install the right binaries for sg3-udeb.
+  * Dropped:
+    - Fix a typo in a udev rule that leads to truncated ID_SERIAL values in
+      udev. (LP: #1859858)
+    [merged in Debian 1.45-1]
+
+ -- Rafael David Tinoco <[e-mail]>  Thu, 21 May 2020 03:34:16 +0000
+
+sg3-utils (1.45-1) unstable; urgency=medium
+
+  [ Debian Janitor ]
+  * Trim trailing whitespace.
+  * Bump debhelper from old 9 to 12.
+  * Set upstream metadata fields: Bug-Submit.
+  * Drop unnecessary dependency on dh-autoconf.
+  * Use canonical URL in Vcs-Browser.
+
+  [ Ritesh Raj Sarraf ]
+  * Add filter for the debian folder
+  * New upstream version 1.45
+  * Drop quilt based patch fix-udevadm-path.patch
+  * Add patch to fix path for udevadm
+  * Update symbol list for 1.45
+
+ -- Ritesh Raj Sarraf <[e-mail]>  Fri, 10 Apr 2020 20:52:49 +0530
+
+>>>>>>> debian/changelog
 sg3-utils (1.44-1ubuntu2) focal; urgency=medium
 
   * Fix a typo in a udev rule that leads to truncated ID_SERIAL values in
@@ -148,7 +181,7 @@ sg3-utils (1.32-1) unstable; urgency=low
 
 sg3-utils (1.31-1) unstable; urgency=low
 
-  * New Upstream Release 
+  * New Upstream Release
   * [0d9bfc1] update symbols file
 
  -- Ritesh Raj Sarraf <[e-mail]>  Thu, 17 Mar 2011 19:46:32 +0530
@@ -156,20 +189,20 @@ sg3-utils (1.31-1) unstable; urgency=low
 sg3-utils (1.30-1) unstable; urgency=low
 
   * New Upstream Release
-  * Change address to my official Debian address and remove the DMUA flag 
-  * Add a get-orig-source target 
+  * Change address to my official Debian address and remove the DMUA flag
+  * Add a get-orig-source target
   * Dropping patches that have merged upstream
     - 001_man_page_fixes.patch
-    - 002_spelling_error_fixes.patch 
+    - 002_spelling_error_fixes.patch
   * Update Standards Version to 3.9.1
-    - Add BSD license to the copyright section 
+    - Add BSD license to the copyright section
 
  -- Ritesh Raj Sarraf <[e-mail]>  Fri, 11 Feb 2011 01:22:58 +0530
 
 sg3-utils (1.29-1) unstable; urgency=low
 
   [Ritesh Raj Sarraf]
-  * Adopt package as the new maintainer (Closes: #540828) 
+  * Adopt package as the new maintainer (Closes: #540828)
   * New upstream release
     + Drop patches, merged upstream
       - 01_am_maintainer_mode.patch
@@ -178,12 +211,12 @@ sg3-utils (1.29-1) unstable; urgency=low
     + Add new patches
       - 001_man_page_fixes.patch
       - 002_spelling_error_fixes.patch
-  * Update symbol list for new symbols introduced in this release 
-  * Add ${misc:Depends} to make in lintian clean 
-  * Add "source/format" and specify the current source format 
-  * Update Standards Version to 3.8.4 (No changes required) 
-  * Add Vcs headers 
-  * Add DMUA Flag 
+  * Update symbol list for new symbols introduced in this release
+  * Add ${misc:Depends} to make in lintian clean
+  * Add "source/format" and specify the current source format
+  * Update Standards Version to 3.8.4 (No changes required)
+  * Add Vcs headers
+  * Add DMUA Flag
   * Explain about tarball re-packing in README.source
 
   [Jonathan McDowell]
@@ -228,10 +261,10 @@ sg3-utils (1.27-1) unstable; urgency=low
 
   * QA upload.
     + Set maintainer to Debian QA Group <[e-mail]>
-  * Don't ignore errors on make clean. 
+  * Don't ignore errors on make clean.
   * Use quilt as a patch system.
   * Enable AM_MAINTAINER_MODE.
-  * Add patch by Petr Salinger to fix FTBFS on GNU/kFreeBSD (closes: 
+  * Add patch by Petr Salinger to fix FTBFS on GNU/kFreeBSD (closes:
     #542748).
 
  -- Aurelien Jarno <[e-mail]>  Sun, 30 Aug 2009 17:35:35 +0200
@@ -364,7 +397,7 @@ sg3-utils (1.03-1) unstable; urgency=low
 sg3-utils (0.95-4) unstable; urgency=low
 
   * Only warns if installed on a kernel version < 2.4 (closes: #136434)
-      
+
  -- Eric Schwartz <[e-mail]>  Tue, 28 May 2002 22:55:29 -0600
 
 sg3-utils (0.95-3) unstable; urgency=low
@@ -387,5 +420,3 @@ sg3-utils (0.95-1) unstable; urgency=low
   * Adjusted Makefile to include $DESTDIR
 
  -- Eric Schwartz <[e-mail]>  Wed, 14 Nov 2001 17:05:56 -0700
-
-
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index ec63514..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/debian/control b/debian/control
index f0066c9..2a108f1 100644
--- a/debian/control
+++ b/debian/control
@@ -4,11 +4,11 @@ Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Ritesh Raj Sarraf <[e-mail]>
 Uploaders: Jonathan McDowell <[e-mail]>
-Build-Depends: debhelper (>= 9), libtool, libcam-dev [kfreebsd-any], dh-autoreconf, dpkg-dev (>= 1.16.1~)
+Build-Depends: debhelper-compat (= 12), libtool, libcam-dev [kfreebsd-any], dpkg-dev (>= 1.16.1~)
 Standards-Version: 3.9.2
 Homepage: http://sg.danny.cz/sg/
 Vcs-Git: https://salsa.debian.org/linux-blocks-team/sg3-utils.git
-Vcs-Browser: https://salsa.debian.org/linux-blocks-team/sg3-utils.git
+Vcs-Browser: https://salsa.debian.org/linux-blocks-team/sg3-utils
 
 Package: sg3-utils
 Architecture: any
@@ -65,7 +65,7 @@ Description: utilities for devices using the SCSI command set (developer files)
 
 Package: sg3-utils-udev
 Architecture: all
-Depends: sg3-utils, initramfs-tools, ${misc:Depends}
+Depends: sg3-utils, initramfs-tools-core, initramfs-tools | linux-initramfs-tool, ${misc:Depends}
 Description: utilities for devices using the SCSI command set (udev rules)
  Most OSes have SCSI pass-through interfaces that enable user space programs
  to send SCSI commands to a device and fetch the response. With SCSI to ATA
@@ -84,4 +84,7 @@ Package-Type: udeb
 Section: debian-installer
 Depends: ${misc:Depends}
 Description: utilities for devices using the SCSI command set
+<<<<<<< debian/control
 
+=======
+>>>>>>> debian/control
diff --git a/debian/gbp.conf b/debian/gbp.conf
index cec628c..992b1d8 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,2 +1,6 @@
 [DEFAULT]
 pristine-tar = True
+
+
+[import-orig]
+filter = [ 'debian' ]
diff --git a/debian/libsgutils2-2.symbols b/debian/libsgutils2-2.symbols
index 4665a75..23a3afe 100644
--- a/debian/libsgutils2-2.symbols
+++ b/debian/libsgutils2-2.symbols
@@ -1,4 +1,4 @@
-libsgutils2.so.2 libsgutils2-2 #MINVER#
+libsgutils2-1.45.so.2 libsgutils2-2 #MINVER#
  check_pt_file_handle@Base 1.43
  clear_scsi_pt_obj@Base 1.27
  construct_scsi_pt_obj@Base 1.27
@@ -9,8 +9,11 @@ libsgutils2.so.2 libsgutils2-2 #MINVER#
  dWordHex@Base 1.27
  destruct_scsi_pt_obj@Base 1.27
  do_scsi_pt@Base 1.27
+ get_pt_actual_lengths@Base 1.45
+ get_pt_duration_ns@Base 1.45
  get_pt_file_handle@Base 1.43
  get_pt_nvme_nsid@Base 1.43
+ get_pt_req_lengths@Base 1.45
  get_pt_result@Base 1.43
  get_scsi_pt_duration_ms@Base 1.27
  set_scsi_pt_flags@Base 1.29
@@ -18,6 +21,7 @@ libsgutils2.so.2 libsgutils2-2 #MINVER#
  get_scsi_pt_os_err_str@Base 1.27
  get_scsi_pt_resid@Base 1.27
  get_scsi_pt_result_category@Base 1.27
+ get_scsi_pt_sense_buf@Base 1.45
  get_scsi_pt_sense_len@Base 1.27
  get_scsi_pt_status_response@Base 1.27
  get_scsi_pt_transport_err@Base 1.27
@@ -50,6 +54,7 @@ libsgutils2.so.2 libsgutils2-2 #MINVER#
  sg_bsg_major@Base 1.43
  sg_bsg_nvme_char_major_checked@Base 1.43
  sg_build_sense_buffer@Base 1.43
+ sg_checked_version_num@Base 1.45
  sg_chk_n_print3@Base 1.27
  sg_chk_n_print@Base 1.27
  sg_cmds_close_device@Base 1.27
@@ -61,18 +66,22 @@ libsgutils2.so.2 libsgutils2-2 #MINVER#
  sg_convert_errno@Base 1.43
  sg_decode_transportid_str@Base 1.43
  sg_do_nvme_pt@Base 1.43
+ sg_driver_version_num@Base 1.45
+ sg_duration_set_nano@Base 1.45
  sg_err_category3@Base 1.27
  sg_err_category@Base 1.27
  sg_err_category_new@Base 1.27
  sg_err_category_sense@Base 1.27
  sg_exit2str@Base 1.43
  sg_exit_str_arr@Base 1.43
+ sg_f2hex_arr@Base 1.45
  sg_find_bsg_nvme_char_major@Base 1.43
  sg_get_asc_ascq_str@Base 1.27
  sg_get_big_endian@Base 1.43
  sg_get_category_sense_str@Base 1.39
  sg_get_command_name@Base 1.27
  sg_get_command_size@Base 1.27
+ sg_get_command_str@Base 1.45
  sg_get_desig_assoc_str@Base 1.42
  sg_get_desig_code_set_str@Base 1.42
  sg_get_desig_type_str@Base 1.42
@@ -88,6 +97,7 @@ libsgutils2.so.2 libsgutils2-2 #MINVER#
  sg_get_nvme_opcode_name@Base 1.43
  sg_get_opcode_name@Base 1.27
  sg_get_opcode_sa_name@Base 1.27
+ sg_get_opcode_translation@Base 1.45
  sg_get_page_size@Base 1.43
  sg_get_pdt_str@Base 1.27
  sg_get_scsi_status_str@Base 1.27
@@ -141,6 +151,8 @@ libsgutils2.so.2 libsgutils2-2 #MINVER#
  sg_lib_zoning_in_arr@Base 1.41
  sg_lib_zoning_out_arr@Base 1.41
  sg_lin_page_size@Base 1.43
+ sg_linux_get_sg_version@Base 1.45
+ sg_linux_sense_print@Base 1.45
  sg_ll_3party_copy_out@Base 1.38
  sg_ll_ata_pt@Base 1.27
  sg_ll_extended_copy@Base 1.36
@@ -219,8 +231,8 @@ libsgutils2.so.2 libsgutils2-2 #MINVER#
  sg_nvme_char_major@Base 1.43
  sg_nvme_desc2sense@Base 1.43
  sg_nvme_status2scsi@Base 1.43
- sg_opcode_info_arr@Base 1.43
  sg_print_command@Base 1.27
+ sg_print_command_len@Base 1.45
  sg_print_driver_status@Base 1.27
  sg_print_host_status@Base 1.27
  sg_print_masked_status@Base 1.27
@@ -241,3 +253,16 @@ libsgutils2.so.2 libsgutils2-2 #MINVER#
  sntl_init_dev_stat@Base 1.43
  sntl_resp_mode_select10@Base 1.43
  sntl_resp_mode_sense10@Base 1.43
+ sg_scsi_sense_desc_find@Base 1.45
+ sg_set_big_endian@Base 1.45
+ sg_set_binary_mode@Base 1.45
+ sg_set_text_mode@Base 1.45
+ sg_set_warnings_strm@Base 1.45
+ sg_simple_inquiry@Base 1.45
+ sg_simple_inquiry_pt@Base 1.45
+ sg_t10_uuid_desig2str@Base 1.45
+ sg_vpd_dev_id_iter@Base 1.45
+ sg_warnings_strm@Base 1.45
+ sntl_init_dev_stat@Base 1.45
+ sntl_resp_mode_select10@Base 1.45
+ sntl_resp_mode_sense10@Base 1.45
diff --git a/debian/libsgutils2-2.symbols.kfreebsd b/debian/libsgutils2-2.symbols.kfreebsd
index bb98206..009f28a 100644
--- a/debian/libsgutils2-2.symbols.kfreebsd
+++ b/debian/libsgutils2-2.symbols.kfreebsd
@@ -1,4 +1,4 @@
-libsgutils2.so.2 libsgutils2-2 #MINVER#
+libsgutils2-1.45.so.2 libsgutils2-2 #MINVER#
  clear_scsi_pt_obj@Base 1.27
  construct_scsi_pt_obj@Base 1.27
  dStrHex@Base 1.27
diff --git a/debian/patches/fix-udevadm-path.patch b/debian/patches/0001-Fix-path-for-udevadm.patch
similarity index 72%
rename from debian/patches/fix-udevadm-path.patch
rename to debian/patches/0001-Fix-path-for-udevadm.patch
index a6bd025..0f7cce2 100644
--- a/debian/patches/fix-udevadm-path.patch
+++ b/debian/patches/0001-Fix-path-for-udevadm.patch
@@ -1,12 +1,22 @@
-Add new path for udevadm. See DBug #852585
+From: Ritesh Raj Sarraf <[e-mail]>
+Date: Fri, 10 Apr 2020 18:13:13 +0530
+Subject: Fix path for udevadm
+
+See DBug #852585, for details
+---
+ scripts/rescan-scsi-bus.sh | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/scripts/rescan-scsi-bus.sh b/scripts/rescan-scsi-bus.sh
+index 46fe6c0..7d0bbf7 100755
 --- a/scripts/rescan-scsi-bus.sh
 +++ b/scripts/rescan-scsi-bus.sh
-@@ -430,12 +430,12 @@
+@@ -452,12 +452,12 @@ getluns()
  udevadm_settle()
  {
    local tmo=60
--  if test -x /sbin/udevadm; then 
-+  if test -x /bin/udevadm; then 
+-  if [ -x /sbin/udevadm ] ; then
++  if [ -x /bin/udevadm ] ; then
      print_and_scroll_back " Calling udevadm settle (can take a while) "
      # Loop for up to 60 seconds if sd devices still are settling..
      # This allows us to continue if udev events are stuck on multipaths in recovery mode
@@ -16,7 +26,7 @@ Add new path for udevadm. See DBug #852585
          break;
        fi
        let tmo=$tmo-1
-@@ -767,7 +767,7 @@
+@@ -799,7 +799,7 @@ findremapped()
  
    # Trigger udev to update the info
    echo -n "Triggering udev to update device information... "
@@ -25,10 +35,10 @@ Add new path for udevadm. See DBug #852585
    udevadm_settle 2>&1 /dev/null
    echo "Done"
  
-@@ -1331,7 +1331,7 @@
+@@ -1367,7 +1367,7 @@ if [ -n "$mp_enable" ] && [ $rmvd_found -gt 0 ] ; then
      flushmpaths 1
    fi
-   if test $found -gt 0 ; then
+   if [ $found -gt 0 ] ; then
 -    /sbin/udevadm trigger --sysname-match=sd*
 +    /bin/udevadm trigger --sysname-match=sd*
      udevadm_settle
diff --git a/debian/patches/series b/debian/patches/series
index 0f8e6b5..d8206e3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,6 @@
+<<<<<<< debian/patches/series
 fix-udevadm-path.patch
 fix-SCSI_IDENT_LUN_NAA_EXT-udev-rule.patch
+=======
+0001-Fix-path-for-udevadm.patch
+>>>>>>> debian/patches/series
diff --git a/debian/rules b/debian/rules
index d1c1231..f65efe3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
 
-# Uncomment this to turn on verbose mode. 
+# Uncomment this to turn on verbose mode.
 # export DH_VERBOSE=1
 
 DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2>/dev/null)
@@ -18,7 +18,7 @@ DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2>/dev/null)
 INITRAMFS=$(CURDIR)/debian/sg3-utils-udev/usr/share/initramfs-tools/
 
 %:
-	dh "$@" --with autoreconf
+	dh "$@"
 
 override_dh_install:
 	dh_testdir
@@ -28,9 +28,15 @@ override_dh_install:
 	[ ! -f scripts/55-scsi-sg3_id.rules ] || cp scripts/55-scsi-sg3_id.rules debian/sg3-udeb.scsi-sg3_id.udev
 	[ ! -f scripts/58-scsi-sg3_symlink.rules ] || cp scripts/58-scsi-sg3_symlink.rules debian/sg3-utils-udev.scsi-sg3_symlink.udev
 
+<<<<<<< debian/rules
 	dh_installudev -psg3-utils-udev --priority=55 --name=scsi-sg3_id 
 	dh_installudev -psg3-utils-udev --priority=58 --name=scsi-sg3_symlink 
 	dh_installudev -psg3-udeb --priority=55 --name=scsi-sg3_id 
+=======
+	dh_installudev -psg3-utils-udev --priority=55 --name=scsi-sg3_id
+	dh_installudev -psg3-utils-udev --priority=58 --name=scsi-sg3_symlink
+	dh_installudev -psg3-udeb --priority=55 --name=scsi-sg3_id
+>>>>>>> debian/rules
 
 	install -D -m 755 debian/initramfs/hooks $(INITRAMFS)/hooks/sg3-utils
 
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
new file mode 100644
index 0000000..97eac72
--- /dev/null
+++ b/debian/upstream/metadata
@@ -0,0 +1 @@
+Bug-Submit: [e-mail]
diff --git a/depcomp b/depcomp
index b39f98f..65cbf70 100755
--- a/depcomp
+++ b/depcomp
@@ -1,9 +1,9 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2016-01-11.22; # UTC
+scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@ scriptversion=2016-01-11.22; # UTC
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -783,7 +783,7 @@ exit 0
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
 # time-stamp-time-zone: "UTC0"
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 9a1816e..fc8e85d 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -3,15 +3,16 @@ man_MANS = \
 	scsi_mandat.8 scsi_readcap.8 scsi_ready.8 scsi_satl.8 scsi_start.8 \
 	scsi_stop.8 scsi_temperature.8 sg3_utils.8 sg_bg_ctl.8 \
 	sg_compare_and_write.8 sg_decode_sense.8 sg_format.8 sg_get_config.8 \
-	sg_get_lba_status.8 sg_ident.8 sg_inq.8 sg_logs.8 sg_luns.8 \
-	sg_modes.8 sg_opcodes.8 sg_persist.8 sg_prevent.8 sg_raw.8 sg_rdac.8 \
-	sg_read_attr.8 sg_read_block_limits.8 sg_read_buffer.8 \
-	sg_read_long.8 sg_readcap.8 sg_reassign.8 sg_referrals.8 \
-	sg_rep_zones.8 sg_requests.8 sg_reset_wp.8 sg_rmsn.8 sg_rtpg.8 \
-	sg_safte.8 sg_sanitize.8 sg_sat_identify.8 sg_sat_phy_event.8 \
-	sg_sat_read_gplog.8 sg_sat_set_features.8 sg_seek.8 sg_senddiag.8 \
-	sg_ses.8 sg_ses_microcode.8 sg_start.8 sg_stpg.8 sg_stream_ctl.8 \
-	sg_sync.8 sg_timestamp.8 sg_turs.8 sg_unmap.8 sg_verify.8 sg_vpd.8 \
+	sg_get_elem_status.8 sg_get_lba_status.8 sg_ident.8 sg_inq.8 \
+	sg_logs.8 sg_luns.8 sg_modes.8 sg_opcodes.8 sg_persist.8 \
+	sg_prevent.8 sg_raw.8 sg_rdac.8 sg_read_attr.8 \
+	sg_read_block_limits.8 sg_read_buffer.8 sg_read_long.8 sg_readcap.8 \
+	sg_reassign.8 sg_referrals.8 sg_rep_zones.8 sg_requests.8 \
+	sg_reset_wp.8 sg_rmsn.8 sg_rtpg.8 sg_safte.8 sg_sanitize.8 \
+	sg_sat_identify.8 sg_sat_phy_event.8 sg_sat_read_gplog.8 \
+	sg_sat_set_features.8 sg_seek.8 sg_senddiag.8 sg_ses.8 \
+	sg_ses_microcode.8 sg_start.8 sg_stpg.8 sg_stream_ctl.8 sg_sync.8 \
+	sg_timestamp.8 sg_turs.8 sg_unmap.8 sg_verify.8 sg_vpd.8 \
 	sg_wr_mode.8 sg_write_buffer.8 sg_write_long.8 sg_write_same.8 \
 	sg_write_verify.8 sg_write_x.8 sg_zone.8
 CLEANFILES =
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 3097608..6a37b4f 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -283,17 +283,17 @@ top_srcdir = @top_srcdir@
 man_MANS = scsi_mandat.8 scsi_readcap.8 scsi_ready.8 scsi_satl.8 \
 	scsi_start.8 scsi_stop.8 scsi_temperature.8 sg3_utils.8 \
 	sg_bg_ctl.8 sg_compare_and_write.8 sg_decode_sense.8 \
-	sg_format.8 sg_get_config.8 sg_get_lba_status.8 sg_ident.8 \
-	sg_inq.8 sg_logs.8 sg_luns.8 sg_modes.8 sg_opcodes.8 \
-	sg_persist.8 sg_prevent.8 sg_raw.8 sg_rdac.8 sg_read_attr.8 \
-	sg_read_block_limits.8 sg_read_buffer.8 sg_read_long.8 \
-	sg_readcap.8 sg_reassign.8 sg_referrals.8 sg_rep_zones.8 \
-	sg_requests.8 sg_reset_wp.8 sg_rmsn.8 sg_rtpg.8 sg_safte.8 \
-	sg_sanitize.8 sg_sat_identify.8 sg_sat_phy_event.8 \
-	sg_sat_read_gplog.8 sg_sat_set_features.8 sg_seek.8 \
-	sg_senddiag.8 sg_ses.8 sg_ses_microcode.8 sg_start.8 sg_stpg.8 \
-	sg_stream_ctl.8 sg_sync.8 sg_timestamp.8 sg_turs.8 sg_unmap.8 \
-	sg_verify.8 sg_vpd.8 sg_wr_mode.8 sg_write_buffer.8 \
+	sg_format.8 sg_get_config.8 sg_get_elem_status.8 \
+	sg_get_lba_status.8 sg_ident.8 sg_inq.8 sg_logs.8 sg_luns.8 \
+	sg_modes.8 sg_opcodes.8 sg_persist.8 sg_prevent.8 sg_raw.8 \
+	sg_rdac.8 sg_read_attr.8 sg_read_block_limits.8 \
+	sg_read_buffer.8 sg_read_long.8 sg_readcap.8 sg_reassign.8 \
+	sg_referrals.8 sg_rep_zones.8 sg_requests.8 sg_reset_wp.8 \
+	sg_rmsn.8 sg_rtpg.8 sg_safte.8 sg_sanitize.8 sg_sat_identify.8 \
+	sg_sat_phy_event.8 sg_sat_read_gplog.8 sg_sat_set_features.8 \
+	sg_seek.8 sg_senddiag.8 sg_ses.8 sg_ses_microcode.8 sg_start.8 \
+	sg_stpg.8 sg_stream_ctl.8 sg_sync.8 sg_timestamp.8 sg_turs.8 \
+	sg_unmap.8 sg_verify.8 sg_vpd.8 sg_wr_mode.8 sg_write_buffer.8 \
 	sg_write_long.8 sg_write_same.8 sg_write_verify.8 sg_write_x.8 \
 	sg_zone.8 $(am__append_1) $(am__append_3) $(am__append_5)
 CLEANFILES = $(am__append_2) $(am__append_4) $(am__append_6)
@@ -317,8 +317,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -385,7 +385,10 @@ ctags CTAGS:
 cscope cscopelist:
 
 
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
diff --git a/doc/rescan-scsi-bus.sh.8 b/doc/rescan-scsi-bus.sh.8
index 4435c7d..fa93fcf 100644
--- a/doc/rescan-scsi-bus.sh.8
+++ b/doc/rescan-scsi-bus.sh.8
@@ -40,10 +40,10 @@ enable debug                       [default: 0]
 flush failed multipath devices     [default: disabled]
 .TP
 \fB\-\-forceremove\fR
-remove and readd every device (DANGEROUS)
+remove stale devices (DANGEROUS)
 .TP
 \fB\-\-forcerescan\fR
-rescan existing devices
+remove and readd existing devices (DANGEROUS)
 .TP
 \fB\-h\fR, \fB\-\-help\fR
 print usage message then exit
diff --git a/doc/scsi_logging_level.8 b/doc/scsi_logging_level.8
index 10e946b..062d3f4 100644
--- a/doc/scsi_logging_level.8
+++ b/doc/scsi_logging_level.8
@@ -1,4 +1,4 @@
-.TH SCSI_LOGGING_LEVEL "8" "January 2014" "sg3_utils\-1.41" SG3_UTILS
+.TH SCSI_LOGGING_LEVEL "8" "September 2018" "sg3_utils\-1.45" SG3_UTILS
 .SH NAME
 scsi_logging_level \- access Linux SCSI logging level information
 .SH SYNOPSIS
diff --git a/doc/sg3_utils.8 b/doc/sg3_utils.8
index eaf6489..b336707 100644
--- a/doc/sg3_utils.8
+++ b/doc/sg3_utils.8
@@ -1,10 +1,10 @@
-.TH SG3_UTILS "8" "September 2018" "sg3_utils\-1.44" SG3_UTILS
+.TH SG3_UTILS "8" "February 2020" "sg3_utils\-1.45" SG3_UTILS
 .SH NAME
 sg3_utils \- a package of utilities for sending SCSI commands
 .SH SYNOPSIS
 .B sg_*
 [\fI\-\-dry\-run\fR] [\fI\-\-enumerate\fR] [\fI\-\-help\fR] [\fI\-\-hex\fR]
-[\fI\-\-in=FN\fR] [\fI\-\-maxlen=LEN\fR] [\fI\-\-raw\fR]
+[\fI\-\-in=FN\fR] [\fI\-\-inhex=FN\fR] [\fI\-\-maxlen=LEN\fR] [\fI\-\-raw\fR]
 [\fI\-\-timeout=SECS\fR] [\fI\-\-verbose\fR] [\fI\-\-version\fR]
 [\fIOTHER_OPTIONS\fR] \fIDEVICE\fR
 .SH DESCRIPTION
@@ -35,7 +35,7 @@ Architecture Model (SAM) with SAM\-5 being the most recent standard (ANSI
 INCITS 515\-2016) with the most recent draft being SAM\-6 revision 4 . SCSI
 commands in common with all device types can be found in SCSI Primary
 Commands (SPC) of which SPC\-4 is the most recent standard (ANSI INCITS
-513-2015). The most recent SPC draft is SPC\-5 revision 19. Block device
+513-2015). The most recent SPC draft is SPC\-5 revision 21. Block device
 specific commands (e.g. as used by disks) are in SBC, those for tape drives
 in SSC, those for SCSI enclosures in SES and those for CD/DVD/BD drives in
 MMC.
@@ -98,6 +98,15 @@ SCSI to NVMe Translation Layer within the underlying library).
 Several utilities have their own environment variable setting (e.g.
 sg_persist has SG_PERSIST_IN_RDONLY). See individual utility man pages
 for more information.
+.PP
+There is a Linux specific environment variable called SG3_UTILS_LINUX_NANO
+that if defined and the sg driver in the system is 4.0.30 or later, will
+show command durations in nanoseconds rather than the default milliseconds.
+Command durations are typically only shown if \-\-verbose is used 3 or more
+times. Due to an interface problem (a 32 bit integer that should be 64 bits
+with the benefit of hindsight) the maximum duration that can be represented
+in nanoseconds is about 4.2 seconds. If longer durations may occur then
+don't define this environment variable (or undefine it).
 .SH LINUX DEVICE NAMING
 Most disk block devices have names like /dev/sda, /dev/sdb, /dev/sdc, etc.
 SCSI disks in Linux have always had names like that but in recent Linux
@@ -235,8 +244,8 @@ The NVME\-MI SES Send and SES Receive commands correspond to the SCSI
 SEND DIAGNOSTIC and RECEIVE DIAGNOSTIC RESULTS commands respectively.
 There are however a few other commands that need to be translated, the
 most important of which is the SCSI INQUIRY command to the NVMe Identify
-controller/namespace. Version 1.43 of these utilities contain a small
-SNTL (SCSI to NVMe Translation Layer) to take care of these details.
+controller/namespace. Starting in version 1.43 these utilities contain a
+small SNTL (SCSI to NVMe Translation Layer) to take care of these details.
 .PP
 As a side effect of this "juggling" if the sg_inq utility is used (without
 the \-\-page= option) on a NVMe \fIDEVICE\fR then the actual NVMe
@@ -251,6 +260,12 @@ package assume they are talking to a SCSI device and decode any response
 accordingly. One easy way for users to see the underlying device is a
 NVMe device is the standard INQUIRY response Vendor Identification field
 of "NVMe    " (an 8 character long string with 4 spaces to the right).
+.PP
+The following SCSI commands are currently supported by the SNTL library:
+INQUIRY, MODE SELECT(10), MODE SENSE(10), READ CAPACITY(10 and 16),
+RECEIVE DIAGNOSTIC RESULTS, REQUEST SENSE, REPORT LUNS, REPORT SUPPORTED
+OPERATION CODES, REPORT SUPPORTED TASK MANAGEMENT FUNCTIONS, SEND
+DIAGNOSTICS, and TEST UNIT READY.
 .SH EXIT STATUS
 To aid scripts that call these utilities, the exit status is set to indicate
 success (0) or failure (1 or more). Note that some of the lower values
@@ -398,6 +413,11 @@ like "shouldn't/can't get here". Perhaps the author should be informed.
 .B 33
 the command sent to \fIDEVICE\fR has timed out.
 .TP
+.B 34
+this is a Windows only exit status and indicates that the Windows error
+number (32 bits) cannot meaningfully be mapped to an equivalent Unix error
+number returned as the exit status (7 bits).
+.TP
 .B 36
 no error has occurred plus the utility wants to convey a boolean value
 of false. The corresponding true value is conveyed by a 0 exit status.
@@ -553,8 +573,14 @@ act on the input, typically it acts on the output data.
 Since the structure of the data returned by SCSI commands varies
 considerably then the usage information or the manpage of the utility being
 used should be checked. In some cases \fI\-\-hex\fR may need to be used
-multiple times (and is more conveniently given as '\-HH' or '\-HHH). In
-other cases the name of this option is \fI\-\-inhex=FN\fR.
+multiple times (and is more conveniently given as '\-HH' or '\-HHH).
+.TP
+\fB\-i\fR, \fB\-\-inhex\fR=\fIFN\fR
+This option has the same or similar functionality as \fI\-\-in=FN\fR. And
+perhaps 'inhex' is more descriptive since by default, ASCII hexadecimal is
+expected in the contents of file: \fIFN\fR. Alternatively the short form
+option may be \fI\-I\fR or \fI\-X\fR. See the "FORMAT OF FILES CONTAINING
+ASCII HEX" section below for more information.
 .TP
 \fB\-m\fR, \fB\-\-maxlen\fR=\fILEN\fR
 several important SCSI commands (e.g. INQUIRY and MODE SENSE) have response
@@ -650,19 +676,39 @@ An example is "2k" for 2048. The large tera and peta suffixes are only
 available for numeric arguments that might require 64 bits to represent
 internally.
 .PP
-A suffix of the form "x<n>" multiplies the leading number by <n>. An
-example is "2x33" for "66". The leading number cannot be "0" (zero) as
-that would be interpreted as a hexadecimal number (see below).
-.PP
 These multiplicative suffixes are compatible with GNU's dd command (since
 2002) which claims compliance with SI and with IEC 60027\-2.
 .PP
+A suffix of the form "x<n>" multiplies the preceding number by <n>. An
+example is "2x33" for "66". The left argument cannot be '0' as '0x' will
+be interpreted as hexadecimal number prefix (see below). The left
+argument to the multiplication must end in a hexadecimal digit (i.e.
+0 to f) and the whole expression cannot have any embedded whitespace (e.g.
+spaces). An ugly example: "0xfx0x2" for 30.
+.PP
+A suffix of the form "+<n>" adds the preceding number to <n>. An example
+is "3+1k" for "1027". The left argument to the addition must end in a
+hexadecimal digit (i.e. 0 to f) and the whole expression cannot have any
+embedded whitespace (e.g. spaces). Another example: "0xf+0x2" for 17.
+.PP
 Alternatively numerical arguments can be given in hexadecimal. There are
 two syntaxes. The number can be preceded by either "0x" or "0X" as found
 in the C programming language. The second hexadecimal representation is a
 trailing "h" or "H" as found in (storage) standards. When hex numbers are
 given, multipliers cannot be used. For example the decimal value "256" can
 be given as "0x100" or "100h".
+.SH FORMAT OF FILES CONTAINING ASCII HEX
+Such a file is assumed to contain a sequence of one or two digit ASCII
+hexadecimal values separated by whitespace. "Whitespace consists of either
+spaces, tabs, blank lines, or any combination thereof". Each one or two digit
+ASCII hex pair is decoded into a byte (i.e. 8 bits). The following will be
+decoded to valid (ascending valued)
+bytes: '0', '01', '3', 'c', 'F', '4a', 'cC', 'ff'.
+Lines containing only whitespace are ignored. The contents of any line
+containing a hash mark ('#') is ignored from that point until the end of that
+line. Users are encouraged to use hash marks to introduce comments in hex
+files. The author uses the extension'.hex' on such files. Examples can be
+found in the 'inhex' directory.
 .SH MICROCODE AND FIRMWARE
 There are two standardized methods for downloading microcode (i.e. device
 firmware) to a SCSI device. The more general way is with the SCSI WRITE
@@ -706,7 +752,7 @@ CREDITS file and individual source files (in the 'src' directory).
 .SH "REPORTING BUGS"
 Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
-Copyright \(co 1999\-2018 Douglas Gilbert
+Copyright \(co 1999\-2020 Douglas Gilbert
 .br
 Some utilities are distributed under a GPL version 2 license while
 others, usually more recent ones, are under a FreeBSD license. The files
diff --git a/doc/sg_dd.8 b/doc/sg_dd.8
index 881d11e..2c6caed 100644
--- a/doc/sg_dd.8
+++ b/doc/sg_dd.8
@@ -1,4 +1,4 @@
-.TH SG_DD "8" "August 2018" "sg3_utils\-1.43" SG3_UTILS
+.TH SG_DD "8" "January 2020" "sg3_utils\-1.45" SG3_UTILS
 .SH NAME
 sg_dd \- copy data to and from files and devices, especially SCSI
 devices
@@ -13,6 +13,7 @@ devices
 [\fIcoe=\fR{0|1|2|3}] [\fIcoe_limit=CL\fR] [\fIdio=\fR{0|1}]
 [\fIodir=\fR{0|1}] [\fIof2=OFILE2\fR] [\fIretries=RETR\fR] [\fIsync=\fR{0|1}]
 [\fItime=\fR{0|1}] [\fIverbose=VERB\fR] [\fI\-\-dry\-run\fR] [\fI\-V\fR]
+[\fI\-\-verify\fR]
 .SH DESCRIPTION
 .\" Add any additional description here
 .PP
@@ -28,6 +29,15 @@ The first group in the synopsis above are "standard" Unix
 operands. The second group are extra options added by this utility.
 Both groups are defined below.
 .PP
+When the \fI\-\-verify\fR option is given, then the read side is the
+same but the on the write side, the WRITE SCSI command is replaced by
+the VERIFY SCSI command. If any VERIFY commands yields a sense key of
+MISCOMPARE then the verify operation will stop. The \fI\-\-verify\fR
+option can only be used when \fIOFILE\fR is either a sg device or
+a block device with oflag=sgio also given. When the \fI\-\-verify\fR
+option is used, this utility works in a similar fashion to the Unix
+cmp(1) command.
+.PP
 This utility is only supported on Linux whereas most other utilities in the
 sg3_utils package have been ported to other operating systems. A utility
 called "ddpt" has similar syntax and functionality to sg_dd. ddpt drops some
@@ -101,7 +111,7 @@ copy \fICOUNT\fR blocks from \fIIFILE\fR to \fIOFILE\fR. Default is the
 minimum (of \fIIFILE\fR and \fIOFILE\fR) number of blocks that sg devices
 report from SCSI READ CAPACITY commands or that block devices (or their
 partitions) report. Normal files are not probed for their size. If
-\fIskip=SKIP\fR or \fIskip=SEEK\fR are given and the count is derived (i.e.
+\fIskip=SKIP\fR or \fIseek=SEEK\fR are given and the count is derived (i.e.
 not explicitly given) then the derived count is scaled back so that the
 copy will not overrun the device. If the file name is a block device
 partition and \fICOUNT\fR is not given then the size of the partition
@@ -208,6 +218,14 @@ outputs usage message and exits.
 when used once, this is equivalent to \fIverbose=1\fR. When used
 twice (e.g. "\-vv") this is equivalent to \fIverbose=2\fR, etc.
 .TP
+\fB\-x\fR, \fB\-\-verify\fR
+do a verify operation (like Unix command cmp(1)) rather than a copy. Cannot
+be used with "oflag=sparse". \fIof=OFILE\fR must be given and \fIOFILE\fR
+must be an sg device or a block device with "oflag=sgio" also given. Uses the
+SCSI VERIFY command with the BYTCHK field set to 1. The VERIFY command is
+used instead of WRITE when this option is given. There is no VERIFY(6)
+command.
+.TP
 \fB\-V\fR, \fB\-\-version\fR
 outputs version number information and exits.
 .SH CONVERSIONS
@@ -491,11 +509,13 @@ Written by Douglas Gilbert and Peter Allworth.
 .SH "REPORTING BUGS"
 Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
-Copyright \(co 2000\-2018 Douglas Gilbert
+Copyright \(co 2000\-2020 Douglas Gilbert
 .br
 This software is distributed under the GPL version 2. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .SH "SEE ALSO"
+cmp(1)
+.PP
 There is a web page discussing sg_dd at http://sg.danny.cz/sg/sg_dd.html
 .PP
 A POSIX threads version of this utility called
diff --git a/doc/sg_decode_sense.8 b/doc/sg_decode_sense.8
index 2396ae3..5a141bf 100644
--- a/doc/sg_decode_sense.8
+++ b/doc/sg_decode_sense.8
@@ -1,9 +1,9 @@
-.TH SG_DECODE_SENSE "8" "August 2018" "sg3_utils\-1.43" SG3_UTILS
+.TH SG_DECODE_SENSE "8" "June 2019" "sg3_utils\-1.45" SG3_UTILS
 .SH NAME
 sg_decode_sense \- decode SCSI sense and related data
 .SH SYNOPSIS
 .B sg_decode_sense
-[\fI\-\-binary=FN\fR] [\fI\-\-cdb\fR] [\fI\-\-err=ES\fR] [\fI\-\-file=FN\fR]
+[\fI\-\-binary=BFN\fR] [\fI\-\-cdb\fR] [\fI\-\-err=ES\fR] [\fI\-\-file=HFN\fR]
 [\fI\-\-help\fR] [\fI\-\-hex\fR] [\fI\-\-nospace\fR] [\fI\-\-status=SS\fR]
 [\fI\-\-verbose\fR] [\fI\-\-version\fR] [\fI\-\-write=WFN\fR]
 [H1 H2 H3 ...]
@@ -43,8 +43,8 @@ are ignored apart from \fI\-\-verbose\fR.
 .SH OPTIONS
 Arguments to long options are mandatory for short options as well.
 .TP
-\fB\-b\fR, \fB\-\-binary\fR=\fIFN\fR
-the sense data is read in binary from a file called \fIFN\fR.
+\fB\-b\fR, \fB\-\-binary\fR=\fIBFN\fR
+the sense data is read in binary from a file called \fIBFN\fR.
 .TP
 \fB\-c\fR, \fB\-\-cdb\fR
 treat the given string of hex arguments as bytes in a SCSI CDB and
@@ -60,12 +60,12 @@ is given two or more times a longer form of the message is output. In all
 cases the message is less than 128 characters long with one trailing line
 feed. All other command line options and arguments are ignored.
 .TP
-\fB\-f\fR, \fB\-\-file\fR=\fIFN\fR
-the sense data is read in ASCII hexadecimal from a file called \fIFN\fR.
+\fB\-f\fR, \fB\-\-file\fR=\fIHFN\fR
+the sense data is read in ASCII hexadecimal from a file called \fIHFN\fR.
 The sense data should appear as a sequence of bytes separated by space,
 comma, tab or newline. Everything from and including a hash symbol to the
 end of that line is ignored. If \fI\-\-nospace\fR is set then no separator
-is required between the ASCII hexadecimal digits in \fIFN\fR with bytes
+is required between the ASCII hexadecimal digits in \fIHFN\fR with bytes
 decoded from pairs of ASCII hexadecimal digits.
 .TP
 \fB\-h\fR, \fB\-\-help\fR
@@ -82,7 +82,7 @@ expect ASCII hexadecimal to be a string of hexadecimal digits with no
 spaces between them. Bytes are decoded by taking two hexadecimal digits
 at a time, so an even number of digits is expected. The string of
 hexadecimal digits may be on the command line (replacing "H1 H2 H3")
-or spread across multiple lines the \fIFN\fR given to \fI\-\-file=\fR.
+or spread across multiple lines the \fIHFN\fR given to \fI\-\-file=\fR.
 On the command line, spaces (or other whitespace characters) between
 sequences of hexadecimal digits are ignored; the maximum command line
 hex string is 1023 characters long.
@@ -148,7 +148,7 @@ Written by Douglas Gilbert.
 .SH "REPORTING BUGS"
 Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
-Copyright \(co 2010\-2018 Douglas Gilbert
+Copyright \(co 2010\-2019 Douglas Gilbert
 .br
 This software is distributed under a FreeBSD license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/doc/sg_format.8 b/doc/sg_format.8
index d1d3fde..84ae8f5 100644
--- a/doc/sg_format.8
+++ b/doc/sg_format.8
@@ -1,17 +1,17 @@
-.TH SG_FORMAT "8" "September 2018" "sg3_utils\-1.43" SG3_UTILS
+.TH SG_FORMAT "8" "January 2020" "sg3_utils\-1.45" SG3_UTILS
 .SH NAME
-sg_format \- format, resize a SCSI disk or format a tape
+sg_format \- format, format with preset, resize SCSI disk; format tape
 .SH SYNOPSIS
 .B sg_format
 [\fI\-\-cmplst=\fR{0|1}] [\fI\-\-count=COUNT\fR] [\fI\-\-dcrt\fR]
 [\fI\-\-dry\-run\fR] [\fI\-\-early\fR] [\fI\-\-ffmt=FFMT\fR]
-[\fI\-\-fmtpinfo=FPI\fR] [\fI\-\-format\fR] [\fI\-\-help\fR]
-[\fI\-\-ip\-def\fR] [\fI\-\-long\fR] [\fI\-\-mode=MP\fR] [\fI\-\-pfu=PFU\fR]
-[\fI\-\-pie=PIE\fR] [\fI\-\-pinfo\fR] [\fI\-\-poll=PT\fR] [\fI\-\-quick\fR]
-[\fI\-\-resize\fR] [\fI\-\-rto_req\fR] [\fI\-\-security\fR] [\fI\-\-six\fR]
-[\fI\-\-size=LB_SZ\fR] [\fI\-\-tape=FM\fR] [\fI\-\-timeout=SECS\fR]
-[\fI\-\-verbose\fR] [\fI\-\-verify\fR] [\fI\-\-version\fR] [\fI\-\-wait\fR]
-\fIDEVICE\fR
+[\fI\-\-fmtmaxlba\R] [\fI\-\-fmtpinfo=FPI\fR] [\fI\-\-format\fR]
+[\fI\-\-help\fR] [\fI\-\-ip\-def\fR] [\fI\-\-long\fR] [\fI\-\-mode=MP\fR]
+[\fI\-\-pfu=PFU\fR] [\fI\-\-pie=PIE\fR] [\fI\-\-pinfo\fR] [\fI\-\-poll=PT\fR]
+[\fI\-\-preset=ID\fR] [\fI\-\-quick\fR] [\fI\-\-resize\fR] [\fI\-\-rto_req\fR]
+[\fI\-\-security\fR] [\fI\-\-six\fR] [\fI\-\-size=LB_SZ\fR]
+[\fI\-\-tape=FM\fR] [\fI\-\-timeout=SECS\fR] [\fI\-\-verbose\fR]
+[\fI\-\-verify\fR] [\fI\-\-version\fR] [\fI\-\-wait\fR] \fIDEVICE\fR
 .SH DESCRIPTION
 .\" Add any additional description here
 .PP
@@ -24,6 +24,12 @@ recommendation typically leaves aside a certain number of tracks, spread
 across the media, for reassignment of blocks to logical block addresses
 during the life of the disk.
 .PP
+This utility issues one of three SCSI format commands: FORMAT UNIT, FORMAT
+MEDIUM or FORMAT WITH PRESET. In the following description, unqualified
+sections will usually be referring to the SCSI FORMAT UNIT command. Both
+FORMAT UNIT and FORMAT WITH PRESET apply to disks (or disk\-like devices).
+The FORMAT MEDIUM command is for tapes.
+.PP
 This utility can format modern SCSI disks and potentially change their block
 size (if permitted) and the block count (i.e. number of accessible blocks on
 the media also known as "resizing"). Resizing a disk to less than the
@@ -42,11 +48,12 @@ response to a MODE SENSE command and the response to a READ CAPACITY command.
 The reason for this double check is to detect a "format corrupt" state (see
 the NOTES section). This usage will not modify the disk.
 .PP
-When this utility is used with the "\-\-format" (or "\-F") option it will
-attempt to format the given DEVICE. In the absence of the \fI\-\-quick\fR
-option there is a 15 second pause during which time the user is invited
-thrice (5 seconds apart) to abort sg_format. This occurs just prior the SCSI
-FORMAT UNIT command being issued. See the NOTES section for more information.
+When this utility is used with either \fI\-\-format\fR, \fI\-\-preset=ID\fR
+or \fI\-\-tape=FM\fR, it will attempt to format the given DEVICE. In the
+absence of the \fI\-\-quick\fR option there is a 15 second pause during which
+time the user is invited thrice (5 seconds apart) to abort sg_format. This
+occurs just prior the SCSI FORMAT UNIT, FORMAT WITH PRESET or FORMAT MEDIUM
+command being issued. See the NOTES section for more information.
 .PP
 Protection information (PI) is optional and is made up of one or more
 protection intervals, each made up of 8 bytes associated with a logical
@@ -58,8 +65,13 @@ INFORMATION section below for more information.
 .PP
 When the \fI\-\-tape=FM\fR option is given then the SCSI FORMAT MEDIUM
 command is sent to the \fIDEVICE\fR. FORMAT MEDIUM is defined in the SSC
-documents at T10 and prepares a volume for use. That may include
-partitioning the medium. See the section below on TAPE for more information.
+documents at T10 and prepares a volume for use. That may include partitioning
+the medium. See the section below on TAPE for more information.
+.PP
+The FORMAT WITH PRESET was added in draft SBC\-4 revision 18. A preset
+pattern, selected by the PRESET IDENTIFIER field (\fI\-\-id=FWPID\fR),
+is written to the disk. See the FORMAT PRESETS VPD page (0xb8) for a list
+of available Format preset identifiers and their associated data.
 .SH OPTIONS
 Arguments to long options are mandatory for short options as well.
 The options are arranged in alphabetical order based on the long
@@ -113,16 +125,23 @@ See NOTES section below.
 \fB\-D\fR, \fB\-\-dcrt\fR
 this option sets the DCRT bit in the FORMAT UNIT command's parameter list
 header. It will "disable certification". Certification verifies that blocks
-are usable during the format process. Using this option may speed the format.
-The default action of this utility (i.e. when this option is not given) is
-to clear the DCRT bit thereby requesting "media certification". When the DCRT
-bit is set, the FOV bit must also be set hence sg_format does that.
+are usable during the format process. Using this option may speed the format
+but \fI\-\-ffmt=FFMT\fR, if available, would probably be better. The default
+action of this utility (i.e. when this option is not given) is to clear the
+DCRT bit thereby requesting "media certification" (also unless another
+option needs it, the FOV bit will be cleared). When the DCRT bit is set, the
+FOV bit must also be set hence sg_format does that.
+.br
+If this option is given twice then certification is enabled by clearing the
+DCRT bit and setting the FOV bit. Both these bits are found in the parameter
+list associated with the FORMAT UNIT cdb.
 .TP
 \fB\-d\fR, \fB\-\-dry\-run\fR
 this option will parse the command line, do all the preparation but bypass
-the actual FORMAT UNIT or FORMAT MEDIUM commands. Also if the options would
-cause the logical block size to change, then the MODE SELECT command that
-would do that is also bypassed when the dry run option is given.
+the actual FORMAT UNIT, FORMAT WITH PRESET or FORMAT MEDIUM command. Also if
+the options would otherwise cause the logical block size to change, then the
+MODE SELECT command that would do that is also bypassed when the dry
+run option is given.
 .TP
 \fB\-e\fR, \fB\-\-early\fR
 during a format operation, The default action of this utility is to poll the
@@ -139,7 +158,7 @@ UNIT cdb. The field was introduced in SBC\-4 revision 10. The default value
 is 0 which implies the former action which is typically to overwrite all
 blocks on the \fIDEVICE\fR. That can take a long time (e.g. with hard disks
 over 10 TB in size that can be days). With \fIFFMT\fR set that time may be
-reduced to minutes. So it is worth trying if it is available.
+reduced to minutes or less. So it is worth trying if it is available.
 .br
 \fIFFMT\fR has values 1 and 2 for fast format with 3 being reserved
 currently. These two values include this description: "The device server
@@ -150,7 +169,12 @@ data has been written to, after the fast format. When \fIFFMT\fR is 1 the
 read operation should return "unspecified logical block data" and complete
 without error. When \fIFFMT\fR is 2 the read operation may yield check
 condition status with a sense key set to hardware error, medium error or
-command aborted. See SBC\-4 revision 15 section 4.35 for more details.
+command aborted. See draft SBC\-4 revision 16 section 4.34 for more details.
+.TP
+\fB\-b\fR, \fB\-\-fmtmaxlba\fR
+This option is only active if it is given together with the
+\fI\-\-preset=ID\fR option. If so it sets the FMTMAXLBA field in the FORMAT
+WITH PRESET command.
 .TP
 \fB\-f\fR, \fB\-\-fmtpinfo\fR=\fIFPI\fR
 sets the FMTPINFO field in the FORMAT UNIT cdb to a value between 0 and 3.
@@ -163,8 +187,10 @@ option should be used in their place. See the PROTECTION INFORMATION section
 below for more information.
 .TP
 \fB\-F\fR, \fB\-\-format\fR
-issue a SCSI FORMAT UNIT command.
-.B This will destroy all the data held on the media.
+issue one of the three SCSI "format" commands. In the absence of the
+\fI\-\-preset=ID\fR and \fI\-\-tape=FM\fR options, the SCSI FORMAT UNIT
+command is issued.
+.B These commands will destroy all the data held on the media.
 This option is required to change the block size of a disk. In the absence
 of the \fI\-\-quick\fR option, the user is given a 15 second count down to
 ponder the wisdom of doing this, during which time control\-C (amongst other
@@ -240,6 +266,12 @@ READY command is used, otherwise a REQUEST SENSE command is used. The
 default is currently 0 but this will change to 1 in the near future. See
 the NOTES sections below.
 .TP
+\fB\-E\fR, \fB\-\-preset\fR=\fIID\fR
+this option instructs this utility to issue a SCSI FORMAT WITH PRESET
+command. The PRESET IDENTIFIER field in that cdb is set to \fIID\fR. The
+IMMED field in that cdb is also set unless the \fI\-\-wait\fR option is
+also given, in which case it is cleared.
+.TP
 \fB\-Q\fR, \fB\-\-quick\fR
 the default action (i.e. when the option is not given) is to give the user
 15 seconds to reconsider doing a format operation on the \fIDEVICE\fR.
@@ -296,18 +328,18 @@ in a tape drive for use. Values for \fIFM\fR include 0 to do the "default"
 format; 1 to partition a volume and 2 to do a default format then partition.
 .TP
 \fB\-m\fR, \fB\-\-timeout\fR=\fISECS\fR
-where \fISECS\fR is the FORMAT UNIT or FORMAT MEDIUM command timeout in
-seconds. \fISECS\fR will only be used if it exceeds the internal timeout
-which is 20 seconds if the IMMED bit is set and 72000 seconds (20 hours)
-or higher if the IMMED bit is not set. If the disk size exceeds 4 TB then
-the timeout value is increased to 144000 seconds (40 hours). And if it is
-greater than 8 TB then the timeout value is increased to 288000 seconds (80
-hours). If the timeout is exceeded then the operating system will typically
-abort the command. Aborting a command may escalate to a LUN reset (or
-worse). A timeout may also leave the disk or tape format operation
-incomplete. And that may result in the disk or tape being in a "format
-corrupt" state requiring another format to remedy the situation. So for
-various reasons timeouts are best avoided.
+where \fISECS\fR is the FORMAT UNIT, FORMAT WITH PRESET or FORMAT MEDIUM
+command timeout in seconds. \fISECS\fR will only be used if it exceeds the
+internal timeout which is 20 seconds if the IMMED bit is set and 72000
+seconds (20 hours) or higher if the IMMED bit is not set. If the disk size
+exceeds 4 TB then the timeout value is increased to 144000 seconds (40 hours).
+And if it is greater than 8 TB then the timeout value is increased to
+288000 seconds (80 hours). If the timeout is exceeded then the operating
+system will typically abort the command. Aborting a command may escalate to
+a LUN reset (or worse). A timeout may also leave the disk or tape format
+operation incomplete. And that may result in the disk or tape being in
+a "format corrupt" state requiring another format to remedy the situation.
+So for various reasons command timeouts are best avoided.
 .TP
 \fB\-v\fR, \fB\-\-verbose\fR
 increase the level of verbosity, (i.e. debug output). "\-vvv" gives
@@ -324,9 +356,13 @@ print the version string and then exit.
 the default format action is to set the "IMMED" bit in the FORMAT UNIT
 command's (short) parameter header. If this option (i.e. \fI\-\-wait\fR) is
 given then the "IMMED" bit is not set. If \fI\-\-wait\fR is given then the
-FORMAT UNIT or FORMAT MEDIUM command waits until the format operation
-completes before returning its response. This can be many hours on large
-disks. See the \fI\-\-timeout=SECS\fR option.
+FORMAT UNIT, FORMAT WITH PRESET or FORMAT MEDIUM command waits until the
+format operation completes before returning its response. This can be many
+hours on large disks. See the \fI\-\-timeout=SECS\fR option.
+.br
+Alternatively this option may be useful when used together with
+\fI\-\-ffmt=FFMT\fR (and \fIFFMT\fR greater than 0) since the fast format
+may only be a matter of seconds.
 .SH LISTS
 The SBC\-3 draft (revision 20) defines PLIST, CLIST, DLIST and GLIST in
 section 4.10 on "Medium defects". Briefly, the PLIST is the "primary"
@@ -370,8 +406,8 @@ introduced in the SBC\-2 standard. SBC\-3 defines 4 protection types (types
 0 to 3) with protection type 0 meaning no PI is maintained. While a device
 may support one or more protection types, it can only be formatted with 1
 of the 4. To change a device's protection type, it must be re\-formatted.
-For more information see the Protection Information in section 4.22 of
-draft SBC\-4 revision 15.
+For more information see the Protection Information in section 4.21 of
+draft SBC\-4 revision 16.
 .PP
 A device that supports PI information (i.e. supports one or more protection
 types 1, 2 and 3) sets the "PROTECT" bit in its standard INQUIRY response. It
@@ -423,32 +459,35 @@ the current version of this utility defaults to using TEST UNIT READY
 commands to poll the disk to find out the progress of the format. The
 \fI\-\-poll=PT\fR option has been added to control this.
 .PP
-When the \fI\-\-format\fR option is given without the \fI\-\-wait\fR option
-then the SCSI FORMAT UNIT command is issued with the IMMED bit set which
-causes the SCSI command to return after it has started the format operation.
-The \fI\-\-early\fR option will cause sg_format to exit at that point.
-Otherwise the \fIDEVICE\fR is polled every 60 seconds or every 10 seconds
-if \fIFFMT\fR is non\-zero. The poll is with TEST UNIT READY or REQUEST SENSE
-commands until one reports an "all clear" (i.e. the format operation has
-completed). Normally these polling commands will result in a progress
-indicator (expressed as a percentage) being output to the screen. If the user
-gets bored watching the progress report then sg_format process can be
-terminated (e.g. with control\-C) without affecting the format operation
-which continues. However a target or device reset (or a power cycle) will
-probably cause the device to become "format corrupt".
-.PP
-When the \fI\-\-format\fR (or \fI\-\-tape\fR) and \fI\-\-wait\fR options are
-both given then this utility may take a long time to return. In this case
-care should be taken not to send any other SCSI commands to the disk as it
-may not respond leaving those commands queued behind the active format
-command. This may cause a timeout in the OS driver (in a lot shorter period
-than 20 hours applicable to some format operations). This may result in the
-OS resetting the disk leaving the format operation incomplete. This may leave
-the disk in a "format corrupt" state requiring another format to remedy
-the situation. Modern SCSI devices should yield a "not ready" sense key
-with an additional sense indicating a format is in progress. With older
-devices the user should take precautions that nothing attempts to access
-a device while it is being formatted.
+When the \fI\-\-format\fR, \fI\-\-preset=ID\fR or \fI\-\-tape=FM\fR option
+is given without the \fI\-\-wait\fR option then the corresponding SCSI
+command is issued with the IMMED bit set which causes the SCSI command to
+return after it has started the format operation. The \fI\-\-early\fR option
+will cause sg_format to exit at that point. Otherwise the \fIDEVICE\fR is
+polled every 60 seconds or every 10 seconds if \fIFFMT\fR is non\-zero. The
+poll is with TEST UNIT READY or REQUEST SENSE commands until one reports
+an "all clear" (i.e. the format operation has completed). Normally these
+polling commands will result in a progress indicator (expressed as a
+percentage) being output to the screen. If the user gets bored watching the
+progress report then sg_format process can be terminated (e.g. with
+control\-C) without affecting the format operation which continues. However
+a target or device reset (or a power cycle) will probably cause the format
+to cease and the \fIDEVICE\fR to become "format corrupt".
+.PP
+When the \fI\-\-format\fR (\fI\-\-preset=ID\fR or \fI\-\-tape\fR) and
+\fI\-\-wait\fR options are both given then this utility may take a long time
+to return. In this case care should be taken not to send any other SCSI
+commands to the disk as it may not respond leaving those commands queued
+behind the active format command. This may cause a timeout in the OS
+driver (in a lot shorter period than 20 hours applicable to some format
+operations). This may result in the OS resetting the disk leaving the format
+operation incomplete. This may leave the disk in a "format corrupt" state
+requiring another format to remedy the situation. Modern SCSI devices should
+yield a "not ready" sense key with an additional sense indicating a format
+is in progress. With older devices the user should take precautions that
+nothing attempts to access a device while it is being formatted. Unmounting
+in mounted file systems on a \fIDEVICE\fR prior to calling this utility
+is strongly advised.
 .PP
 When the block size (i.e. the number of bytes in each block) is changed
 on a disk two SCSI commands must be sent: a MODE SELECT to change the block
@@ -628,6 +667,17 @@ backed up.
 Now /dev/sdd should have 512 byte logical block size. And to switch it back:
 .PP
    # sg_format \-\-format \-\-ffmt=1 \-\-size=4096 /dev/sdd
+.PP
+Since fast formats can be very quick (a matter of seconds) using the
+\-\-wait option may be appropriate.
+.PP
+And tu use Format with preset this invocation might be used:
+.PP
+   # sg_format \-\-preset=1 \-\-fmtmaxlba /dev/sdd
+.PP
+The FORMAT PRESETS VPD page (0xb8) should be consulted to check that Preset
+identifier 0x1 is there and has the expected format (i.e. "default host aware
+zoned block device model with 512 bytes of user data in each logical block").
 .SH EXIT STATUS
 The exit status of sg_format is 0 when it is successful. Otherwise see
 the sg3_utils(8) man page. Unless the \fI\-\-wait\fR option is given, the
@@ -638,7 +688,7 @@ Written by Grant Grundler, James Bottomley and Douglas Gilbert.
 .SH "REPORTING BUGS"
 Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
-Copyright \(co 2005\-2018 Grant Grundler, James Bottomley and Douglas Gilbert
+Copyright \(co 2005\-2020 Grant Grundler, James Bottomley and Douglas Gilbert
 .br
 This software is distributed under the GPL version 2. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/doc/sg_get_elem_status.8 b/doc/sg_get_elem_status.8
new file mode 100644
index 0000000..a4d533f
--- /dev/null
+++ b/doc/sg_get_elem_status.8
@@ -0,0 +1,100 @@
+.TH SG_GET_ELEM_STATUS "8" "August 2019" "sg3_utils\-1.45" SG3_UTILS
+.SH NAME
+sg_get_elem_status \- send SCSI GET PHYSICAL ELEMENT STATUS command
+.SH SYNOPSIS
+.B sg_get_elem_status
+[\fI\-\-brief\fR] [\fI\-\-filter=FLT\fR] [\fI\-\-help\fR] [\fI\-\-hex\fR]
+[\fI\-\-inhex=FN\fR] [\fI\-\-maxlen=LEN\fR] [\fI\-\-raw\fR]
+[\fI\-\-readonly\fR] [\fI\-\-report\-type=RT\fR] [\fI\-\-starting=ELEM\fR]
+[\fI\-\-verbose\fR] [\fI\-\-version\fR] \fIDEVICE\fR
+.SH DESCRIPTION
+.\" Add any additional description here
+.PP
+Send the SCSI GET PHYSICAL ELEMENT STATUS command to the \fIDEVICE\fR and
+output the response. The command was introduced in (draft) SBC\-4 revision
+16.
+.PP
+The default action is to decode the response into one physical element
+status descriptor per line then output a header and the status descriptors
+to stdout.  The amount of output can be reduced by the \fI\-\-brief\fR option.
+.PP
+Rather than send this SCSI command to \fIDEVICE\fR, if the \fI\-\-inhex=FN\fR
+option is given, then the contents of the file named \fIFN\fR are decoded
+as ASCII hex and then processed if it was the response of this command.
+.SH OPTIONS
+Arguments to long options are mandatory for short options as well.
+.TP
+\fB\-b\fR, \fB\-\-brief\fR
+tbd
+.TP
+\fB\-f\fR, \fB\-\-filter\fR=\fIFLT\fR
+where \fIFLT\fR is placed in a two bit field called FILTER in the GET
+PHYSICAL ELEMENT STATUS command. Only two values are defined for that
+field: 0 for all element descriptors; 1 for those element descriptors that
+are outside 'spec' or have depopulation information to report. In both cases
+the REPORT TYPE and STARTING ELEMENT fields may further restrict (reduce)
+the number of element descriptors returned. The default value is zero.
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+output the usage message then exit.
+.TP
+\fB\-H\fR, \fB\-\-hex\fR
+output response to this command in ASCII hex.
+.TP
+\fB\-i\fR, \fB\-\-inhex\fR=\fIFN\fR
+where \fIFN\fR is a function name whose contents are assumed to be ASCII
+hexadecimal. If \fIDEVICE\fR is also given then \fIDEVICE\fR is ignored,
+a warning is issued and the utility continues, decoding the file named
+\fIFN\fR. See the "FORMAT OF FILES CONTAINING ASCII HEX" section in the
+sg3_utils manpage for more information. If the \fI\-\-raw\fR option is
+also given then the contents of \fIFN\fR are treated as binary.
+.TP
+\fB\-m\fR, \fB\-\-maxlen\fR=\fILEN\fR
+where \fILEN\fR is the (maximum) response length in bytes. It is placed in
+the cdb's "allocation length" field. If not given then 32 is used. 32 is
+enough space for the response header only.
+\fILEN\fR should be a multiple of 32 (e.g. 32, 64, and 96 are suitable).
+.TP
+\fB\-r\fR, \fB\-\-raw\fR
+output response in binary (to stdout) unless the \fI\-\-inhex=FN\fR option
+is also given. In that case the input file name (\fIFN\fR) is decoded as
+binary (and the output is _not_ in binary).
+.TP
+\fB\-R\fR, \fB\-\-readonly\fR
+open the \fIDEVICE\fR read\-only (e.g. in Unix with the O_RDONLY flag).
+The default is to open it read\-write.
+.TP
+\fB\-t\fR, \fB\-\-report\-type\fR=\fIRT\fR
+where \fIRT\fR will be placed in the REPORT TYPE field of the GET PHYSICAL
+ELEMENT STATUS command. Currently only two values are defined: 0
+for 'physical element' and 1: for 'storage element'. The default value
+is 1 .
+.TP
+\fB\-s\fR, \fB\-\-starting\fR=\fIELEM\fR
+where \fIELEM\fR is the placed in the STARTING ELEMENT field of the GET
+PHYSICAL ELEMENT STATUS command. Only physical elements with identifiers
+equal to or greater than \fIELEM\fR are returned. The default value is zero
+which while it isn't a valid element identifier (since they must be
+non\-zero) is given in an example in Annex L of SBC\-4 revision 17. So
+an \fIELEM\fR of zero is assumed to be valid in this context.
+.TP
+\fB\-v\fR, \fB\-\-verbose\fR
+increase the level of verbosity, (i.e. debug output). Additional output
+caused by this option is sent to stderr.
+.TP
+\fB\-V\fR, \fB\-\-version\fR
+print the version string and then exit.
+.SH EXIT STATUS
+The exit status of sg_get_elem_status is 0 when it is successful. Otherwise
+see the sg3_utils(8) man page.
+.SH AUTHORS
+Written by Douglas Gilbert.
+.SH "REPORTING BUGS"
+Report bugs to <dgilbert at interlog dot com>.
+.SH COPYRIGHT
+Copyright \(co 2019 Douglas Gilbert
+.br
+This software is distributed under a FreeBSD license. There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+.SH "SEE ALSO"
+.B sg_get_lba_status(8), sg3_utils(8)
diff --git a/doc/sg_get_lba_status.8 b/doc/sg_get_lba_status.8
index bc35208..347a958 100644
--- a/doc/sg_get_lba_status.8
+++ b/doc/sg_get_lba_status.8
@@ -1,12 +1,13 @@
-.TH SG_GET_LBA_STATUS "8" "August 2018" "sg3_utils\-1.43" SG3_UTILS
+.TH SG_GET_LBA_STATUS "8" "August 2019" "sg3_utils\-1.45" SG3_UTILS
 .SH NAME
 sg_get_lba_status \- send SCSI GET LBA STATUS(16 or 32) command
 .SH SYNOPSIS
 .B sg_get_lba_status
 [\fI\-\-16\fR] [\fI\-\-32\fR] [\fI\-\-brief\fR] [\fI\-\-element-id=EI\fR]
-[\fI\-\-help\fR] [\fI\-\-hex\fR] [\fI\-\-lba=LBA\fR] [\fI\-\-maxlen=LEN\fR]
-[\fI\-\-raw\fR] [\fI\-\-readonly\fR] [\fI\-\-report\-type=RT\fR]
-[\fI\-\-scan-len=SL\fR] [\fI\-\-verbose\fR] [\fI\-\-version\fR] \fIDEVICE\fR
+[\fI\-\-help\fR] [\fI\-\-hex\fR]  [\fI\-\-inhex=FN\fR] [\fI\-\-lba=LBA\fR]
+[\fI\-\-maxlen=LEN\fR] [\fI\-\-raw\fR] [\fI\-\-readonly\fR]
+[\fI\-\-report\-type=RT\fR] [\fI\-\-scan-len=SL\fR] [\fI\-\-verbose\fR]
+[\fI\-\-version\fR] \fIDEVICE\fR
 .SH DESCRIPTION
 .\" Add any additional description here
 .PP
@@ -17,12 +18,17 @@ block provisioning should support this command. The GET LBA STATUS(32)
 command was added in (draft) SBC\-4 revision 14.
 .PP
 The default action is to decode the response into one LBA status descriptor
-per line output to stdout. The descriptor LBA is output in hex (prefixed
-by '0x') and the number of blocks is output in decimal followed by the
-provisioning status and additional status in decimal. The provisioning status
-can be in the range 0 to 15 of which only 0 (mapped or unknown), 1 (unmapped),
-2 (anchored), 3 (mapped) and 4 (unknown) are used currently. The amount of
-output can be reduced by the \fI\-\-brief\fR option.
+per line then output a header and the status descriptors to stdout. The
+descriptor LBA is output in hex (prefixed by '0x') and the number of blocks
+is output in decimal followed by the provisioning status and additional status
+in decimal. The provisioning status can be in the range 0 to 15 of which only
+0 (mapped or unknown), 1 (unmapped), 2 (anchored), 3 (mapped) and 4 (unknown)
+are used currently. The amount of output can be reduced by the
+\fI\-\-brief\fR option.
+.PP
+Rather than send this SCSI command to \fIDEVICE\fR, if the \fI\-\-inhex=FN\fR
+option is given, then the contents of the file named \fIFN\fR are decoded
+as ASCII hex and then processed if it was the response of this command.
 .SH OPTIONS
 Arguments to long options are mandatory for short options as well.
 .TP
@@ -65,6 +71,13 @@ output the usage message then exit.
 \fB\-H\fR, \fB\-\-hex\fR
 output response to this command in ASCII hex.
 .TP
+\fB\-i\fR, \fB\-\-inhex\fR=\fIFN\fR
+where \fIFN\fR is a filename whose contents are assumed to be ASCII
+hexadecimal bytes. See the "FORMAT OF FILES CONTAINING ASCII HEX" section
+in the sg3_utils manpage for more information. If \fIDEVICE\fR is also
+given then it is ignored. If the \fI\-\-raw\fR option is also given then
+the contents of \fIFN\fR are treated as binary.
+.TP
 \fB\-l\fR, \fB\-\-lba\fR=\fILBA\fR
 where \fILBA\fR is the starting Logical Block Address (LBA) to check the
 provisioning status for. Note that the \fIDEVICE\fR chooses how many
@@ -77,7 +90,9 @@ enough space for the response header and one LBA status descriptor.
 \fILEN\fR should be 8 plus a multiple of 16 (e.g. 24, 40, and 56 are suitable).
 .TP
 \fB\-r\fR, \fB\-\-raw\fR
-output response in binary (to stdout).
+output response in binary (to stdout) unless the \fI\-\-inhex=FN\fR option
+is also given. In that case the input file name (\fIFN\fR) is decoded as
+binary (and the output is _not_ in binary).
 .TP
 \fB\-R\fR, \fB\-\-readonly\fR
 open the \fIDEVICE\fR read\-only (e.g. in Unix with the O_RDONLY flag).
@@ -126,9 +141,9 @@ Written by Douglas Gilbert.
 .SH "REPORTING BUGS"
 Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
-Copyright \(co 2009\-2018 Douglas Gilbert
+Copyright \(co 2009\-2019 Douglas Gilbert
 .br
 This software is distributed under a FreeBSD license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .SH "SEE ALSO"
-.B sg_write_same(8), sg_unmap(8)
+.B sg_write_same(8), sg_unmap(8), sg3_utils(8)
diff --git a/doc/sg_logs.8 b/doc/sg_logs.8
index af07a2a..216f8d7 100644
--- a/doc/sg_logs.8
+++ b/doc/sg_logs.8
@@ -1,4 +1,4 @@
-.TH SG_LOGS "8" "August 2018" "sg3_utils\-1.43" SG3_UTILS
+.TH SG_LOGS "8" "January 2020" "sg3_utils\-1.45" SG3_UTILS
 .SH NAME
 sg_logs \- access log pages with SCSI LOG SENSE command
 .SH SYNOPSIS
@@ -161,7 +161,11 @@ treated as binary.
 lists the names of all logs sense pages supported by this device. This is
 done by reading the "supported log pages" log page. When used
 twice (e.g. '\-ll') lists the names of all logs sense pages and subpages
-supported by this device. There is a list of common log page codes below.
+supported by this device, excluding pages whose subpage number is
+0xff (apart from page 0x0,0xff). When used three times then all supported
+pages and subpages reported by the device are list. So the page/subpage
+names and not thrie content is shown with this option. There is a list of
+common log page codes below.
 .TP
 \fB\-m\fR, \fB\-\-maxlen\fR=\fILEN\fR
 sets the "allocation length" field in the LOG SENSE cdb. The is the maximum
@@ -279,14 +283,14 @@ outputs the transport ('Protocol specific port') log page. Equivalent to
 setting '\-\-page=18h'.
 .TP
 \fB\-M\fR, \fB\-\-vendor\fR=\fIVP\fR
-where \fIVP\fR is a vendor (e.g. "sea" for Seagate) or product (group)
-acronym (e.g. "lto5" for the 5th generation LTO (tape) consortium). Either
-the whole log page is vendor specific (e.g. page numbers 0x30 to 0x3f) or
-part of a T10 defined log page is vendor specific. For example SPC\-5
-defines parameter code 0x0 of page 0x2f (the Informational Exceptions log
-page) and states that the remaining parameter codes (i.e. 0x1 to 0xffff)
-are vendor specific. Using a \fIVP\fR of "xxx" will list the available
-acronyms.
+where \fIVP\fR is a vendor/manufacturer (e.g. "sea" for Seagate) or
+product (group) acronym (e.g. "lto5" for the 5th generation LTO (tape)
+consortium). Either the whole log page is vendor specific (e.g. page
+numbers 0x30 to 0x3f) or part of a T10 defined log page is vendor specific.
+For example SPC\-5 defines parameter code 0x0 of page 0x2f (the Informational
+Exceptions log page) and states that the remaining parameter codes (i.e. 0x1
+to 0xffff) are vendor specific. Using a \fIVP\fR of "xxx" will list the
+available acronyms.
 .br
 If this option is used with \fI\-\-page=PG\fR and \fIPG\fR is an acronym
 then this option is ignored. If \fIPG\fR is a number (e.g. 0xc0) then
@@ -478,7 +482,7 @@ Written by Douglas Gilbert
 .SH "REPORTING BUGS"
 Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
-Copyright \(co 2002\-2018 Douglas Gilbert
+Copyright \(co 2002\-2020 Douglas Gilbert
 .br
 This software is distributed under the GPL version 2. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/doc/sg_luns.8 b/doc/sg_luns.8
index f27ed6f..8292772 100644
--- a/doc/sg_luns.8
+++ b/doc/sg_luns.8
@@ -1,4 +1,4 @@
-.TH SG_LUNS "8" "June 2018" "sg3_utils\-1.43" SG3_UTILS
+.TH SG_LUNS "8" "January 2020" "sg3_utils\-1.45" SG3_UTILS
 .SH NAME
 sg_luns \- send SCSI REPORT LUNS command or decode given LUN
 .SH SYNOPSIS
@@ -20,7 +20,7 @@ should be a list of LUNs ("a LUN inventory") for the I_T nexus associated
 with the \fIDEVICE\fR. Roughly speaking that is all LUNs that share the
 target device that the REPORT LUNS command is sent through. This command
 is defined in the SPC\-3 and SPC\-4 SCSI standards and its support is
-mandatory. The most recent draft if SPC\5 revision 9.
+mandatory. The most recent draft if SPC\-6 revision 1.
 .PP
 When the \fI\-\-test=ALUN\fR option is given (the second form in the
 SYNOPSIS), then the \fIALUN\fR value is decoded as outlined in various
@@ -311,7 +311,7 @@ Written by Douglas Gilbert.
 .SH "REPORTING BUGS"
 Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
-Copyright \(co 2004\-2018 Douglas Gilbert
+Copyright \(co 2004\-2020 Douglas Gilbert
 .br
 This software is distributed under a FreeBSD license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/doc/sg_modes.8 b/doc/sg_modes.8
index ed2d2e3..d68bc40 100644
--- a/doc/sg_modes.8
+++ b/doc/sg_modes.8
@@ -1,4 +1,4 @@
-.TH SG_MODES "8" "September 2018" "sg3_utils\-1.43" SG3_UTILS
+.TH SG_MODES "8" "January 2020" "sg3_utils\-1.45" SG3_UTILS
 .SH NAME
 sg_modes \- reads mode pages with SCSI MODE SENSE command
 .SH SYNOPSIS
@@ -22,7 +22,7 @@ outputs the response. There is a 6 byte and 10 byte (cdb) variant of the
 MODE SENSE command, this utility defaults to the 10 byte variant. The SPC\-4
 standard (and SPC\-5 drafts) include a note stating that implementers should
 migrate away from the SCSI MODE SELECT(6) and MODE SENSE(6) commands in
-favour of the 10 byte variants (e.g.  MODE SENSE(10)).
+favour of the 10 byte variants (e.g. MODE SENSE(10)).
 .PP
 This utility decodes mode page headers and block descriptors but outputs
 the contents of each mode page in hex. It also has no facility to change
@@ -82,6 +82,9 @@ descriptors are present in the response or not, they are not output.
 examine each mode page in the range 0 through to 62 (inclusive).
 If some response is given then print out the mode page name or
 number (in hex) if the name is not known.
+.br
+The sdparm utility which lists mode and VPD pages also has a \fB\-\-examine\fR
+option will similar functionility.
 .TP
 \fB\-f\fR, \fB\-\-flexible\fR
 Some devices, bridges and/or drivers attempt crude translations between
@@ -298,7 +301,7 @@ Written by Douglas Gilbert
 .SH "REPORTING BUGS"
 Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
-Copyright \(co 2000\-2018 Douglas Gilbert
+Copyright \(co 2000\-2020 Douglas Gilbert
 .br
 This software is distributed under the GPL version 2. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/doc/sg_raw.8 b/doc/sg_raw.8
index b6bdbcc..3e01bd0 100644
--- a/doc/sg_raw.8
+++ b/doc/sg_raw.8
@@ -1,4 +1,4 @@
-.TH SG_RAW "8" "May 2018" "sg3_utils\-1.43" SG3_UTILS
+.TH SG_RAW "8" "January 2019" "sg3_utils\-1.45" SG3_UTILS
 .SH NAME
 sg_raw \- send arbitrary SCSI command to a device
 .SH SYNOPSIS
@@ -193,7 +193,9 @@ bsg device. Note that data is being read from "urandom.bin" and sent
 to the device (data\-out) while resulting data (data\-in) is placed
 in the "out.bin" file. Also note the length of both is 512 bytes
 which corresponds to the transfer length of 1 (block) in the cdb (i.e.
-the second last byte).
+the second last byte). urandom.bin can be produced like this:
+.br
+dd if=/dev/urandom bs=512 count=1 of=urandom.bin
 .TP
 sg_raw.exe PhysicalDrive1 a1 0c 0e 00 00 00 00 00 00 e0 00 00
 This example is from Windows and shows a ATA STANDBY IMMEDIATE command
@@ -208,9 +210,9 @@ the sg3_utils(8) man page.
 .SH AUTHOR
 Written by Ingo van Lil
 .SH "REPORTING BUGS"
-Report bugs to <inguin at gmx dot de>.
+Report bugs to <inguin at gmx dot de> or to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
-Copyright \(co 2001\-2018 Ingo van Lil
+Copyright \(co 2001\-2019 Ingo van Lil
 .br
 This software is distributed under the GPL version 2. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/doc/sg_read.8 b/doc/sg_read.8
index 3f01134..c12dd57 100644
--- a/doc/sg_read.8
+++ b/doc/sg_read.8
@@ -1,4 +1,4 @@
-.TH SG_READ "8" "November 2012" "sg3_utils\-1.35" SG3_UTILS
+.TH SG_READ "8" "September 2019" "sg3_utils\-1.45" SG3_UTILS
 .SH NAME
 sg_read \- read multiple blocks of data, optionally with SCSI READ commands
 .SH SYNOPSIS
@@ -29,6 +29,11 @@ are issued. "Zero block" means "do nothing" for SCSI READ 10, 12 and
 16 byte commands (but not for the 6 byte variant). In practice "zero
 block" SCSI READ commands have low latency and so are one way to measure
 SCSI command overhead.
+.PP
+Please note: this is a very old utility that uses 32 bit integers for
+disk LBAs and the count. Hence it will not be able to address beyond
+2 Terabytes on a disk with logical blocks that are 512 bytes long.
+Alternatives are the sg_dd and ddpt utilities.
 .SH OPTIONS
 .TP
 \fBblk_sgio\fR=0 | 1
@@ -171,14 +176,17 @@ Written by Douglas Gilbert.
 .SH "REPORTING BUGS"
 Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
-Copyright \(co 2000\-2012 Douglas Gilbert
+Copyright \(co 2000\-2019 Douglas Gilbert
 .br
 This software is distributed under the GPL version 2. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .SH "SEE ALSO"
 To time streaming media read or write time see
 .B sg_dd
-is in the sg3_utils package. The lmbench package contains
+is in the sg3_utils package and
+.B ddpt
+in a package of the same name.
+The lmbench package contains
 .B lmdd
 which is also interesting.
 .B raw(8), dd(1)
diff --git a/doc/sg_read_buffer.8 b/doc/sg_read_buffer.8
index fd9296c..d1aed04 100644
--- a/doc/sg_read_buffer.8
+++ b/doc/sg_read_buffer.8
@@ -1,11 +1,12 @@
-.TH SG_READ_BUFFER "8" "May 2014" "sg3_utils\-1.39" SG3_UTILS
+.TH SG_READ_BUFFER "8" "May 2019" "sg3_utils\-1.45" SG3_UTILS
 .SH NAME
 sg_read_buffer \- send SCSI READ BUFFER command
 .SH SYNOPSIS
 .B sg_read_buffer
-[\fI\-\-help\fR] [\fI\-\-hex\fR] [\fI\-\-id=ID\fR] [\fI\-\-length=LEN\fR]
-[\fI\-\-mode=MO\fR] [\fI\-\-offset=OFF\fR] [\fI\-\-raw\fR]
-[\fI\-\-readonly\fR] [\fI\-\-verbose\fR] [\fI\-\-version\fR] \fIDEVICE\fR
+[\fI\-\-help\fR] [\fI\-\-hex\fR] [\fI\-\-id=ID\fR] [\fI\-\-inhex=FN\fR]
+[\fI\-\-length=LEN\fR] [\fI\-\-mode=MO\fR] [\fI\-\-offset=OFF\fR]
+[\fI\-\-raw\fR] [\fI\-\-readonly\fR] [\fI\-\-specific=MS\fR]
+[\fI\-\-verbose\fR] [\fI\-\-version\fR] \fIDEVICE\fR
 .SH DESCRIPTION
 .\" Add any additional description here
 .PP
@@ -15,6 +16,12 @@ it in binary to stdout. If a response is received for a "descriptor"
 mode then, in the absence of \fI\-\-hex\fR and \fI\-\-raw\fR, it is
 decoded. Response for non\-descriptor modes are output in hexadecimal
 unless the \fI\-\-raw\fR option is given.
+.PP
+This utility may be called without a \fIDEVICE\fR but with a
+\fI\-\-inhex=FN\fR option instead. \fIFN\fR is expected to be a file
+name (or '\-' for stdin). The contents of the file (or stdin stream)
+is assumed to be hexadecimal (or binary) data that represents a SCSI
+READ BUFFER command response and is decoded as such.
 .SH OPTIONS
 Arguments to long options are mandatory for short options as well.
 .TP
@@ -31,6 +38,16 @@ right of each line.
 this option sets the buffer id field in the cdb. \fIID\fR is a value between
 0 (default) and 255 inclusive.
 .TP
+\fB\-I\fR, \fB\-\-inhex\fR=\fIFN\fR
+\fIFN\fR is expected to be a file name (or '\-' for stdin) which contains
+ASCII hexadecimal or binary representing a READ BUFFER response. If known
+this utility will then decode that response. It is preferable to also
+supply the \fI\-\-mode=MO\fR and \fI\-\-specific=MS\fR options, since these
+are not present in the response. The hexadecimal should be arranged as 1 or
+2 digits representing a byte each of which is whitespace or comma separated.
+Anything from and including a hash mark to the end of line is ignored. If the
+\fI\-\-raw\fR option is also given then \fIFN\fR is treated as binary.
+.TP
 \fB\-l\fR, \fB\-\-length\fR=\fILEN\fR
 where \fILEN\fR is the length, in bytes, that is placed in the "allocation
 length" field in the cdb. The default value is 4 (bytes). The device may
@@ -54,6 +71,10 @@ if a response is received then it is sent in binary to stdout.
 open the \fIDEVICE\fR read\-only (e.g. in Unix with the O_RDONLY flag).
 The default is to open it read\-write.
 .TP
+\fB\-S\fR, \fB\-\-specific\fR=\fIMS\fR
+this option sets the mode specific field in the cdb. \fIMS\fR is a value
+between 0 and 7 as this is a 3 bit field.
+.TP
 \fB\-v\fR, \fB\-\-verbose\fR
 increase the level of verbosity, (i.e. debug output).
 .TP
@@ -87,6 +108,9 @@ Echo buffer descriptor: yields 4 bytes of which the last (lowest) 13 bits
 represent the echo buffer capacity. The maximum echo buffer size is 4096
 bytes.
 .TP
+rd_microc_st  [15, 0xf]
+Read microcode status. Added in spc5r20 .
+.TP
 en_ex  [26, 0x1a]
 Enable expander communications protocol and Echo buffer. Made obsolete in
 SPC\-4.
@@ -105,7 +129,7 @@ Written by Luben Tuikov and Douglas Gilbert.
 .SH "REPORTING BUGS"
 Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
-Copyright \(co 2006\-2014 Luben Tuikov and Douglas Gilbert
+Copyright \(co 2006\-2019 Luben Tuikov and Douglas Gilbert
 .br
 This software is distributed under a FreeBSD license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/doc/sg_readcap.8 b/doc/sg_readcap.8
index ffc8724..fa2afd3 100644
--- a/doc/sg_readcap.8
+++ b/doc/sg_readcap.8
@@ -1,15 +1,17 @@
-.TH SG_READCAP "8" "May 2018" "sg3_utils\-1.43" SG3_UTILS
+.TH SG_READCAP "8" "January 2020" "sg3_utils\-1.45" SG3_UTILS
 .SH NAME
 sg_readcap \- send SCSI READ CAPACITY command
 .SH SYNOPSIS
 .B sg_readcap
 [\fI\-\-16\fR] [\fI\-\-brief\fR] [\fI\-\-help\fR] [\fI\-\-hex\fR]
 [\fI\-\-lba=LBA\fR] [\fI\-\-long\fR] [\fI\-\-pmi\fR] [\fI\-\-raw\fR]
-[\fI\-\-readonly\fR] [\fI\-\-verbose\fR] [\fI\-\-version\fR] \fIDEVICE\fR
+[\fI\-\-readonly\fR] [\fI\-\-verbose\fR] [\fI\-\-version\fR] [\fI\-\-zbc\fR]
+\fIDEVICE\fR
 .PP
 .B sg_readcap
 [\fI\-16\fR] [\fI\-b\fR] [\fI\-h\fR] [\fI\-H\fR] [\fI\-lba=LBA\fR]
-[\fI\-pmi\fR] [\fI\-r\fR] [\fI\-R\fR] [\fI\-v\fR] [\fI\-V\fR] \fIDEVICE\fR
+[\fI\-pmi\fR] [\fI\-r\fR] [\fI\-R\fR] [\fI\-v\fR] [\fI\-V\fR] [\fI\-z\fR]
+\fIDEVICE\fR
 .SH DESCRIPTION
 .\" Add any additional description here
 .PP
@@ -104,6 +106,10 @@ increase level of verbosity. Can be used multiple times.
 .TP
 \fB\-V\fR, \fB\-\-version\fR
 outputs version string then exits.
+.TP
+\fB\-z\fR, \fB\-\-zbc\fR
+additionally prints out the extra ZBC field (RC_BASIS) in the READ CAPACITY
+response. Using the option implicitly sets the \fI\-\-16\fR option.
 .SH NOTES
 The response to READ CAPACITY(16) contains a LBPRZ bit in the SBC\-3
 standard (ANSI INCITS 514\-2014). There was also a LBPRZ bit with the same
@@ -171,6 +177,9 @@ and '\-vvv' are also accepted yielding greater verbosity.
 .TP
 \fB\-V\fR
 outputs version string then exits.
+.TP
+\fB\-R\fR
+Equivalent to \fI\-\-zbc\fR in the main description.
 .SH ENVIRONMENT VARIABLES
 Since sg3_utils version 1.23 the environment variable SG3_UTILS_OLD_OPTS
 can be given. When it is present this utility will expect the older command
@@ -179,7 +188,7 @@ using \fI\-\-old\fR (or \fI\-O\fR) as the first command line option.
 .SH AUTHORS
 Written by Douglas Gilbert
 .SH COPYRIGHT
-Copyright \(co 1999\-2018 Douglas Gilbert
+Copyright \(co 1999\-2020 Douglas Gilbert
 .br
 This software is distributed under the GPL version 2. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/doc/sg_reassign.8 b/doc/sg_reassign.8
index ecacc7f..3ad0f8a 100644
--- a/doc/sg_reassign.8
+++ b/doc/sg_reassign.8
@@ -1,4 +1,4 @@
-.TH SG_REASSIGN "8" "October 2017" "sg3_utils\-1.43" SG3_UTILS
+.TH SG_REASSIGN "8" "October 2019" "sg3_utils\-1.45" SG3_UTILS
 .SH NAME
 sg_reassign \- send SCSI REASSIGN BLOCKS command
 .SH SYNOPSIS
@@ -142,7 +142,7 @@ Written by Douglas Gilbert.
 .SH "REPORTING BUGS"
 Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
-Copyright \(co 2005\-2017 Douglas Gilbert
+Copyright \(co 2005\-2019 Douglas Gilbert
 .br
 This software is distributed under a FreeBSD license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/doc/sg_rep_zones.8 b/doc/sg_rep_zones.8
index df734d0..29fecd1 100644
--- a/doc/sg_rep_zones.8
+++ b/doc/sg_rep_zones.8
@@ -1,17 +1,18 @@
-.TH SG_REP_ZONES "8" "February 2016" "sg3_utils\-1.42" SG3_UTILS
+.TH SG_REP_ZONES "8" "February 2020" "sg3_utils\-1.45" SG3_UTILS
 .SH NAME
 sg_rep_zones \- send SCSI REPORT ZONES command
 .SH SYNOPSIS
 .B sg_rep_zones
-[\fI\-\-help\fR] [\fI\-\-hex\fR] [\fI\-\-maxlen=LEN\fR] [\fI\-\-raw\fR]
-[\fI\-\-readonly\fR] [\fI\-\-report=OPT\fR] [\fI\-\-start=LBA\fR]
-[\fI\-\-verbose\fR] [\fI\-\-version\fR] \fIDEVICE\fR
+[\fI\-\-help\fR] [\fI\-\-hex\fR] [\fI\-\-maxlen=LEN\fR] [\fI\-\-num=NUM\fR]
+[\fI\-\-raw\fR] [\fI\-\-readonly\fR] [\fI\-\-report=OPT\fR]
+[\fI\-\-start=LBA\fR] [\fI\-\-verbose\fR] [\fI\-\-version\fR] [\fI\-\-wp\fR]
+\fIDEVICE\fR
 .SH DESCRIPTION
 .\" Add any additional description here
 .PP
 Sends a SCSI REPORT ZONES command to \fIDEVICE\fR and outputs the data
 returned. This command is found in the ZBC draft standard, revision
-4c (zbc\-r04c.pdf).
+5 (zbc\-r05.pdf).
 .SH OPTIONS
 Arguments to long options are mandatory for short options as well.
 .TP
@@ -30,6 +31,11 @@ where \fILEN\fR is the (maximum) response length in bytes. It is placed in
 the cdb's "allocation length" field. If not given (or \fILEN\fR is zero)
 then 8192 is used. The maximum allowed value of \fILEN\fR is 1048576.
 .TP
+\fB\-n\fR, \fB\-\-num\fR=\fINUM\fR
+where \fINUM\fR is the (maximum) number of zone descriptors to print out.
+The default value is zero which is taken to mean print out all zone
+descriptors returned by the REPORT ZONES command.
+.TP
 \fB\-p\fR, \fB\-\-partial\fR
 set the PARTIAL bit in the cdb.
 .TP
@@ -62,6 +68,11 @@ prefixed with '0x' or has a trailing 'h' which indicate hexadecimal.
 increase the level of verbosity, (i.e. debug output).
 .TP
 \fB\-V\fR, \fB\-\-version\fR
+print the write pointer (in hex) only. In the absence of errors, then a hex
+LBA will be printed on each line, one line for each zone. Can be usefully
+combined with the \fI\-\-num=NUM\fR and \fI\-\-start=LBA\fR options.
+.TP
+\fB\-w\fR, \fB\-\-wp\fR
 print the version string and then exit.
 .SH EXIT STATUS
 The exit status of sg_rep_zones is 0 when it is successful. Otherwise see
@@ -71,7 +82,7 @@ Written by Douglas Gilbert.
 .SH "REPORTING BUGS"
 Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
-Copyright \(co 2014\-2016 Douglas Gilbert
+Copyright \(co 2014\-2020 Douglas Gilbert
 .br
 This software is distributed under a FreeBSD license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/doc/sg_requests.8 b/doc/sg_requests.8
index 5372deb..81db55f 100644
--- a/doc/sg_requests.8
+++ b/doc/sg_requests.8
@@ -1,12 +1,12 @@
-.TH SG_REQUESTS "8" "February 2016" "sg3_utils\-1.43" SG3_UTILS
+.TH SG_REQUESTS "8" "July 2018" "sg3_utils\-1.45" SG3_UTILS
 .SH NAME
 sg_requests \- send one or more SCSI REQUEST SENSE commands
 .SH SYNOPSIS
 .B sg_requests
-[\fI\-\-desc\fR] [\fI\-\-help\fR] [\fI\-\-hex\fR] [\fI\-\-maxlen=LEN\fR]
-[\fI\-\-num=NUM\fR] [\fI\-\-number=NUM\fR] [\fI\-\-progress\fR]
-[\fI\-\-raw\fR] [\fI\-\-status\fR] [\fI\-\-time\fR] [\fI\-\-verbose\fR]
-[\fI\-\-version\fR] \fIDEVICE\fR
+[\fI\-\-desc\fR] [\fI\-\-error\fR] [\fI\-\-help\fR] [\fI\-\-hex\fR]
+[\fI\-\-maxlen=LEN\fR] [\fI\-\-num=NUM\fR] [\fI\-\-number=NUM\fR]
+[\fI\-\-progress\fR] [\fI\-\-raw\fR] [\fI\-\-status\fR] [\fI\-\-time\fR]
+[\fI\-\-verbose\fR] [\fI\-\-version\fR] \fIDEVICE\fR
 .SH DESCRIPTION
 .\" Add any additional description here
 .PP
@@ -28,6 +28,16 @@ and later). If the device is pre SPC\-3 then setting a bit in a reserved
 field may cause a check condition status with an illegal request sense key,
 but will most likely be ignored.
 .TP
+\fB\-e\fR, \fB\-\-error\fR
+when used once it changes the REQUEST SENSE opcode from 0x3 to 0xff which
+should be rejected by the \fIDEVICE\fR. There is a small chance that the
+device vendor has implemented a vendor specific command at that opcode (0xff).
+When used twice the pass-through call to send the SCSI command is bypassed.
+The idea here is to measure the user space overhead of this package's
+library to set up and process the response of a SCSI command. This option
+will be typically used with the \fI\-\-num=NUM\fR and \fI\-\-time\fR
+options where \fINUM\fR is a large number (e.g. 1000000).
+.TP
 \fB\-h\fR, \fB\-\-help\fR
 output the usage message then exit.
 .TP
@@ -47,7 +57,7 @@ is reached or an error occurs. The default value for \fINUM\fR is 1 .
 same action as \fI\-\-num=NUM\fR. Added for compatibility with sg_turs.
 .TP
 \fB\-p\fR, \fB\-\-progress\fR
-show progress indication (a percentage) if available. If \fI\-\-number=NUM\fR
+show progress indication (a percentage) if available. If \fI\-\-num=NUM\fR
 is given, \fINUM\fR is greater than 1 and an initial progress indication
 was detected then this utility waits 30 seconds before subsequent checks.
 Exits when \fINUM\fR is reached or there are no more progress indications.
@@ -120,7 +130,7 @@ Written by Douglas Gilbert.
 .SH "REPORTING BUGS"
 Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
-Copyright \(co 2004\-2016 Douglas Gilbert
+Copyright \(co 2004\-2017 Douglas Gilbert
 .br
 This software is distributed under a FreeBSD license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/doc/sg_sat_identify.8 b/doc/sg_sat_identify.8
index aee3467..e811614 100644
--- a/doc/sg_sat_identify.8
+++ b/doc/sg_sat_identify.8
@@ -1,4 +1,4 @@
-.TH SG_SAT_IDENTIFY "8" "January 2018" "sg3_utils\-1.43" SG3_UTILS
+.TH SG_SAT_IDENTIFY "8" "January 2020" "sg3_utils\-1.45" SG3_UTILS
 .SH NAME
 sg_sat_identify \- send ATA IDENTIFY DEVICE command via SCSI to ATA
 Translation (SAT) layer
@@ -23,7 +23,7 @@ www.t10.org) defines two SCSI "ATA PASS\-THROUGH" commands: one using a 16
 byte "cdb" and the other with a 12 byte cdb. This utility defaults to using
 the 16 byte cdb variant. SAT\-4 revision 5 added a SCSI "ATA
 PASS\-THROUGH(32)" command. SAT\-2 and SAT\-3 are now also standards: SAT\-2
-ANSI INCITS 465\-2010 and SAT\3 ANSI INCITS 517-2015 . The SAT\-4 project
+ANSI INCITS 465\-2010 and SAT\-3 ANSI INCITS 517-2015 . The SAT\-4 project
 is near standardization and the most recent draft is sat4r06.pdf .
 .SH OPTIONS
 Arguments to long options are mandatory for short options as well.
@@ -159,7 +159,7 @@ Written by Douglas Gilbert
 .SH "REPORTING BUGS"
 Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
-Copyright \(co 2006\-2018 Douglas Gilbert
+Copyright \(co 2006\-2020 Douglas Gilbert
 .br
 This software is distributed under a FreeBSD license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/doc/sg_scan.8.win32 b/doc/sg_scan.8.win32
index b87888a..84cc38b 100644
--- a/doc/sg_scan.8.win32
+++ b/doc/sg_scan.8.win32
@@ -1,4 +1,4 @@
-.TH SG_SCAN "8" "August 2014" "sg3_utils\-1.40" SG3_UTILS
+.TH SG_SCAN "8" "November 2018" "sg3_utils\-1.45" SG3_UTILS
 .SH NAME
 sg_scan \- scan storage devices and map to volume names
 .SH SYNOPSIS
@@ -164,7 +164,7 @@ the sg3_utils(8) man page.
 .SH AUTHORS
 Written by D. Gilbert
 .SH COPYRIGHT
-Copyright \(co 2006\-2012 Douglas Gilbert
+Copyright \(co 2006\-2018 Douglas Gilbert
 .br
 This software is distributed under a FreeBSD license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/doc/sg_ses.8 b/doc/sg_ses.8
index 573c92b..d953e55 100644
--- a/doc/sg_ses.8
+++ b/doc/sg_ses.8
@@ -1,4 +1,4 @@
-.TH SG_SES "8" "August 2018" "sg3_utils\-1.43" SG3_UTILS
+.TH SG_SES "8" "February 2020" "sg3_utils\-1.45" SG3_UTILS
 .SH NAME
 sg_ses \- access a SCSI Enclosure Services (SES) device
 .SH SYNOPSIS
@@ -11,7 +11,7 @@ sg_ses \- access a SCSI Enclosure Services (SES) device
 [\fI\-\-status\fR] [\fI\-\-verbose\fR] [\fI\-\-warn\fR] \fIDEVICE\fR
 .PP
 .B sg_ses
-[\fI\-\-byte1=B1\fR] [\fI\-\-clear=STR\fR] [\fI\-\-control\fR]
+\fI\-\-control\fR [\fI\-\-byte1=B1\fR] [\fI\-\-clear=STR\fR]
 [\fI\-\-data=H,H...\fR] [\fI\-\-data=@FN\fR] [\fI\-\-descriptor=DES\fR]
 [\fI\-\-dev\-slot\-num=SN\fR] [\fI\-\-index=IIA\fR | \fI\-\-index=TIA,II\fR]
 [\fI\-\-mask\fR] [\fI\-\-maxlen=LEN\fR] [\fI\-\-nickname=SEN\fR]
@@ -22,6 +22,10 @@ sg_ses \- access a SCSI Enclosure Services (SES) device
 .B sg_ses
 \fI\-\-data=@FN\fR \fI\-\-status\fR [\fI\-\-raw\fR \fI\-\-raw\fR]
 [<all options from first form>]
+.br
+.B sg_ses
+\fI\-\-inhex=FN\fR \fI\-\-status\fR [\fI\-\-raw\fR \fI\-\-raw\fR]
+[<all options from first form>]
 .PP
 .B sg_ses
 [\fI\-\-enumerate\fR] [\fI\-\-index=IIA\fR] [\fI\-\-list\fR] [\fI\-\-help\fR]
@@ -58,11 +62,12 @@ enclosure (e.g. requesting the "ident" (locate) LED to flash on a disk
 carrier in an array) is typically done using a read\-modify\-write cycle.
 See the section on CHANGING STATE below.
 .PP
-The third form in the synopsis shows the options for decoding the contents
-of a file that holds a hexadecimal or binary representation of a SES
-dpage response. Typically an earlier invocation of the first form of this
-utility with the '\-HHHH' option would have generated that file. Since no
-SCSI commands are sent, the \fIDEVICE\fR argument if given will be ignored.
+The third form in the synopsis has two equivalent invocations shown. They
+decode the contents of a file (named \fIFN\fR) that holds a hexadecimal or
+binary representation of one, or many, SES dpage responses. Typically an
+earlier invocation of the first form of this utility with the '\-HHHH'
+option would have generated that file. Since no SCSI commands are sent, the
+\fIDEVICE\fR argument if given will be ignored.
 .PP
 The last form in the synopsis shows the options for providing command line
 help (i.e. usage information), listing out dpage and field information tables
@@ -233,6 +238,14 @@ option or one of the \fI\-\-clear=STR\fR, \fI\-\-get=STR\fR or
 \fI\-\-set=STR\fR options. To enumerate the available Element type
 abbreviations use the \fI\-\-enumerate\fR option.
 .TP
+\fB\-X\fR, \fB\-\-inhex\fR=\fIFN\fR
+where \fIFN\fR is a filename. It has the equivalent action of the
+\fI\-\-data=@FN\fR option. If \fIFN\fR is '\-' then stdin is read. This
+option has been given for compatibility with other utilities in this
+package that use \fI\-\-inhex=FN\fR (or \fI\-\-in=FN\fR) is a similar
+way. See the "FORMAT OF FILES CONTAINING ASCII HEX" section in the
+sg3_utils manpage for more information.
+.TP
 \fB\-i\fR, \fB\-\-inner\-hex\fR
 the outer levels of a status dpage are decoded and printed out but the
 innermost level (e.g. the Element Status Descriptor) is output in hex. Also
@@ -430,10 +443,10 @@ Wherever an individual index is applicable, it can be replaced by an
 individual index range. It has the form: <first_ii>\-<last_ii>. For
 example: '3\-5' will select individual indexes 3, 4 and 5 .
 .PP
-To cope with vendor specific Element types (which should be in the range 128
-to 255) the Element type can be given as a number with a leading underscore.
-For example these are equivalent: \fI\-\-index=arr\fR and
-\fI\-\-index=_23\fR since the Array Device Slot Element type value is 23.
+To cope with vendor specific Element types (whose type codes should be in
+the range 128 to 255) the Element type code can be given as a number with
+a leading underscore. For example these are equivalent: \fI\-\-index=arr\fR
+and \fI\-\-index=_23\fR since the Array Device Slot Element type code is 23.
 Also \fI\-\-index=ps1\fR and \fI\-\-index=_2_1\fR are equivalent.
 .PP
 Another example: if the first type header in the Configuration dpage has
@@ -746,7 +759,7 @@ Written by Douglas Gilbert.
 .SH "REPORTING BUGS"
 Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
-Copyright \(co 2004\-2018 Douglas Gilbert
+Copyright \(co 2004\-2020 Douglas Gilbert
 .br
 This software is distributed under a FreeBSD license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/doc/sg_turs.8 b/doc/sg_turs.8
index 66e6ad3..8cf909c 100644
--- a/doc/sg_turs.8
+++ b/doc/sg_turs.8
@@ -1,9 +1,9 @@
-.TH SG_TURS "8" "March 2018" "sg3_utils\-1.43" SG3_UTILS
+.TH SG_TURS "8" "September 2019" "sg3_utils\-1.45" SG3_UTILS
 .SH NAME
 sg_turs \- send one or more SCSI TEST UNIT READY commands
 .SH SYNOPSIS
 .B sg_turs
-[\fI\-\-help\fR] [\fI\-\-low\fR] [\fI\-\-number=NUM\fR] [\fI\-\-num=NUM\fR]
+[\fI\-\-help\fR] [\fI\-\-low\fR] [\fI\-\-num=NUM\fR] [\fI\-\-number=NUM\fR]
 [\fI\-\-progress\fR] [\fI\-\-time\fR] [\fI\-\-verbose\fR] [\fI\-\-version\fR]
 \fIDEVICE\fR
 .PP
@@ -34,7 +34,7 @@ calls a library function to do each TUR (sg_ll_test_unit_ready). With this
 option it uses the lower level sg_pt interface (see sg_pt.h) to save a
 little time on each TUR.
 .TP
-\fB\-n\fR, \fB\-\-number\fR=\fINUM\fR
+\fB\-n\fR, \fB\-\-num\fR=\fINUM\fR
 performs TEST UNIT READY \fINUM\fR times. If not given defaults to 1.
 These suffix multipliers are permitted: c C *1; w W *2; b B *512;
 k K KiB *1,024; KB *1,000; m M MiB *1,048,576; MB *1,000,000;
@@ -42,15 +42,17 @@ g G GiB *1,073,741,824; and GB *1,000,000,000 . Also a suffix of the
 form "x<n>" multiplies the leading number by <n>. Alternatively a hex
 number may be given, prefixed by either '0x' or has a trailing 'h'.
 .TP
-\fB\-\-num\fR=\fINUM\fR
-same as \fI\-\-number=NUM\fR. Added for compatibility with sg_requests
-which has taken over the role of polling the progress indication.
+\fB\-\-number\fR=\fINUM\fR
+same as \fI\-\-num=NUM\fR. Added for compatibility with sg_requests and
+other utilities in this package. The sg_request utility has taken over the
+role of polling the progress indication which was originally assigned to
+the TEST UNIT READY command. This is a change by T10.
 .TP
 \fB\-O\fR, \fB\-\-old\fR
 Switch to older style options. Please use as first option.
 .TP
 \fB\-p\fR, \fB\-\-progress\fR
-show progress indication (a percentage) if available. If \fI\-\-number=NUM\fR
+show progress indication (a percentage) if available. If \fI\-\-num=NUM\fR
 is given, \fINUM\fR is greater than 1 and an initial progress indication
 was detected then this utility waits 30 seconds before subsequent checks.
 Exits when \fINUM\fR is reached or there are no more progress indications.
@@ -101,7 +103,7 @@ force the use of these older command line options.
 .TP
 \fB\-n\fR=\fINUM\fR
 performs TEST UNIT READY \fINUM\fR times. If not given defaults to 1.
-Equivalent to \fI\-\-number=NUM\fR in the main description.
+Equivalent to \fI\-\-num=NUM\fR in the main description.
 .TP
 \fB-N\fR, \fB\-\-new\fR
 Switch to the newer style options.
@@ -128,7 +130,7 @@ using \fI\-\-old\fR (or \fI\-O\fR) as the first command line option.
 .SH AUTHORS
 Written by D. Gilbert
 .SH COPYRIGHT
-Copyright \(co 2000\-2018 Douglas Gilbert
+Copyright \(co 2000\-2019 Douglas Gilbert
 .br
 This software is distributed under the GPL version 2. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/doc/sg_verify.8 b/doc/sg_verify.8
index 51c8f88..425af3b 100644
--- a/doc/sg_verify.8
+++ b/doc/sg_verify.8
@@ -1,19 +1,19 @@
-.TH SG_VERIFY "8" "January 2018" "sg3_utils\-1.43" SG3_UTILS
+.TH SG_VERIFY "8" "December 2019" "sg3_utils\-1.45" SG3_UTILS
 .SH NAME
 sg_verify \- invoke SCSI VERIFY command(s) on a block device
 .SH SYNOPSIS
 .B sg_verify
-[\fI\-\-16\fR] [\fI\-\-bpc=BPC\fR] [\fI\-\-count=COUNT\fR] [\fI\-\-dpo\fR]
-[\fI\-\-ebytchk=BCH\fR] [\fI\-\-group=GN\fR] [\fI\-\-help\fR]
-[\fI\-\-in=IF\fR] [\fI\-\-lba=LBA\fR] [\fI\-\-ndo=NDO\fR] [\fI\-\-quiet\fR]
-[\fI\-\-readonly\fR] [\fI\-\-verbose\fR] [\fI\-\-version\fR]
-[\fI\-\-vrprotect=VRP\fR] \fIDEVICE\fR
+[\fI\-\-0\fR] [\fI\-\-16\fR] [\fI\-\-bpc=BPC\fR] [\fI\-\-count=COUNT\fR]
+[\fI\-\-dpo\fR] [\fI\-\-ff\fR] [\fI\-\-ebytchk=BCH\fR] [\fI\-\-group=GN\fR]
+[\fI\-\-help\fR] [\fI\-\-in=IF\fR] [\fI\-\-lba=LBA\fR] [\fI\-\-ndo=NDO\fR]
+[\fI\-\-quiet\fR] [\fI\-\-readonly\fR] [\fI\-\-verbose\fR]
+[\fI\-\-version\fR] [\fI\-\-vrprotect=VRP\fR] \fIDEVICE\fR
 .SH DESCRIPTION
 .\" Add any additional description here
 .PP
 Sends one or more SCSI VERIFY (10 or 16) commands to \fIDEVICE\fR. These SCSI
-commands are defined in the SBC\-2 (draft) standard at http://www.t10.org and
-SBC\-3 drafts.
+commands are defined in the SBC\-2 and SBC\-3 standards at http://www.t10.org
+and SBC\-4 drafts.
 .PP
 When \fI\-\-ndo=NDO\fR is not given then the verify starts at the logical
 block address given by the \fI\-\-lba=LBA\fR option and continues for
@@ -45,6 +45,12 @@ Arguments to long options are mandatory for short options as well.
 The options are arranged in alphabetical order based on the long
 option name.
 .TP
+\fB\-0\fR, \fB\-\-0\fR
+a buffer \fINDO\fR bytes long full of zeros is sent as the data\-out
+part of a VERIFY command. So stdin is not read and if \fI\-\-in=IF\fR
+is given, an error is generated. Useful when \fIBCH\fR is 3 to check
+if some or all of \fIDEVICE\fR (e.g. a disk) is zero filled blocks.
+.TP
 \fB\-S\fR, \fB\-\-16\fR
 uses a VERIFY(16) command (default VERIFY(10)). Even without this option,
 using an \fI\-\-lba=LBA\fR which is too large, will cause the utility
@@ -80,11 +86,17 @@ other commands are more likely to remain in the device's cache.
 sets the BYTCHK field to \fIBCH\fR overriding the value (1) set by the
 \fI\-\-ndo=NDO\fR option. Values of 1, 2 or 3 are accepted for \fIBCH\fR
 however sbc3r34 reserves the value 2. If this option is given then
-\fI\-\-ndo=NDO\fR must also be given. If \fIBCH\fR is 3 then \fICOUNT\fR
-must be 1 and \fINDO\fR should be the size of one logical block (plus the
-size of some or all of the protection information if \fIVRP\fR is greater
+\fI\-\-ndo=NDO\fR must also be given. If \fIBCH\fR is 3 then \fINDO\fR
+should be the size of one logical block (plus the size of some or all
+of the protection information if \fIVRP\fR is greater
 than 0).
 .TP
+\fB\-f\fR, \fB\-\-ff\fR
+a buffer \fINDO\fR bytes long full of 0xff bytes is sent as the data\-out
+part of a VERIFY command. So stdin is not read and if \fI\-\-in=IF\fR
+is given, an error is generated. Useful when \fIBCH\fR is 3 to check
+if some or all of \fIDEVICE\fR (e.g. a disk) is 0xff byte filled blocks.
+.TP
 \fB\-g\fR, \fB\-\-group\fR=\fIGN\fR
 where \fIGN\fR becomes the contents of the group number field in the SCSI
 VERIFY(16) command. It can be from 0 to 63 inclusive. The default value for
@@ -198,7 +210,7 @@ Written by Douglas Gilbert.
 .SH "REPORTING BUGS"
 Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
-Copyright \(co 2004\-2018 Douglas Gilbert
+Copyright \(co 2004\-2019 Douglas Gilbert
 .br
 This software is distributed under a FreeBSD license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/doc/sg_vpd.8 b/doc/sg_vpd.8
index 1bbdc7c..08c371d 100644
--- a/doc/sg_vpd.8
+++ b/doc/sg_vpd.8
@@ -1,12 +1,13 @@
-.TH SG_VPD "8" "March 2018" "sg3_utils\-1.43" SG3_UTILS
+.TH SG_VPD "8" "April 2019" "sg3_utils\-1.45" SG3_UTILS
 .SH NAME
 sg_vpd \- fetch SCSI VPD page and/or decode its response
 .SH SYNOPSIS
 .B sg_vpd
-[\fI\-\-all\fR] [\fI\-\-enumerate\fR] [\fI\-\-force\fR] [\fI\-\-help\fR]
-[\fI\-\-hex\fR] [\fI\-\-ident\fR] [\fI\-\-inhex=FN\fR] [\fI\-\-long\fR]
-[\fI\-\-maxlen=LEN\fR] [\fI\-\-page=PG\fR] [\fI\-\-quiet\fR] [\fI\-\-raw\fR]
-[\fI\-\-vendor=VP\fR] [\fI\-\-verbose\fR] [\fI\-\-version\fR] [\fIDEVICE\fR]
+[\fI\-\-all\fR] [\fI\-\-enumerate\fR] [\fI\-\-examine\fR] [\fI\-\-force\fR]
+[\fI\-\-help\fR] [\fI\-\-hex\fR] [\fI\-\-ident\fR] [\fI\-\-inhex=FN\fR]
+[\fI\-\-long\fR] [\fI\-\-maxlen=LEN\fR] [\fI\-\-page=PG\fR] [\fI\-\-quiet\fR]
+[\fI\-\-raw\fR] [\fI\-\-vendor=VP\fR] [\fI\-\-verbose\fR] [\fI\-\-version\fR]
+[\fIDEVICE\fR]
 .SH DESCRIPTION
 .\" Add any additional description here
 .PP
@@ -25,8 +26,8 @@ has been flagged as mandatory. This page can be fetched by
 using the \fI\-\-ident\fR option.
 .PP
 The reference document used for interpreting VPD pages (and the INQUIRY
-standard response) is T10/BSR INCITS 502 Revision 19 which is draft SPC\-5
-revision 19, 14 February 2018). It can be found at http://www.t10.org .
+standard response) is T10/BSR INCITS 502 Revision 22 which is draft SPC\-5
+revision 19, 22 April 2019. It can be found at http://www.t10.org .
 .PP
 When no options are given, other than a \fIDEVICE\fR, then the "Supported
 VPD pages" (0x0) VPD page is fetched and decoded.
@@ -60,6 +61,22 @@ summary lines of all VPD pages whose number matches \fIPG\fR. May be used
 with \fI\-\-vendor=VP\fR to restrict output to known vendor specific pages
 for vendor/product \fIVP\fR.
 .TP
+\fB\-E\fR, \fB\-\-examine\fR
+scan part of all of the VPD space (from 0x0 to 0xff) and output any pages
+found. This option ignores the contents of VPD page 0x0 which should contain
+a list of all supported VPD pages. However some vendors either forget to
+list some standard pages or perhaps purposely don't list vendor specific
+pages which are in the range 0xc0 to 0xff.
+.br
+If the \fI\-\-page=PG\fR option is not given and this option is given once
+then the scan is from VPD page number 0x80 to 0xff inclusive. If the
+\fI\-\-page=PG\fR option is given then the scan is from 0x80 to
+\fIPG\fR inclusive. If this option is given twice then the scan starts at
+VPD page 0x0.
+.br
+The sdparm utility which lists mode and VPD pages also has a \fB\-\-examine\fR
+option will similar functionility.
+.TP
 \fB\-f\fR, \fB\-\-force\fR
 As a sanity check, the normal action when fetching VPD pages other than
 page 0x0 (the "Supported VPD pages" VPD page), is to first fetch page 0x0
@@ -304,7 +321,7 @@ Written by Douglas Gilbert
 .SH "REPORTING BUGS"
 Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
-Copyright \(co 2006\-2018 Douglas Gilbert
+Copyright \(co 2006\-2019 Douglas Gilbert
 .br
 This software is distributed under a FreeBSD license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/doc/sg_write_buffer.8 b/doc/sg_write_buffer.8
index d2aab53..09332e1 100644
--- a/doc/sg_write_buffer.8
+++ b/doc/sg_write_buffer.8
@@ -1,4 +1,4 @@
-.TH SG_WRITE_BUFFER "8" "January 2018" "sg3_utils\-1.43" SG3_UTILS
+.TH SG_WRITE_BUFFER "8" "November 2018" "sg3_utils\-1.45" SG3_UTILS
 .SH NAME
 sg_write_buffer \- send SCSI WRITE BUFFER commands
 .SH SYNOPSIS
diff --git a/doc/sg_write_same.8 b/doc/sg_write_same.8
index 55e739d..55dcfec 100644
--- a/doc/sg_write_same.8
+++ b/doc/sg_write_same.8
@@ -1,13 +1,14 @@
-.TH SG_WRITE_SAME "8" "November 2017" "sg3_utils\-1.43" SG3_UTILS
+.TH SG_WRITE_SAME "8" "December 2019" "sg3_utils\-1.45" SG3_UTILS
 .SH NAME
 sg_write_same \- send SCSI WRITE SAME command
 .SH SYNOPSIS
 .B sg_write_same
 [\fI\-\-10\fR] [\fI\-\-16\fR] [\fI\-\-32\fR] [\fI\-\-anchor\fR]
-[\fI\-\-grpnum=GN\fR] [\fI\-\-help\fR] [\fI\-\-in=IF\fR] [\fI\-\-lba=LBA\fR]
-[\fI\-\-lbdata\fR] [\fI\-\-num=NUM\fR] [\fI\-\-ndob\fR] [\fI\-\-pbdata\fR]
-[\fI\-\-timeout=TO\fR] [\fI\-\-unmap\fR] [\fI\-\-verbose\fR]
-[\fI\-\-version\fR] [\fI\-\-wrprotect=WPR\fR] [\fI\-\-xferlen=LEN\fR]
+[\fI\-\-ff\fR] [\fI\-\-grpnum=GN\fR] [\fI\-\-help\fR] [\fI\-\-in=IF\fR]
+[\fI\-\-lba=LBA\fR] [\fI\-\-lbdata\fR] [\fI\-\-num=NUM\fR]
+[\fI\-\-ndob\fR] [\fI\-\-pbdata\fR] [\fI\-\-timeout=TO\fR]
+[\fI\-\-unmap\fR] [\fI\-\-verbose\fR] [\fI\-\-version\fR]
+[\fI\-\-wrprotect=WPR\fR] [\fI\-\-xferlen=LEN\fR]
 \fIDEVICE\fR
 .SH DESCRIPTION
 .\" Add any additional description here
@@ -86,6 +87,10 @@ send a SCSI WRITE SAME (32) command to \fIDEVICE\fR.
 sets the ANCHOR bit in the cdb. Introduced in SBC\-3 revision 22.
 That draft requires the \fI\-\-unmap\fR option to also be specified.
 .TP
+\fB\-f\fR, \fB\-\-ff\fR
+the data\-out buffer sent with this command is initialized with 0xff bytes
+when this option is given.
+.TP
 \fB\-g\fR, \fB\-\-grpnum\fR=\fIGN\fR
 sets the 'Group number' field to \fIGN\fR. Defaults to a value of zero.
 \fIGN\fR should be a value between 0 and 63.
@@ -97,11 +102,12 @@ output the usage message then exit.
 read data (binary) from file named \fIIF\fR and use it as the data\-out
 buffer for the SCSI WRITE SAME command. The length of the data\-out buffer
 is \fI\-\-xferlen=LEN\fR or, if that is not given, the length of the \fIIF\fR
-file. If \fIIF\fR is "\-" then stdin is read. If this option is not given
-then 0x00 bytes are used as fill with the length of the data\-out buffer
-obtained from \fI\-\-xferlen=LEN\fR or by calling READ CAPACITY(16 or 10).
-If the response to READ CAPACITY(16) has the PROT_EN bit set then data\-
-out buffer size is modified accordingly with the last 8 bytes set to 0xff.
+file. If \fIIF\fR is "\-" then stdin is read. If this option and the
+\fI\-\-ff\fR are not given then 0x00 bytes are used as fill with the length
+of the data\-out buffer obtained from \fI\-\-xferlen=LEN\fR or by calling
+READ CAPACITY(16 or 10).  If the response to READ CAPACITY(16) has the
+PROT_EN bit set then data\- out buffer size is modified accordingly with
+the last 8 bytes set to 0xff.
 .TP
 \fB\-l\fR, \fB\-\-lba\fR=\fILBA\fR
 where \fILBA\fR is the logical block address to start the WRITE SAME command.
@@ -316,7 +322,7 @@ Written by Douglas Gilbert.
 .SH "REPORTING BUGS"
 Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
-Copyright \(co 2009\-2017 Douglas Gilbert
+Copyright \(co 2009\-2019 Douglas Gilbert
 .br
 This software is distributed under a FreeBSD license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/doc/sg_write_x.8 b/doc/sg_write_x.8
index 122d950..de9f10d 100644
--- a/doc/sg_write_x.8
+++ b/doc/sg_write_x.8
@@ -1,4 +1,4 @@
-.TH SG_WRITE_X "8" "May 2018" "sg3_utils\-1.43" SG3_UTILS
+.TH SG_WRITE_X "8" "January 2020" "sg3_utils\-1.45" SG3_UTILS
 .SH NAME
 sg_write_x \- SCSI WRITE normal/ATOMIC/SAME/SCATTERED/STREAM, ORWRITE commands
 .SH SYNOPSIS
@@ -451,7 +451,7 @@ output version string then exit.
 .TP
 \fB\-w\fR, \fB\-\-wrprotect\fR=\fIWPR\fR
 sets the WRPROTECT field (3 bits) in all sg_write_x commands apart from
-ORWRITE which has a 3 bit ORPROTECT field (and the synopsis shows \fiOPR\fR
+ORWRITE which has a 3 bit ORPROTECT field (and the synopsis shows \fIOPR\fR
 to highlight the difference). In all cases \fIWPR\fR is placed
 in that 3 bit field. The default value is zero which does not send any PI
 in the data\-out buffer. \fIWPR\fR should be a value between 0 and 7.
@@ -587,7 +587,7 @@ Written by Douglas Gilbert.
 .SH "REPORTING BUGS"
 Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
-Copyright \(co 2017 Douglas Gilbert
+Copyright \(co 2017\-2020 Douglas Gilbert
 .br
 This software is distributed under a FreeBSD license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/doc/sg_xcopy.8 b/doc/sg_xcopy.8
index 437bad0..197fc37 100644
--- a/doc/sg_xcopy.8
+++ b/doc/sg_xcopy.8
@@ -1,4 +1,4 @@
-.TH SG_XCOPY "8" "August 2018" "sg3_utils\-1.43" SG3_UTILS
+.TH SG_XCOPY "8" "February 2019" "sg3_utils\-1.45" SG3_UTILS
 .SH NAME
 sg_xcopy \- copy data to and from files and devices using SCSI EXTENDED
 COPY (XCOPY)
@@ -9,7 +9,7 @@ COPY (XCOPY)
 [\fIoflag=FLAGS\fR] [\fIseek=SEEK\fR] [\fIskip=SKIP\fR] [\fI\-\-help\fR]
 [\fI\-\-version\fR]
 .PP
-[\fIbpt=BPT\fR] [\fIcat=\fR0|1] [\fIdc=\fR0|1]
+[\fIapp=\fR0|1] [\fIbpt=BPT\fR] [\fIcat=\fR0|1] [\fIdc=\fR0|1] [\fIfco=\fR0|1]
 [\fIid_usage=\fR{hold|discard|disable}] [\fIlist_id=ID\fR] [\fIprio=PRIO\fR]
 [\fItime=\fR0|1] [\fIverbose=VERB\fR] [\fI\-\-on_dst|\-\-on_src\fR]
 [\fI\-\-verbose\fR]
@@ -19,14 +19,6 @@ COPY (XCOPY)
 Copy data to and from any files. Specialized for "files" that are Linux SCSI
 devices that support the SCSI EXTENDED COPY (XCOPY) command.
 .PP
-During the draft stages of SPC\-4 the T10 committee has expanded the XCOPY
-command so that it now has two variants: "LID1" (for a List Identifier
-length of 1 byte) and "LID4" (for a List Identifier length of 4 bytes).
-This utility supports the older, LID1 variant which is also found in SPC\-3
-and earlier.  While the LID1 variant in SPC\-4 is command level (binary)
-compatible with XCOPY as defined in SPC\-3, some of the command naming has
-changed. This utility uses the older, SPC\-3 XCOPY names.
-.PP
 This utility
 has similar syntax and semantics to
 .B dd(1)
@@ -42,12 +34,26 @@ with the \fI\-\-on_src\fR or \fIiflag=xflag\fR options which cause the XCOPY
 command to be sent to \fIIFILE\fR instead. Also see the section on
 ENVIRONMENT VARIABLES.
 .PP
+In the SPC\-4 standard the T10 committee has expanded the XCOPY command so
+that it now has two variants: "LID1" (for a List Identifier length of 1 byte)
+and "LID4" (for a List Identifier length of 4 bytes). This utility supports
+the older, LID1 variant which is also found in SPC\-3 and earlier. While the
+LID1 variant in SPC\-4 is command level (binary) compatible with XCOPY as
+defined in SPC\-3, some of the command naming has changed. This utility uses
+the older, SPC\-3 XCOPY names.
+.PP
 The ddpt utility supports the same xcopy(LID1) functionality as this utility
 with the same options and flags. Additionally ddpt supports a subset of
 xcopy(LID4) functionality variously called "xcopy version 2, lite" or ODX.
 ODX is a market name and stands for Offloaded Data Xfer (i.e. transfer).
 .SH OPTIONS
 .TP
+\fBapp\fR={0|1}
+if 1 start the destination of the copy at the end of OFILE. This assumes
+that OFILE is a regular file. The default is 0 in which case the destination
+of the copy starts at the beginning of OFILE (possibly offset be SEEK). This
+option cannot be used with the \fIseek=SEEK\fR option.
+.TP
 \fBbpt\fR=\fIBPT\fR
 each IO transaction will be made using \fIBPT\fR blocks (or less if near
 the end of the copy). Default is 128 for logical block sizes less that 2048
@@ -73,24 +79,16 @@ the handling of residual data. See section
 .B HANDLING OF RESIDUAL DATA
 for details.
 .TP
-\fBdc\fR={0|1}
-sets the SCSI EXTENDED COPY command segment descriptor DC bit to 0 or
-1 (default: 0). The DC bit controls whether \fICOUNT\fR
-refers to the source (\fIdc=0\fR) or the target (\fIdc=1\fR) descriptor.
-.TP
 \fBconv\fR=\fBCONV\fR
 all \fBCONV\fR arguments are ignored.
 .TP
-\fBapp\fR=\fBAPPEND\fR
-all \fBAPPEND\fR arguments are ignored.
-.TP
 \fBcount\fR=\fICOUNT\fR
 copy \fICOUNT\fR blocks from \fIIFILE\fR to \fIOFILE\fR. Default is the
 minimum (\fIIFILE\fR if \fIdc=0\fR or \fIOFILE\fR if \fIdc=1\fR)
 number of blocks that SCSI devices report from SCSI READ CAPACITY
 commands or that block devices (or their partitions) report. Normal
 files are not probed for their size. If \fIskip=SKIP\fR or
-\fIskip=SEEK\fR are given and the count is derived (i.e. not
+\fIseek=SEEK\fR are given and the count is derived (i.e. not
 explicitly given) then the derived count is scaled back so that the
 copy will not overrun the device. If the file name is a block device
 partition and \fICOUNT\fR is not given then the size of the partition
@@ -98,6 +96,19 @@ rather than the size of the whole device is used. If \fICOUNT\fR is
 not given (or \fIcount=\-1\fR) and cannot be derived then an error
 message is issued and no copy takes place.
 .TP
+\fBdc\fR={0|1}
+sets the SCSI EXTENDED COPY command segment descriptor DC bit to 0 or
+1 (default: 0). The DC bit controls whether \fICOUNT\fR
+refers to the source (\fIdc=0\fR) or the target (\fIdc=1\fR) descriptor.
+.TP
+\fBfco\fR={0|1}
+sets the SCSI EXTENDED COPY command segment descriptor FCO bit to 0 or
+1 (default: 0). The Fast Copy Only (FCO) bit set will result in the
+copy being done but a technique faster than SCSI READ and WRITE commands.
+If the copy cannot but done in a faster manner then a sense key of "Copy
+aborted" with and additional sense of "Fast copy not possible" is
+returned.
+.TP
 \fBibs\fR=\fIBS\fR
 if given must be the same as \fIBS\fR given to 'bs=' option.
 .TP
@@ -343,7 +354,7 @@ Written by Hannes Reinecke and Douglas Gilbert.
 .SH "REPORTING BUGS"
 Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
-Copyright \(co 2000\-2018 Hannes Reinecke and Douglas Gilbert
+Copyright \(co 2000\-2019 Hannes Reinecke and Douglas Gilbert
 .br
 This software is distributed under the GPL version 2. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/doc/sgm_dd.8 b/doc/sgm_dd.8
index 346bedb..58782d7 100644
--- a/doc/sgm_dd.8
+++ b/doc/sgm_dd.8
@@ -1,4 +1,4 @@
-.TH SGM_DD "8" "June 2018" "sg3_utils\-1.43" SG3_UTILS
+.TH SGM_DD "8" "February 2019" "sg3_utils\-1.45" SG3_UTILS
 .SH NAME
 sgm_dd \- copy data to and from files and devices, especially SCSI
 devices
@@ -66,7 +66,7 @@ copy \fICOUNT\fR blocks from \fIIFILE\fR to \fIOFILE\fR. Default is the
 minimum (of \fIIFILE\fR and \fIOFILE\fR) number of blocks that sg devices
 report from SCSI READ CAPACITY commands or that block devices (or their
 partitions) report. Normal files are not probed for their size. If
-\fIskip=SKIP\fR or \fIskip=SEEK\fR are given and the count is derived (i.e.
+\fIskip=SKIP\fR or \fIseek=SEEK\fR are given and the count is derived (i.e.
 not explicitly given) then the derived count is scaled back so that the
 copy will not overrun the device. If the file name is a block device
 partition and \fICOUNT\fR is not given then the size of the partition rather
@@ -269,7 +269,7 @@ Written by Douglas Gilbert and Peter Allworth.
 .SH "REPORTING BUGS"
 Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
-Copyright \(co 2000\-2018 Douglas Gilbert
+Copyright \(co 2000\-2019 Douglas Gilbert
 .br
 This software is distributed under the GPL version 2. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/doc/sgp_dd.8 b/doc/sgp_dd.8
index 0c99712..62a065b 100644
--- a/doc/sgp_dd.8
+++ b/doc/sgp_dd.8
@@ -1,4 +1,4 @@
-.TH SGP_DD "8" "June 2018" "sg3_utils\-1.43" SG3_UTILS
+.TH SGP_DD "8" "February 2020" "sg3_utils\-1.45" SG3_UTILS
 .SH NAME
 sgp_dd \- copy data to and from files and devices, especially SCSI
 devices
@@ -61,7 +61,7 @@ copy \fICOUNT\fR blocks from \fIIFILE\fR to \fIOFILE\fR. Default is the
 minimum (of \fIIFILE\fR and \fIOFILE\fR) number of blocks that sg devices
 report from SCSI READ CAPACITY commands or that block devices (or their
 partitions) report. Normal files are not probed for their size. If
-\fIskip=SKIP\fR or \fIskip=SEEK\fR are given and the count is deduced (i.e.
+\fIskip=SKIP\fR or \fIseek=SEEK\fR are given and the count is deduced (i.e.
 not explicitly given) then that count is scaled back so that the copy will
 not overrun the device. If the file name is a block device partition and
 \fICOUNT\fR is not given then the size of the partition rather than the
@@ -123,7 +123,7 @@ transfer. Only active when \fIOFILE\fR is a sg device file name.
 .TP
 \fBthr\fR=\fITHR\fR
 where \fITHR\fR is the number or worker threads (default 4) that attempt to
-copy in parallel. Minimum is 1 and maximum is 16.
+copy in parallel. Minimum is 1 and maximum is 1024.
 .TP
 \fBtime\fR=0 | 1
 when 1, the transfer is timed and throughput calculation is
@@ -201,6 +201,13 @@ excl
 causes the O_EXCL flag to be added to the open of \fIIFILE\fR and/or
 \fIOFILE\fR.
 .TP
+mmap
+can only be used in the \fIiflag=FLAGS\fR or the \fIoflag=FLAGS\fR argument
+list but not both. The nominated side of the copy will use memory mapped IO
+based on the mmap(2) system call. The sg driver will remap its DMA
+destination or source buffer into the user space when the mmap(2) system call
+is used on a sg device.
+.TP
 fua
 causes the FUA (force unit access) bit to be set in SCSI READ and/or WRITE
 commands. This only has effect with sg devices. The 6 byte variants
@@ -314,7 +321,7 @@ Written by Douglas Gilbert and Peter Allworth.
 .SH "REPORTING BUGS"
 Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
-Copyright \(co 2000\-2017 Douglas Gilbert
+Copyright \(co 2000\-2020 Douglas Gilbert
 .br
 This software is distributed under the GPL version 2. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/examples/scsi_inquiry.c b/examples/scsi_inquiry.c
index 32fe74d..9949749 100644
--- a/examples/scsi_inquiry.c
+++ b/examples/scsi_inquiry.c
@@ -1,3 +1,24 @@
+/*
+ * Copyright (C) 1999-2018 D. Gilbert
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * Test code for D. Gilbert's extensions to the Linux OS SCSI generic ("sg")
+ * device driver.
+ * This program does a SCSI inquiry command on the given device and
+ * outputs some of the result. This program highlights the use of the
+ * SCSI_IOCTL_SEND_COMMAND ioctl. This should be able to be applied to
+ * any SCSI device file descriptor (not just one related to sg). [Whether
+ * this is a good idea on a disk while it is mounted is debatable.
+ * No detrimental effects when this was tested ...]
+ *
+ * Version 0.16 20181207
+ */
+
 #include <unistd.h>
 #include <signal.h>
 #include <fcntl.h>
@@ -11,25 +32,6 @@
 #include <scsi/scsi.h>
 /* #include <scsi/scsi_ioctl.h> */ /* glibc hides this file sometimes */
 
-/* Test code for D. Gilbert's extensions to the Linux OS SCSI generic ("sg")
-   device driver.
-*  Copyright (C) 1999 D. Gilbert
-*  This program is free software; you can redistribute it and/or modify
-*  it under the terms of the GNU General Public License as published by
-*  the Free Software Foundation; either version 2, or (at your option)
-*  any later version.
-
-   This program does a SCSI inquiry command on the given device and
-   outputs some of the result. This program highlights the use of the
-   SCSI_IOCTL_SEND_COMMAND ioctl. This should be able to be applied to
-   any SCSI device file descriptor (not just one related to sg). [Whether
-   this is a good idea on a disk while it is mounted is debatable.
-   No detrimental effects when this was tested ...]
-
-Version 0.15 20160528
-*/
-
-
 typedef struct my_scsi_ioctl_command {
         unsigned int inlen;  /* _excluding_ scsi command length */
         unsigned int outlen;
diff --git a/examples/sdiag_sas_p0_prbs9.txt b/examples/sdiag_sas_p0_prbs9.txt
new file mode 100644
index 0000000..1b96f99
--- /dev/null
+++ b/examples/sdiag_sas_p0_prbs9.txt
@@ -0,0 +1,12 @@
+# This is the hex for a SAS protocol specific diagnostic
+# page. It will attempt to put phy identifier 0 of the
+# given device into PRBS9 (jitter pattern) generation mode.
+# Physical transmission speed is 22.5 Gbps
+# N.B. This will turn the receiver off on phy id 0.
+#
+# Usage example: 'sg_senddiag --pf --raw=- /dev/sg2 < {this_file}'
+#
+3f,6,0,1c,0,1,3,c,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0
diff --git a/examples/sdiag_sas_p1_prbs15.txt b/examples/sdiag_sas_p1_prbs15.txt
new file mode 100644
index 0000000..1248ab3
--- /dev/null
+++ b/examples/sdiag_sas_p1_prbs15.txt
@@ -0,0 +1,12 @@
+# This is the hex for a SAS protocol specific diagnostic
+# page. It will attempt to put phy identifier 1 of the
+# given device into PRBS15 (jitter pattern) generation mode.
+# Physical transmission speed is 22.5 Gbps
+# N.B. This will turn the receiver off on phy id 1.
+#
+# Usage example: 'sg_senddiag --pf --raw=- /dev/sg2 < {this_file}'
+#
+3f,6,0,1c,1,1,4,c,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0
diff --git a/examples/sg_compare_and_write.txt b/examples/sg_compare_and_write.txt
index 05d72b9..86b166b 100644
--- a/examples/sg_compare_and_write.txt
+++ b/examples/sg_compare_and_write.txt
@@ -9,7 +9,7 @@
 #
 # The following example shows initialization, successful and unsuccessful
 # compare and write using sg3_utils. I am using caw_buf_zero2one and
-# caw_buf_one2zero as shown bellow.
+# caw_buf_one2zero as shown below.
 
 $ hexdump /tmp/caw_buf_zero2one
 0000000 0000 0000 0000 0000 0000 0000 0000 0000
diff --git a/examples/sg_excl.c b/examples/sg_excl.c
index 8cbab75..7e589b2 100644
--- a/examples/sg_excl.c
+++ b/examples/sg_excl.c
@@ -1,3 +1,28 @@
+/*
+ * Copyright (C) 2003-2018 D. Gilbert
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * This is a simple program that tests the O_EXCL flag in sg while
+ * executing a SCSI INQUIRY command and a
+ * TEST UNIT READY command using the SCSI generic (sg) driver
+ *
+ * Invocation: sg_excl [-x] <sg_device>
+ *
+ * Version 3.62 (20181227)
+ *
+ * 6 byte INQUIRY command:
+ * [0x12][   |lu][pg cde][res   ][al len][cntrl ]
+ *
+ * 6 byte TEST UNIT READY command:
+ * [0x00][   |lu][res   ][res   ][res   ][res   ]
+ *
+ */
+
 #include <unistd.h>
 #include <fcntl.h>
 #include <stdio.h>
@@ -11,27 +36,6 @@
 #include "sg_lib.h"
 #include "sg_io_linux.h"
 
-/* This is a simple program that tests the O_EXCL flag in sg while
-   executing a SCSI INQUIRY command and a
-   TEST UNIT READY command using the SCSI generic (sg) driver
-
-*  Copyright (C) 2003-2018 D. Gilbert
-*  This program is free software; you can redistribute it and/or modify
-*  it under the terms of the GNU General Public License as published by
-*  the Free Software Foundation; either version 2, or (at your option)
-*  any later version.
-
-   Invocation: sg_excl [-x] <sg_device>
-
-   Version 3.60 (20180220)
-
-6 byte INQUIRY command:
-[0x12][   |lu][pg cde][res   ][al len][cntrl ]
-
-6 byte TEST UNIT READY command:
-[0x00][   |lu][res   ][res   ][res   ][res   ]
-
-*/
 
 #define INQ_REPLY_LEN 96
 #define INQ_CMD_LEN 6
@@ -191,6 +195,7 @@ int main(int argc, char * argv[])
                "msg_status=%d\n", io_hdr.duration, io_hdr.resid,
                 (int)io_hdr.msg_status);
 
+    printf("Wait for 60 seconds with O_EXCL help on %s\n", file_name);
     sleep(60);
     close(sg_fd);
     return 0;
diff --git a/examples/sg_sat_chk_power.c b/examples/sg_sat_chk_power.c
index b5ea18a..ca24f66 100644
--- a/examples/sg_sat_chk_power.c
+++ b/examples/sg_sat_chk_power.c
@@ -10,8 +10,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -25,6 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #include <unistd.h>
@@ -59,7 +58,7 @@
 
 #define EBUFF_SZ 256
 
-static const char * version_str = "1.07 20180706";
+static const char * version_str = "1.08 20181207";
 
 
 #if 0
diff --git a/examples/sg_sat_smart_rd_data.c b/examples/sg_sat_smart_rd_data.c
index 1e7295d..223da2a 100644
--- a/examples/sg_sat_smart_rd_data.c
+++ b/examples/sg_sat_smart_rd_data.c
@@ -10,8 +10,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -25,6 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #include <unistd.h>
@@ -58,7 +57,7 @@
 
 #define EBUFF_SZ 256
 
-static char * version_str = "1.04 20180220";
+static char * version_str = "1.05 20181207";
 
 int main(int argc, char * argv[])
 {
diff --git a/examples/sg_simple1.c b/examples/sg_simple1.c
index d835267..b8ef349 100644
--- a/examples/sg_simple1.c
+++ b/examples/sg_simple1.c
@@ -1,3 +1,32 @@
+/*
+ *   Copyright (C) 1999-2018 D. Gilbert
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * This is a simple program executing a SCSI INQUIRY command and a
+ * TEST UNIT READY command using the SCSI generic (sg) driver
+ * There is another variant of this program called "sg_simple2"
+ * which does not include the sg_lib.h header and logic and so has
+ * simpler but more primitive error processing.
+ * In the lk 2.6 series devices nodes such as /dev/sda also support
+ * the SG_IO ioctl.
+ *
+ *   Invocation: sg_simple1 [-x] <scsi_device>
+ *
+ *   Version 3.60 (20181207)
+ *
+ * 6 byte INQUIRY command:
+ * [0x12][   |lu][pg cde][res   ][al len][cntrl ]
+ *
+ * 6 byte TEST UNIT READY command:
+ * [0x00][   |lu][res   ][res   ][res   ][res   ]
+ *
+ */
+
 #include <unistd.h>
 #include <fcntl.h>
 #include <stdio.h>
@@ -10,31 +39,6 @@
 #include "sg_lib.h"
 #include "sg_io_linux.h"
 
-/* This is a simple program executing a SCSI INQUIRY command and a
-   TEST UNIT READY command using the SCSI generic (sg) driver
-   There is another variant of this program called "sg_simple2"
-   which does not include the sg_lib.h header and logic and so has
-   simpler but more primitive error processing.
-   In the lk 2.6 series devices nodes such as /dev/sda also support
-   the SG_IO ioctl.
-
-*  Copyright (C) 1999-2007 D. Gilbert
-*  This program is free software; you can redistribute it and/or modify
-*  it under the terms of the GNU General Public License as published by
-*  the Free Software Foundation; either version 2, or (at your option)
-*  any later version.
-
-   Invocation: sg_simple1 [-x] <scsi_device>
-
-   Version 03.59 (20160528)
-
-6 byte INQUIRY command:
-[0x12][   |lu][pg cde][res   ][al len][cntrl ]
-
-6 byte TEST UNIT READY command:
-[0x00][   |lu][res   ][res   ][res   ][res   ]
-
-*/
 
 #define INQ_REPLY_LEN 96
 #define INQ_CMD_LEN 6
diff --git a/examples/sgq_dd.c b/examples/sgq_dd.c
index debbe37..2f163ef 100644
--- a/examples/sgq_dd.c
+++ b/examples/sgq_dd.c
@@ -1,3 +1,32 @@
+/*
+ * A utility program for the Linux OS SCSI generic ("sg") device driver.
+ * Copyright (C) 1999-2010 D. Gilbert and P. Allworth
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * This program is a specialization of the Unix "dd" command in which
+ * one or both of the given files is a scsi generic device or a raw
+ * device. A block size ('bs') is assumed to be 512 if not given. This
+ * program complains if 'ibs' or 'obs' are given with some other value
+ * than 'bs'. If 'if' is not given or 'if=-' then stdin is assumed. If
+ * 'of' is not given or 'of=-' then stdout assumed.  Multipliers:
+ *    'c','C'  *1       'b','B' *512      'k' *1024      'K' *1000
+ *    'm' *(1024^2)     'M' *(1000^2)     'g' *(1024^3)  'G' *(1000^3)
+ *
+ * A non-standard argument "bpt" (blocks per transfer) is added to control
+ * the maximum number of blocks in each transfer. The default value is 128.
+ * For example if "bs=512" and "bpt=32" then a maximum of 32 blocks (16KB
+ * in this case) are transferred to or from the sg device in a single SCSI
+ * command.
+ *
+ * This version should compile with Linux sg drivers with version numbers
+ * >= 30000 . This version uses queuing within the Linux sg driver.
+ */
+
 #define _XOPEN_SOURCE 500
 
 #include <unistd.h>
@@ -23,34 +52,8 @@ typedef uint8_t u_char;   /* horrible, for scsi.h */
 #include "sg_io_linux.h"
 #include "sg_unaligned.h"
 
-/* A utility program for the Linux OS SCSI generic ("sg") device driver.
-*  Copyright (C) 1999-2018 D. Gilbert and P. Allworth
-*  This program is free software; you can redistribute it and/or modify
-*  it under the terms of the GNU General Public License as published by
-*  the Free Software Foundation; either version 2, or (at your option)
-*  any later version.
-
-   This program is a specialization of the Unix "dd" command in which
-   one or both of the given files is a scsi generic device or a raw
-   device. A block size ('bs') is assumed to be 512 if not given. This
-   program complains if 'ibs' or 'obs' are given with some other value
-   than 'bs'. If 'if' is not given or 'if=-' then stdin is assumed. If
-   'of' is not given or 'of=-' then stdout assumed.  Multipliers:
-      'c','C'  *1       'b','B' *512      'k' *1024      'K' *1000
-      'm' *(1024^2)     'M' *(1000^2)     'g' *(1024^3)  'G' *(1000^3)
-
-   A non-standard argument "bpt" (blocks per transfer) is added to control
-   the maximum number of blocks in each transfer. The default value is 128.
-   For example if "bs=512" and "bpt=32" then a maximum of 32 blocks (16KB
-   in this case) are transferred to or from the sg device in a single SCSI
-   command.
-
-   This version should compile with Linux sg drivers with version numbers
-   >= 30000 . This version uses queuing within the Linux sg driver.
-
-*/
-
-static char * version_str = "0.61 20180627";
+
+static char * version_str = "0.63 20190324";
 /* resurrected from "0.55 20020509" */
 
 #define DEF_BLOCK_SIZE 512
@@ -64,7 +67,7 @@ static char * version_str = "0.61 20180627";
 #define SGP_READ10 0x28
 #define SGP_WRITE10 0x2a
 #define DEF_NUM_THREADS 4       /* actually degree of concurrency */
-#define MAX_NUM_THREADS 32
+#define MAX_NUM_THREADS 1024
 
 #ifndef RAW_MAJOR
 #define RAW_MAJOR 255   /*unlikey value */
@@ -241,7 +244,7 @@ usage()
            "         usually either 'if' or 'of' is a sg or raw device\n"
            " 'bpt' is blocks_per_transfer (default is 128)\n"
            " 'dio' is direct IO, 1->attempt, 0->indirect IO (def)\n"
-           " 'thr' is number of queues, must be > 0, default 4, max 32\n");
+           " 'thr' is number of queues, must be > 0, default 4, max 1024\n");
     fprintf(stderr, " 'coe' continue on sg error, 0->exit (def), "
            "1->zero + continue\n"
            " 'time' 0->no timing(def), 1->time plus calculate throughput\n"
diff --git a/examples/transport_ids.txt b/examples/transport_ids.txt
index 0c60456..a63374d 100644
--- a/examples/transport_ids.txt
+++ b/examples/transport_ids.txt
@@ -9,7 +9,7 @@
 # To see transport IDs decoded after they have been read in (e.g. to check
 # they are well formed) use the verbose flag 3 times (i.e. "... -vvv ...").
 
-# Here is a simple example (for SPI) of a comma separted hex list:
+# Here is a simple example (for SPI) of a comma separated hex list:
 1,0,0,7,0,0,0,1         # SPI, initiator address=7, relative_port_num=1
 
 # and here is the transport specific format for the same thing:
diff --git a/include/Makefile.in b/include/Makefile.in
index d6029bf..6ee60f6 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -351,8 +351,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -443,7 +443,10 @@ cscopelist-am: $(am__tagged_files)
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
diff --git a/include/freebsd_nvme_ioctl.h b/include/freebsd_nvme_ioctl.h
index a7c970b..0b79d85 100644
--- a/include/freebsd_nvme_ioctl.h
+++ b/include/freebsd_nvme_ioctl.h
@@ -39,6 +39,11 @@ extern "C" {
 #define NVME_PASSTHROUGH_CMD    _IOWR('n', 0, struct nvme_pt_command)
 
 #if __FreeBSD_version < 1100110
+
+#define NVME_STATUS_GET_SC(st)  (st.sc)
+#define NVME_STATUS_GET_SCT(st)  (st.sct)
+
+
 struct nvme_command
 {
         /* dword 0 */
@@ -151,12 +156,14 @@ struct nvme_pt_command {
          */
         struct mtx *            driver_lock;
 };
-#else
+#else		/* not    __FreeBSD_version < 1100110 */
 #include <dev/nvme/nvme.h>
-#endif
+#endif		/* __FreeBSD_version < 1100110 */
 
+#ifndef nvme_completion_is_error
 #define nvme_completion_is_error(cpl)                                   \
         ((cpl)->status.sc != 0 || (cpl)->status.sct != 0)
+#endif
 
 #define NVME_CTRLR_PREFIX       "/dev/nvme"
 #define NVME_NS_PREFIX          "ns"
diff --git a/include/sg_cmds_basic.h b/include/sg_cmds_basic.h
index 4fb0ddf..e40d101 100644
--- a/include/sg_cmds_basic.h
+++ b/include/sg_cmds_basic.h
@@ -2,10 +2,12 @@
 #define SG_CMDS_BASIC_H
 
 /*
- * Copyright (c) 2004-2018 Douglas Gilbert.
+ * Copyright (c) 2004-2019 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.
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 /*
@@ -341,8 +343,8 @@ const char * sg_cmds_version();
  * output via 'o_sense_cat' pointer (if not NULL). Note that several sense
  * categories also have data in bytes received; -2 is still returned. */
 int sg_cmds_process_resp(struct sg_pt_base * ptvp, const char * leadin,
-                         int pt_res, int mx_di_len, const uint8_t * sense_b,
-                         bool noisy, int verbose, int * o_sense_cat);
+                         int pt_res, bool noisy, int verbose,
+                         int * o_sense_cat);
 
 /* NVMe devices use a different command set. This function will return true
  * if the device associated with 'pvtp' is a NVME device, else it will
diff --git a/include/sg_cmds_extra.h b/include/sg_cmds_extra.h
index 974d17c..dde2298 100644
--- a/include/sg_cmds_extra.h
+++ b/include/sg_cmds_extra.h
@@ -6,6 +6,8 @@
  * All rights reserved.
  * Use of this source code is governed by a BSD-style
  * license that can be found in the BSD_LICENSE file.
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #include <stdint.h>
diff --git a/include/sg_cmds_mmc.h b/include/sg_cmds_mmc.h
index 3988b1d..c9b7d73 100644
--- a/include/sg_cmds_mmc.h
+++ b/include/sg_cmds_mmc.h
@@ -6,6 +6,8 @@
  * All rights reserved.
  * Use of this source code is governed by a BSD-style
  * license that can be found in the BSD_LICENSE file.
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #ifdef __cplusplus
diff --git a/include/sg_io_linux.h b/include/sg_io_linux.h
index b57aa63..4766e2a 100644
--- a/include/sg_io_linux.h
+++ b/include/sg_io_linux.h
@@ -6,10 +6,12 @@
  * All rights reserved.
  * Use of this source code is governed by a BSD-style
  * license that can be found in the BSD_LICENSE file.
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 /*
- * Version 1.06 [20180119]
+ * Version 1.07 [20181211]
  */
 
 /*
@@ -158,6 +160,14 @@ struct sg_io_hdr;
 int sg_chk_n_print3(const char * leadin, struct sg_io_hdr * hp,
                     bool raw_sinfo);
 
+/* Returns 1 if no errors found and thus nothing printed; otherwise
+ * prints error/warning (prefix by 'leadin') to stderr (pr2ws) and
+ * returns 0. */
+int sg_linux_sense_print(const char * leadin, int scsi_status,
+                         int host_status, int driver_status,
+                         const uint8_t * sense_buffer, int sb_len,
+                         bool raw_sinfo);
+
 /* Calls sg_scsi_normalize_sense() after obtaining the sense buffer and
    its length from the struct sg_io_hdr pointer. If these cannot be
    obtained, false is returned. */
diff --git a/include/sg_lib.h b/include/sg_lib.h
index e860b92..1ece717 100644
--- a/include/sg_lib.h
+++ b/include/sg_lib.h
@@ -2,10 +2,12 @@
 #define SG_LIB_H
 
 /*
- * Copyright (c) 2004-2018 Douglas Gilbert.
+ * Copyright (c) 2004-2019 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.
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 /*
@@ -178,10 +180,10 @@ struct sg_scsi_sense_hdr {
     uint8_t sense_key;
     uint8_t asc;
     uint8_t ascq;
-    uint8_t byte4;
-    uint8_t byte5;
+    uint8_t byte4;      /* descriptor: SDAT_OVFL; fixed: lower three ... */
+    uint8_t byte5;      /* ... bytes of INFO field */
     uint8_t byte6;
-    uint8_t additional_length;
+    uint8_t additional_length;  /* zero for fixed format sense data */
 };
 
 /* Maps the salient data from a sense buffer which is in either fixed or
@@ -269,6 +271,18 @@ int sg_get_designation_descriptor_str(const char * leadin,
                                       bool print_assoc, bool do_long,
                                       int blen, char * b);
 
+/* Expects a T10 UUID designator (as found in the Device Identification VPD
+ * page) pointed to by 'dp'. To not produce an error string in 'b', c_set
+ * should be 1 (binary) and dlen should be 18. Currently T10 only supports
+ * locally assigned UUIDs. Writes output to string 'b' of no more than blen
+ * bytes and returns the number of bytes actually written to 'b' but doesn't
+ * count the trailing null character it always appends (if blen > 0). 'lip'
+ * is lead-in string (on each line) than may be NULL. skip_prefix avoids
+ * outputting: '   Locally assigned UUID: ' before the UUID. */
+int sg_t10_uuid_desig2str(const uint8_t * dp, int dlen, int c_set,
+                          bool do_long, bool skip_prefix,
+                          const char * lip, int blen, char * b);
+
 /* Yield string associated with peripheral device type (pdt). Returns
  * 'buff'. If 'pdt' out of range yields "bad pdt" string. */
 char * sg_get_pdt_str(int pdt, int buff_len, char * buff);
@@ -364,9 +378,21 @@ extern FILE * sg_warnings_strm;
 
 void sg_set_warnings_strm(FILE * warnings_strm);
 
+/* Given a SCSI command pointed to by cdbp of sz bytes this function forms a
+ * SCSI command in ASCII hex surrounded by square brackets in 'b'. 'b' is at
+ * least blen bytes long. If cmd_name is true then the command is prefixed
+ * by its SCSI command name (e.g.  "VERIFY(10) [2f ...]". The command is
+ * shown as spaced separated pairs of hexadecimal digits (i.e. 0-9, a-f).
+ * Each pair represents byte. The leftmost pair of digits is cdbp[0] . If
+ * sz <= 0 then this function tries to guess the length of the command. */
+char *
+sg_get_command_str(const uint8_t * cdbp, int sz, bool cmd_name, int blen,
+                   char * b);
+
 /* The following "print" functions send ASCII to 'sg_warnings_strm' file
  * descriptor (default value is stderr). 'leadin' is string prepended to
  * each line printed out, NULL treated as "". */
+void sg_print_command_len(const uint8_t * command, int len);
 void sg_print_command(const uint8_t * command);
 void sg_print_scsi_status(int scsi_status);
 
@@ -450,6 +476,8 @@ bool sg_exit2str(int exit_status, bool longer, int b_len, char * b);
 #define SG_LIB_CAT_TASK_ABORTED 29 /* SCSI status, this command aborted by? */
 #define SG_LIB_CONTRADICT 31    /* error involving two or more cl options */
 #define SG_LIB_LOGIC_ERROR 32   /* unexpected situation in code */
+#define SG_LIB_WINDOWS_ERR 34   /* Windows error number don't fit in 7 bits so
+                                 * map to a single value for exit statuses */
 #define SG_LIB_OK_FALSE 36      /* no error, reporting false (cf. no error,
                                  * reporting true is SG_LIB_OK_TRUE(0) ) */
 #define SG_LIB_CAT_PROTECTION 40 /* subset of aborted command (for PI, DIF)
@@ -553,6 +581,16 @@ void hex2stderr(const uint8_t * b_str, int len, int no_ascii);
 int hex2str(const uint8_t * b_str, int len, const char * leadin, int format,
             int cb_len, char * cbp);
 
+/* Read ASCII hex bytes or binary from fname (a file named '-' taken as
+ * stdin). If reading ASCII hex then there should be either one entry per
+ * line or a comma, space or tab separated list of bytes. If no_space is
+ * set then a string of ACSII hex digits is expected, 2 per byte. Everything
+ * from and including a '#' on a line is ignored. Returns 0 if ok, or an
+ * error code. If the error code is SG_LIB_LBA_OUT_OF_RANGE then mp_arr
+ * would be exceeded and both mp_arr and mp_arr_len are written to. */
+int sg_f2hex_arr(const char * fname, bool as_binary, bool no_space,
+                 uint8_t * mp_arr, int * mp_arr_len, int max_arr_len);
+
 /* Returns true when executed on big endian machine; else returns false.
  * Useful for displaying ATA identify words (which need swapping on a
  * big endian machine). */
@@ -587,13 +625,14 @@ int sg_ata_get_chars(const uint16_t * word_arr, int start_word,
 void dWordHex(const uint16_t * words, int num, int no_ascii, bool swapb);
 
 /* If the number in 'buf' can not be decoded or the multiplier is unknown
- * then -1 is returned. Accepts a hex prefix (0x or 0X) or a 'h' (or 'H')
- * suffix. Otherwise a decimal multiplier suffix may be given. Recognised
- * multipliers: c C  *1;  w W  *2; b  B *512;  k K KiB  *1,024;
- * KB  *1,000;  m M MiB  *1,048,576; MB *1,000,000; g G GiB *1,073,741,824;
- * GB *1,000,000,000 and <n>x<m> which multiplies <n> by <m> . Ignore leading
- * spaces and tabs; accept comma, hyphen, space, tab and hash as terminator.
- */
+ * then -1 is returned. Accepts a hex prefix (0x or 0X) or a decimal
+ * multiplier suffix (as per GNU's dd (since 2002: SI and IEC 60027-2)).
+ * Main (SI) multipliers supported: K, M, G. Ignore leading spaces and
+ * tabs; accept comma, hyphen, space, tab and hash as terminator.
+ * Handles zero and positive values up to 2**31-1 .
+ * Experimental: left argument (must in with hexadecimal digit) added
+ * to, or multiplied, by right argument. No embedded spaces.
+ * Examples: '3+1k' (evaluates to 1027) and '0xf+0x3'. */
 int sg_get_num(const char * buf);
 
 /* If the number in 'buf' can not be decoded then -1 is returned. Accepts a
@@ -604,12 +643,14 @@ int sg_get_num(const char * buf);
 int sg_get_num_nomult(const char * buf);
 
 /* If the number in 'buf' can not be decoded or the multiplier is unknown
- * then -1LL is returned. Accepts a hex prefix (0x or 0X) or a 'h' (or 'H')
- * suffix. Otherwise a decimal multiplier suffix may be given. In addition
- * to supporting the multipliers of sg_get_num(), this function supports:
- * t T TiB  *(2**40); TB *(10**12); p P PiB  *(2**50); PB  *(10**15) .
- * Ignore leading spaces and tabs; accept comma, hyphen, space, tab and hash
- * as terminator. */
+ * then -1LL is returned. Accepts a hex prefix (0x or 0X), hex suffix
+ * (h or H), or a decimal multiplier suffix (as per GNU's dd (since 2002:
+ * SI and IEC 60027-2)).  Main (SI) multipliers supported: K, M, G, T, P
+ * and E. Ignore leading spaces and tabs; accept comma, hyphen, space, tab
+ * and hash as terminator. Handles zero and positive values up to 2**63-1 .
+ * Experimental: the left argument (must end in with hexadecimal digit)
+ * added to, or multiplied by, the right argument. No embedded spaces.
+ * Examples: '3+1k' (evaluates to 1027) and '0xf+0x3'. */
 int64_t sg_get_llnum(const char * buf);
 
 /* If the number in 'buf' can not be decoded then -1 is returned. Accepts a
diff --git a/include/sg_lib_data.h b/include/sg_lib_data.h
index a870043..2f142a2 100644
--- a/include/sg_lib_data.h
+++ b/include/sg_lib_data.h
@@ -2,10 +2,12 @@
 #define SG_LIB_DATA_H
 
 /*
- * Copyright (c) 2007-2018 Douglas Gilbert.
+ * Copyright (c) 2007-2019 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.
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 /*
@@ -86,6 +88,14 @@ struct sg_lib_4tuple_u8 {
     uint8_t t4;
 };
 
+struct sg_cmd_response_t {
+    int din_len;
+    int dout_len;
+    int resid;
+    int resid2;
+    const uint8_t * sbp;
+};
+
 
 extern const char * sg_lib_version_str;
 
diff --git a/include/sg_linux_inc.h b/include/sg_linux_inc.h
index 1f76018..e6f6b52 100644
--- a/include/sg_linux_inc.h
+++ b/include/sg_linux_inc.h
@@ -12,6 +12,7 @@
     #include <linux/../scsi/sg.h>
     #include <linux/../scsi/scsi.h>
   #else
+    #define __user
     #include <scsi/sg.h>
     #include <scsi/scsi.h>
   #endif
diff --git a/include/sg_pr2serr.h b/include/sg_pr2serr.h
index c317f5b..351b3e3 100644
--- a/include/sg_pr2serr.h
+++ b/include/sg_pr2serr.h
@@ -6,6 +6,8 @@
  * All rights reserved.
  * Use of this source code is governed by a BSD-style
  * license that can be found in the BSD_LICENSE file.
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 /* These are convenience functions that replace the somewhat long-winded
diff --git a/include/sg_pt.h b/include/sg_pt.h
index c882893..2be9cbf 100644
--- a/include/sg_pt.h
+++ b/include/sg_pt.h
@@ -2,10 +2,12 @@
 #define SG_PT_H
 
 /*
- * Copyright (c) 2005-2018 Douglas Gilbert.
+ * Copyright (c) 2005-2019 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.
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #include <stdint.h>
@@ -170,9 +172,12 @@ int do_scsi_pt(struct sg_pt_base * objp, int fd, int timeout_secs,
  * belongs to. */
 int get_scsi_pt_result_category(const struct sg_pt_base * objp);
 
-/* If not available return 0 which implies there is no residual
- * value. If supported the number of bytes actually sent back by
- * the device is 'dxfer_ilen - get_scsi_pt_len()' bytes.  */
+/* If not available return 0 which implies there is no residual value. If
+ * supported it is the number of bytes requested to transfer less the
+ * number actually transferred. This it typically important for data-in
+ * transfers. For data-out (only) transfers, the 'dout_req_len -
+ * dout_act_len' is returned. For bidi transfer the data-in residual is
+ * returned. */
 int get_scsi_pt_resid(const struct sg_pt_base * objp);
 
 /* Returns SCSI status value (from device that received the command). If an
@@ -188,6 +193,7 @@ uint32_t get_pt_result(const struct sg_pt_base * objp);
 /* Actual sense length returned. If sense data is present but
    actual sense length is not known, return 'max_sense_len' */
 int get_scsi_pt_sense_len(const struct sg_pt_base * objp);
+uint8_t * get_scsi_pt_sense_buf(const struct sg_pt_base * objp);
 
 /* If not available return 0 (for success). */
 int get_scsi_pt_os_err(const struct sg_pt_base * objp);
@@ -205,6 +211,19 @@ char * get_scsi_pt_transport_err_str(const struct sg_pt_base * objp,
  * command. */
 int get_scsi_pt_duration_ms(const struct sg_pt_base * objp);
 
+/* If not available return 0 otherwise return number of nanoseconds that the
+ * lower layers (and hardware) took to execute the command just completed. */
+uint64_t get_pt_duration_ns(const struct sg_pt_base * objp);
+
+/* The two functions yield requested and actual data transfer lengths in
+ * bytes. The second argument is a pointer to the data-in length; the third
+ * argument is a pointer to the data-out length. The pointers may be NULL.
+ * The _actual_ values are related to resid (residual count from DMA) */
+void get_pt_req_lengths(const struct sg_pt_base * objp, int * req_dinp,
+                        int * req_doutp);
+void get_pt_actual_lengths(const struct sg_pt_base * objp, int * act_dinp,
+                           int * act_doutp);
+
 /* Return true if device associated with 'objp' uses NVMe command set. To
  * be useful (in modifying the type of command sent (SCSI or NVMe) then
  * construct_scsi_pt_obj_with_fd() should be used followed by an invocation
diff --git a/include/sg_pt_linux.h b/include/sg_pt_linux.h
index 00010ba..eb451e8 100644
--- a/include/sg_pt_linux.h
+++ b/include/sg_pt_linux.h
@@ -6,6 +6,8 @@
  * All rights reserved.
  * Use of this source code is governed by a BSD-style
  * license that can be found in the BSD_LICENSE file.
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #include <stdint.h>
@@ -40,6 +42,25 @@ extern "C" {
 #define BSG_FLAG_Q_AT_TAIL 0x10 /* default is Q_AT_HEAD */
 #define BSG_FLAG_Q_AT_HEAD 0x20
 
+#ifndef SGV4_FLAG_YIELD_TAG
+#define SGV4_FLAG_YIELD_TAG 0x8
+#endif
+#ifndef SGV4_FLAG_FIND_BY_TAG
+#define SGV4_FLAG_FIND_BY_TAG 0x100
+#endif
+#ifndef SGV4_FLAG_IMMED
+#define SGV4_FLAG_IMMED 0x400
+#endif
+#ifndef SGV4_FLAG_IMMED
+#define SGV4_FLAG_IMMED 0x400
+#endif
+#ifndef SGV4_FLAG_DEV_SCOPE
+#define SGV4_FLAG_DEV_SCOPE 0x1000
+#endif
+#ifndef SGV4_FLAG_SHARE
+#define SGV4_FLAG_SHARE 0x2000
+#endif
+
 struct sg_io_v4 {
         __s32 guard;            /* [i] 'Q' to differentiate from v3 */
         __u32 protocol;         /* [i] 0 -> SCSI , .... */
@@ -48,10 +69,10 @@ struct sg_io_v4 {
 
         __u32 request_len;      /* [i] in bytes */
         __u64 request;          /* [i], [*i] {SCSI: cdb} */
-        __u64 request_tag;      /* [i] {SCSI: task tag (only if flagged)} */
+        __u64 request_tag;      /* [i] {in sg 4.0+ this is out parameter} */
         __u32 request_attr;     /* [i] {SCSI: task attribute} */
         __u32 request_priority; /* [i] {SCSI: task priority} */
-        __u32 request_extra;    /* [i] {spare, for padding} */
+        __u32 request_extra;    /* [i] {used for pack_id} */
         __u32 max_response_len; /* [i] in bytes */
         __u64 response;         /* [i], [*o] {SCSI: (auto)sense data} */
 
@@ -104,6 +125,7 @@ struct sg_pt_linux_scsi {
     int dev_fd;                 /* -1 if not given (yet) */
     int in_err;
     int os_err;
+    int sg_version;     /* for deciding whether to use v3 or v4 interface */
     uint32_t nvme_nsid;         /* 1 to 0xfffffffe are possibly valid, 0
                                  * implies dev_fd is not a NVMe device
                                  * (is_nvme=false) or it is a NVMe char
@@ -157,6 +179,7 @@ extern long sg_lin_page_size;
 
 void sg_find_bsg_nvme_char_major(int verbose);
 int sg_do_nvme_pt(struct sg_pt_base * vp, int fd, int time_secs, int vb);
+int sg_linux_get_sg_version(const struct sg_pt_base * vp);
 
 /* This trims given NVMe block device name in Linux (e.g. /dev/nvme0n1p5)
  * to the name of its associated char device (e.g. /dev/nvme0). If this
@@ -165,7 +188,6 @@ int sg_do_nvme_pt(struct sg_pt_base * vp, int fd, int time_secs, int vb);
 bool sg_get_nvme_char_devname(const char * nvme_block_devname, uint32_t b_len,
                               char * b);
 
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/include/sg_pt_nvme.h b/include/sg_pt_nvme.h
index a910b05..590b4de 100644
--- a/include/sg_pt_nvme.h
+++ b/include/sg_pt_nvme.h
@@ -2,10 +2,12 @@
 #define SG_PT_NVME_H
 
 /*
- * Copyright (c) 2017-2018 Douglas Gilbert.
+ * Copyright (c) 2017-2019 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.
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #include <stdint.h>
@@ -27,9 +29,9 @@ extern "C" {
  * are exceptions, for example the EUI-64 identifiers in the Admin Identify
  * response are big endian.
  *
- * Code online (e.g. nvme-cli at github.com) seems to like packed strcutures,
- * the author prefers byte offset plus a range of unaligned integer builders
- * such as those in sg_unaligned.h .
+ * Code online (e.g. nvme-cli at github.com) seems to favour packed
+ * structures, while the author prefers byte offset plus a range of unaligned
+ * integer builders such as those in sg_unaligned.h .
  */
 
 #ifdef __GNUC__
@@ -181,8 +183,6 @@ struct sg_opcode_info_t {
 /* Vendor specific (sg3_utils) VPD pages */
 #define SG_NVME_VPD_NICR 0xde   /* NVME Identify controller response */
 
-extern struct sg_opcode_info_t sg_opcode_info_arr[];
-
 
 /* Given the NVMe Identify Controller response and optionally the NVMe
  * Identify Namespace response (NULL otherwise), generate the SCSI VPD
@@ -211,6 +211,10 @@ int sntl_resp_mode_select10(struct sg_sntl_dev_state_t * dsp,
                             const uint8_t * cdbp, const uint8_t * dop,
                             int do_len, struct sg_sntl_result_t * resp);
 
+/* Returns pointer to array of struct sg_opcode_info_t of SCSI commands
+ * translated to NVMe. */
+const struct sg_opcode_info_t * sg_get_opcode_translation(void);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/include/sg_unaligned.h b/include/sg_unaligned.h
index ca702e8..0a65b39 100644
--- a/include/sg_unaligned.h
+++ b/include/sg_unaligned.h
@@ -6,6 +6,8 @@
  * All rights reserved.
  * Use of this source code is governed by a BSD-style
  * license that can be found in the BSD_LICENSE file.
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #include <stdbool.h>
diff --git a/inhex/README b/inhex/README
new file mode 100644
index 0000000..d765466
--- /dev/null
+++ b/inhex/README
@@ -0,0 +1,50 @@
+        Hex data for various sg3_utils utilities
+        ========================================
+
+The files in this folder contain hexadecimal data (in ASCII) and associated
+comments (prefixed with the hash mark symbol ('#')).
+
+The utility that each hex file is associated with can be determined by
+prepending "sg_" to these filenames then going to the 'src' folder (a
+sibling folder to this one) and look for a match or partial match on
+the name.
+
+For example:
+    vpd_dev_id.hex
+after prepending 'sg_' becomes:
+    sg_vpd_dev_id.hex
+which is a partial match on the sg_vpd utility.
+The remaining 'dev_id.hex' is meant to suggest the 'device identifier'
+VPD page which is a mandatory VPD page.
+
+Assuming sg3_utils is installed, it can be tested like this:
+    sg_vpd --inhex=<folder_holding_sg3_utils>/inhex/vpd_dev_id.hex
+
+And should output this:
+
+Device Identification VPD page:
+  Addressed logical unit:
+    designator type: NAA,  code set: Binary
+      0x5000c5003011cb2b
+  Target port:
+    designator type: NAA,  code set: Binary
+     transport: Serial Attached SCSI Protocol (SPL-4)
+      0x5000c5003011cb29
+    designator type: Relative target port,  code set: Binary
+     transport: Serial Attached SCSI Protocol (SPL-4)
+      Relative target port: 0x1
+  Target device that contains addressed lu:
+    designator type: NAA,  code set: Binary
+     transport: Serial Attached SCSI Protocol (SPL-4)
+      0x5000c5003011cb28
+    designator type: SCSI name string,  code set: UTF-8
+      SCSI name string:
+      naa.5000C5003011CB28
+
+
+Users are encouraged to send the author any ASCII hex files for utilities
+that support --inhex and don't have hex data already. Special cases are
+also welcome. They help the author test this code.
+
+Douglas Gilbert
+28th August 2019
diff --git a/inhex/get_elem_status.hex b/inhex/get_elem_status.hex
new file mode 100644
index 0000000..7db83c8
--- /dev/null
+++ b/inhex/get_elem_status.hex
@@ -0,0 +1,35 @@
+# To test sg_get_elem_status with dummy response to the SCSI
+# GET PHYSICAL ELEMENT SATUS command
+
+0 0 0 4
+0 0 0 2
+0 0 0 2
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0  0 0 0 0
+
+# first descriptor
+0 0 0 0
+0 0 0 1
+
+0 0 0 0  0
+0
+1
+2c
+0 0 0 0  11 22 33 0
+
+0 0 0 0  0 0 0 0
+
+# second descriptor
+0 0 0 0
+0 0 0 2
+
+0 0 0 0  0
+1
+1
+fe
+ff ff ff ff  ff ff ff ff
+
+0 0 0 0  0 0 0 0
+
+