sg_inq+sg_vpd: merge VPD page processing

This is being done so that ongoing JSON work is
not duplicated for both sg_vpd and sg_inq. This
might lead to small changes in formatting of VPD
(and standard INQUIRY) output. That in turn might
break parsing code expecting the former output.
Hopefully this will push folks who are parsing to
try out JSON output. However JSON output format
may not be that stable, hoping for feedback on
that front.



git-svn-id: https://svn.bingwo.ca/repos/sg3_utils/trunk@959 6180dd3e-e324-4e3e-922d-17de1ae2f315

56 files changed, 134 insertions, 84 deletions

diff --git a/doc/scsi_mandat.8 b/doc/scsi_mandat.8
index 76068617..95a708c6 100644
--- a/doc/scsi_mandat.8
+++ b/doc/scsi_mandat.8
@@ -38,7 +38,7 @@ Written by D. Gilbert
 .SH COPYRIGHT
 Copyright \(co 2011\-2013 Douglas Gilbert
 .br
-This software is distributed under a FreeBSD license. There is NO
+This software is distributed under a BSD\-2\-Clause license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .SH "SEE ALSO"
 .B sg_inq,sg_luns,sg_turs,sg_requests,sg_vpd,sg_senddiag (sg3_utils)
diff --git a/doc/scsi_readcap.8 b/doc/scsi_readcap.8
index 40532b01..d898ce9c 100644
--- a/doc/scsi_readcap.8
+++ b/doc/scsi_readcap.8
@@ -45,7 +45,7 @@ Written by D. Gilbert
 .SH COPYRIGHT
 Copyright \(co 2009\-2013 Douglas Gilbert
 .br
-This software is distributed under a FreeBSD license. There is NO
+This software is distributed under a BSD\-2\-Clause license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .SH "SEE ALSO"
 .B sg_readcap (sg3_utils)
diff --git a/doc/scsi_ready.8 b/doc/scsi_ready.8
index 50a6ed74..e0548e06 100644
--- a/doc/scsi_ready.8
+++ b/doc/scsi_ready.8
@@ -34,7 +34,7 @@ Written by D. Gilbert
 .SH COPYRIGHT
 Copyright \(co 2009\-2013 Douglas Gilbert
 .br
-This software is distributed under a FreeBSD license. There is NO
+This software is distributed under a BSD\-2\-Clause license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .SH "SEE ALSO"
 .B sg_turs (sg3_utils)
diff --git a/doc/scsi_satl.8 b/doc/scsi_satl.8
index da6c43a3..bddee9fc 100644
--- a/doc/scsi_satl.8
+++ b/doc/scsi_satl.8
@@ -37,7 +37,7 @@ Written by D. Gilbert
 .SH COPYRIGHT
 Copyright \(co 2011\-2013 Douglas Gilbert
 .br
-This software is distributed under a FreeBSD license. There is NO
+This software is distributed under a BSD\-2\-Clause license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .SH "SEE ALSO"
 .B sg_inq, sg_luns, sg_turs, sg_requests, sg_vpd, sg_senddiag, sg_modes,
diff --git a/doc/scsi_start.8 b/doc/scsi_start.8
index f98985b2..72682321 100644
--- a/doc/scsi_start.8
+++ b/doc/scsi_start.8
@@ -34,7 +34,7 @@ Written by D. Gilbert
 .SH COPYRIGHT
 Copyright \(co 2009\-2013 Douglas Gilbert
 .br
-This software is distributed under a FreeBSD license. There is NO
+This software is distributed under a BSD\-2\-Clause license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .SH "SEE ALSO"
 .B sg_start (sg3_utils)
diff --git a/doc/scsi_stop.8 b/doc/scsi_stop.8
index 488c7cf7..79b7b2fd 100644
--- a/doc/scsi_stop.8
+++ b/doc/scsi_stop.8
@@ -35,7 +35,7 @@ Written by D. Gilbert
 .SH COPYRIGHT
 Copyright \(co 2009\-2013 Douglas Gilbert
 .br
-This software is distributed under a FreeBSD license. There is NO
+This software is distributed under a BSD\-2\-Clause license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .SH "SEE ALSO"
 .B sg_start (sg3_utils)
diff --git a/doc/scsi_temperature.8 b/doc/scsi_temperature.8
index e9ff181c..e3ce56b6 100644
--- a/doc/scsi_temperature.8
+++ b/doc/scsi_temperature.8
@@ -29,7 +29,7 @@ Written by D. Gilbert
 .SH COPYRIGHT
 Copyright \(co 2011\-2013 Douglas Gilbert
 .br
-This software is distributed under a FreeBSD license. There is NO
+This software is distributed under a BSD\-2\-Clause license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .SH "SEE ALSO"
 .B sg_logs (sg3_utils)
diff --git a/doc/sg3_utils.8 b/doc/sg3_utils.8
index c210ccae..92fd1d33 100644
--- a/doc/sg3_utils.8
+++ b/doc/sg3_utils.8
@@ -853,12 +853,12 @@ Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
 Copyright \(co 1999\-2022 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
+Some utilities are distributed under a GPL version 2 license while others,
+usually more recent ones, are under a BSD\-2\-Clause license. The files
 that are common to almost all utilities and thus contain the most reusable
 code, namely sg_lib.[hc], sg_cmds_basic.[hc] and sg_cmds_extra.[hc] are
-under a FreeBSD license. There is NO warranty; not even for MERCHANTABILITY
-or FITNESS FOR A PARTICULAR PURPOSE.
+under a BSD\-2\-Clause license. There is NO warranty; not even for
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .SH "SEE ALSO"
 .B sg3_utils_json,sg_decode_sense(sg3_utils), sdparm(sdparm), ddpt(ddpt),
 .B lsscsi(lsscsi), dmesg(1), mt(1)
diff --git a/doc/sg3_utils_json.8 b/doc/sg3_utils_json.8
index 454dfa7a..0d437470 100644
--- a/doc/sg3_utils_json.8
+++ b/doc/sg3_utils_json.8
@@ -97,23 +97,6 @@ defined to make the short option form look better (e.g. '\-j=av').
 negation character. Toggles the (boolean) sense of the following control
 character.
 .TP
-\fBa\fR
-this is a boolean control character for "abbreviated name expansion". T10
-names fields often depending on the amount of space available in the
-CDB (command descriptor block) table in the relevant specification. This
-leads to some clear names (e.g. "number of blocks) and some not so clear
-names (e.g. "SKSV"). When this character is on (true), then fields that have
-abbreviated names (subjective decision by author) will use the T10 field
-name with a sub\-object containing at least a "i" field with the integer
-value and a "abbreviated_name_expansion" field with a string value that
-should make the T10 name clearer (e.g. "Sense Key Specific Valid").
-.br
-The "abbreviated name expansion" control character is also used to flag
-fields that are obsolete, usually noting the standard or revision of a
-draft standard when they became obsolete.
-.br
-This boolean control character is default off (false).
-.TP
 \fBe\fR
 this is a boolean control character for "exit status". If active an "exit
 status" field is placed at the end of the JSON output. The integer value
@@ -162,12 +145,24 @@ of 'normal' output.
 .br
 This boolean control character is default on (true).
 .TP
+\fBn\fR
+this is a boolean control character for "name_extra". It is used to provide
+additional information about the name it is a sub\-object of. The most
+common usage is to spell out an abbreviated name (e.g. a T10 name like "SKSV"
+to "Sense Key Specific Valid"). Another use is to note that a T10 field is
+obsolete and in which T10 standard it first became obsolete. Also if the
+named field's value is a physical quantity where the unit is unclear (e.g. a
+timeout) then "name_extra" can state that (e.g. "unit: millisecond").
+Only some fields have associated "name_extra" data.
+.br
+This boolean control character is default off (false).
+.TP
 \fBo\fR
 this is a boolean control character to control whether normal (i.e.
 non\-JSON) lines of output are placed in a JSON array (one element per
 line of normal output) within the utility_invoked subject (see control
-character \fIl\fR). This control character is only active when the
-\fIl\fR control character is also active).
+character \fIl\fR). This control character is active even if the
+\fIl\fR control character is negated).
 .br
 This boolean control character is default off (false).
 .TP
@@ -208,6 +203,63 @@ Note that this verbose control character is JSON specific while the
 most utilities support is more general.
 .br
 This integer control character is set to 0 by default.
+.SH OUTPUT PROCESSING
+The default remains the same for all utilities that support the
+\fI\-\-json\fR option, namely the decoded information is sent to stdout in
+human readable form. Errors are reported to stderr and may cause the early
+termination of a utility (e.g. command line option syntax error).
+.PP
+When the \fI\-\-json\fR option is given and no errors are detected, then
+only JSON is sent to stdout. If the 'o' control character is in the \fIJO\fR
+argument to the \fI\-\-json\fR option, then the former "human readable" 
+output is placed in a JSON array named "output" within a JSON object
+named "utility_invoked". Each line of the former "human readable" output
+is placed in its own element of the JSON array named "output".
+.PP
+A JSON tree is built in memory as the utility parses the data returned
+from the SCSI device (e.g. sg_vpd parsing a VPD page returned from a
+SCSI INQUIRY command). SCSI "list"s become JSON named arrays (e.g. in
+the Device Identification VPD page there is a "Designation descriptor
+list" that becomes a JSON array named "designation_descriptor_list").
+.PP
+At the completion of the utility that JSON tree is "measured" taking
+into account the form of output (i.e. pretty-printed, single line or
+packed single line). For the pretty-printed JSON output, the size of
+each indentation in spaces is also given (i.e. the tab width). The JSON
+is then output to a single C string, then sent to stdout. If a NULL
+character (ASCII zero and C string terminator) somehow finds its way
+into a field that should (according to the spec) be space padded, then
+the JSON output may appear truncated.
+.PP
+Note that this JSON processing means that if a utility is aborted for
+whatever reason then no JSON output will appear. With the normal,
+human readable output processing, some output may appear before
+the utility aborts in such bad situations.
+.SH ERRORS
+No attempts has been made to translate errors into JSON form, apart
+from the final "exit_status" JSON object where a value of 0
+means "no errors". Exit status values indicating a problem range
+from 1 to 255.
+.PP
+The sg_decode_sense utility will parse SCSI sense data into JSON
+form if requested. So if another utility is failing with a sense
+data report (most often seen when the \fI\-\-verbose\fR option is
+used). That sense data (in hex bytes) could be cut\-and\-paste
+onto the command line following 'sg_decode_sense \-j ' which should
+then render that sense data in JSON.
+.PP
+Otherwise, when a error is detected while JSON output is selected,
+the error message is sent to stderr in human readable form. Typically
+once an error is detected the utility will exit, first dumping
+the JSON in\-memory tree as discussed above and a non\-zero exit
+status will be set. The JSON output will be well formed but missing
+any fields or list elements following the point that the error
+was detected.
+.PP
+The summary is that when JSON output is selected and an error occurs
+each utility will process the error the same way as it would if JSON
+output had not been selected. In all cases error messages, in human
+readable form, are sent to stderr.
 .SH AUTHORS
 Written by Douglas Gilbert. Some utilities have been contributed, see the
 CREDITS file and individual source files (in the 'src' directory).
@@ -216,11 +268,8 @@ Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
 Copyright \(co 2022 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
-that are common to almost all utilities and thus contain the most reusable
-code, namely sg_lib.[hc], sg_cmds_basic.[hc] and sg_cmds_extra.[hc] are
-under a FreeBSD license. There is NO warranty; not even for MERCHANTABILITY
-or FITNESS FOR A PARTICULAR PURPOSE.
+This software is distributed under the GPL version 2 or the BSD\-2\-Clause
+license. There is NO warranty; not even for MERCHANTABILITY or 
+FITNESS FOR A PARTICULAR PURPOSE.
 .SH "SEE ALSO"
 .B sg3_utils(sg3_utils), smartctl(smartmontools)
diff --git a/doc/sg_bg_ctl.8 b/doc/sg_bg_ctl.8
index 0aca9efa..98d56b44 100644
--- a/doc/sg_bg_ctl.8
+++ b/doc/sg_bg_ctl.8
@@ -66,7 +66,7 @@ Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
 Copyright \(co 2016 Douglas Gilbert
 .br
-This software is distributed under a FreeBSD license. There is NO
+This software is distributed under a BSD\-2\-Clause license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .SH "SEE ALSO"
 .B sg_vpd,sg_logs(sg3_utils); sdparm(sdparm)
diff --git a/doc/sg_copy_results.8 b/doc/sg_copy_results.8
index 9e67e522..2e2203bf 100644
--- a/doc/sg_copy_results.8
+++ b/doc/sg_copy_results.8
@@ -120,7 +120,7 @@ Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
 Copyright \(co 2012\-2014 Hannes Reinecke and Douglas Gilbert
 .br
-This software is distributed under a FreeBSD license. There is NO
+This software is distributed under a BSD\-2\-Clause license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .SH "SEE ALSO"
 .B sg_xcopy(sg3_utils), ddpt,ddptctl(ddpt)
diff --git a/doc/sg_decode_sense.8 b/doc/sg_decode_sense.8
index 5680a075..2deaf0cd 100644
--- a/doc/sg_decode_sense.8
+++ b/doc/sg_decode_sense.8
@@ -178,7 +178,7 @@ Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
 Copyright \(co 2010\-2021 Douglas Gilbert
 .br
-This software is distributed under a FreeBSD license. There is NO
+This software is distributed under a BSD\-2\-Clause license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .SH "SEE ALSO"
 .B sg_requests,sg_raw(sg3_utils)
diff --git a/doc/sg_get_config.8 b/doc/sg_get_config.8
index 4c4ea0c1..3716ed60 100644
--- a/doc/sg_get_config.8
+++ b/doc/sg_get_config.8
@@ -135,7 +135,7 @@ Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
 Copyright \(co 2004\-2012 Douglas Gilbert
 .br
-This software is distributed under a FreeBSD license. There is NO
+This software is distributed under a BSD\-2\-Clause license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .SH "SEE ALSO"
 .B sginfo(8), sg_modes(8), sg_inq(8), sg_prevent(8),
diff --git a/doc/sg_get_elem_status.8 b/doc/sg_get_elem_status.8
index b9d7da11..8baad4fc 100644
--- a/doc/sg_get_elem_status.8
+++ b/doc/sg_get_elem_status.8
@@ -131,7 +131,7 @@ Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
 Copyright \(co 2019\-2022 Douglas Gilbert
 .br
-This software is distributed under a FreeBSD license. There is NO
+This software is distributed under a BSD\-2\-Clause license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .SH "SEE ALSO"
 .B sg_get_lba_status,sg3_utils,sg3_utils_json(sg3_utils)
diff --git a/doc/sg_get_lba_status.8 b/doc/sg_get_lba_status.8
index 42288c4c..3f887aa3 100644
--- a/doc/sg_get_lba_status.8
+++ b/doc/sg_get_lba_status.8
@@ -155,7 +155,7 @@ Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
 Copyright \(co 2009\-2022 Douglas Gilbert
 .br
-This software is distributed under a FreeBSD license. There is NO
+This software is distributed under a BSD\-2\-Clause license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .SH "SEE ALSO"
 .B sg_write_same,sg_unmap,sg3_utils,sg3_utils_json(sg3_utils)
diff --git a/doc/sg_ident.8 b/doc/sg_ident.8
index 76e0b31e..d36a176c 100644
--- a/doc/sg_ident.8
+++ b/doc/sg_ident.8
@@ -113,7 +113,7 @@ Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
 Copyright \(co 2005\-2018 Douglas Gilbert
 .br
-This software is distributed under a FreeBSD license. There is NO
+This software is distributed under a BSD\-2\-Clause license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .SH "SEE ALSO"
 .B sg_vpd(sg3_utils), sg_rmsn(sg3_utils), sg_get_config(sg3_utils)
diff --git a/doc/sg_inq.8 b/doc/sg_inq.8
index 1e38f6a9..9ae5c550 100644
--- a/doc/sg_inq.8
+++ b/doc/sg_inq.8
@@ -528,8 +528,9 @@ Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
 Copyright \(co 2001\-2022 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.
+This software is distributed under the GPL version 2 or the BSD\-2\-Clause
+license. There is NO warranty; not even for MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.
 .SH "SEE ALSO"
 .B sg_opcodes(8), sg_vpd(8), sg_logs(8), sg_modes(8), sdparm(8), hdparm(8),
 .B sgdiag(scsirastools)
diff --git a/doc/sg_luns.8 b/doc/sg_luns.8
index 82927726..3ededa9f 100644
--- a/doc/sg_luns.8
+++ b/doc/sg_luns.8
@@ -313,7 +313,7 @@ Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
 Copyright \(co 2004\-2020 Douglas Gilbert
 .br
-This software is distributed under a FreeBSD license. There is NO
+This software is distributed under a BSD\-2\-Clause license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .SH "SEE ALSO"
 .B sg_inq(8)
diff --git a/doc/sg_map26.8 b/doc/sg_map26.8
index cb826e2b..7ad013bf 100644
--- a/doc/sg_map26.8
+++ b/doc/sg_map26.8
@@ -155,7 +155,7 @@ Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
 Copyright \(co 2005\-2012 Douglas Gilbert
 .br
-This software is distributed under a FreeBSD license. There is NO
+This software is distributed under a BSD\-2\-Clause license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .SH "SEE ALSO"
 .B udev(7), lsscsi(lsscsi)
diff --git a/doc/sg_prevent.8 b/doc/sg_prevent.8
index 3548ffba..d0cfb12c 100644
--- a/doc/sg_prevent.8
+++ b/doc/sg_prevent.8
@@ -53,7 +53,7 @@ Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
 Copyright \(co 2004\-2012 Douglas Gilbert
 .br
-This software is distributed under a FreeBSD license. There is NO
+This software is distributed under a BSD\-2\-Clause license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .SH "SEE ALSO"
 .B sg_start(sg3_utils), sg_persist(sg3_utils)
diff --git a/doc/sg_read_attr.8 b/doc/sg_read_attr.8
index 85b459eb..8ab59b97 100644
--- a/doc/sg_read_attr.8
+++ b/doc/sg_read_attr.8
@@ -208,7 +208,7 @@ Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
 Copyright \(co 2016\-2020 Douglas Gilbert
 .br
-This software is distributed under a FreeBSD license. There is NO
+This software is distributed under a BSD\-2\-Clause license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .SH "SEE ALSO"
 .B sg_vpd,sg_logs(sg3_utils)
diff --git a/doc/sg_read_block_limits.8 b/doc/sg_read_block_limits.8
index 1347acfb..5bdeb03a 100644
--- a/doc/sg_read_block_limits.8
+++ b/doc/sg_read_block_limits.8
@@ -54,7 +54,7 @@ Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
 Copyright \(co 2009\-2017 Douglas Gilbert
 .br
-This software is distributed under a FreeBSD license. There is NO
+This software is distributed under a BSD\-2\-Clause license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .SH "SEE ALSO"
 .B sg3_utils(sg3_utils)
diff --git a/doc/sg_read_buffer.8 b/doc/sg_read_buffer.8
index 09e39414..0acc9167 100644
--- a/doc/sg_read_buffer.8
+++ b/doc/sg_read_buffer.8
@@ -169,7 +169,7 @@ Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
 Copyright \(co 2006\-2019 Luben Tuikov and Douglas Gilbert
 .br
-This software is distributed under a FreeBSD license. There is NO
+This software is distributed under a BSD\-2\-Clause license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .SH "SEE ALSO"
 .B sg_write_buffer(sg3_utils)
diff --git a/doc/sg_reassign.8 b/doc/sg_reassign.8
index 3ad0f8a0..bbbea8cd 100644
--- a/doc/sg_reassign.8
+++ b/doc/sg_reassign.8
@@ -144,7 +144,7 @@ Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
 Copyright \(co 2005\-2019 Douglas Gilbert
 .br
-This software is distributed under a FreeBSD license. There is NO
+This software is distributed under a BSD\-2\-Clause license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .SH "SEE ALSO"
 .B sg_format,sginfo,sg_senddiag(all in sg3_utils), sdparm(sdparm),
diff --git a/doc/sg_referrals.8 b/doc/sg_referrals.8
index f1371794..60111063 100644
--- a/doc/sg_referrals.8
+++ b/doc/sg_referrals.8
@@ -65,7 +65,7 @@ Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
 Copyright \(co 2009\-2014 Douglas Gilbert and Hannes Reinecke
 .br
-This software is distributed under a FreeBSD license. There is NO
+This software is distributed under a BSD\-2\-Clause license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .SH "SEE ALSO"
 .B sg_vpd(8)
diff --git a/doc/sg_rem_rest_elem.8 b/doc/sg_rem_rest_elem.8
index 6300eef7..81c8aa2e 100644
--- a/doc/sg_rem_rest_elem.8
+++ b/doc/sg_rem_rest_elem.8
@@ -88,7 +88,7 @@ Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
 Copyright \(co 2022 Douglas Gilbert
 .br
-This software is distributed under a FreeBSD license. There is NO
+This software is distributed under a BSD\-2\-Clause license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .SH "SEE ALSO"
 .B sg_get_elem_status,sg_zone(sg3_utils)
diff --git a/doc/sg_rep_density.8 b/doc/sg_rep_density.8
index 6734796a..f0633c4b 100644
--- a/doc/sg_rep_density.8
+++ b/doc/sg_rep_density.8
@@ -91,7 +91,7 @@ Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
 Copyright \(co 2022 Douglas Gilbert
 .br
-This software is distributed under a FreeBSD license. There is NO
+This software is distributed under a BSD\-2\-Clause license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .SH "SEE ALSO"
 .B sg3_utils(sg3_utils)
diff --git a/doc/sg_rep_pip.8 b/doc/sg_rep_pip.8
index fb615ee7..c614fd3f 100644
--- a/doc/sg_rep_pip.8
+++ b/doc/sg_rep_pip.8
@@ -52,7 +52,7 @@ Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
 Copyright \(co 2020\-2022 Douglas Gilbert
 .br
-This software is distributed under a FreeBSD license. There is NO
+This software is distributed under a BSD\-2\-Clause license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .SH "SEE ALSO"
 .B sg3_utils(sg3_utils)
diff --git a/doc/sg_rep_zones.8 b/doc/sg_rep_zones.8
index 71d101bc..8ab9feb5 100644
--- a/doc/sg_rep_zones.8
+++ b/doc/sg_rep_zones.8
@@ -207,7 +207,7 @@ Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
 Copyright \(co 2014\-2022 Douglas Gilbert
 .br
-This software is distributed under a FreeBSD license. There is NO
+This software is distributed under a BSD\-2\-Clause license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .SH "SEE ALSO"
 .B sg_reset_wp,sg_zone,sg3_utils_json(sg3_utils),
diff --git a/doc/sg_requests.8 b/doc/sg_requests.8
index f6a012c5..e1c1605d 100644
--- a/doc/sg_requests.8
+++ b/doc/sg_requests.8
@@ -132,7 +132,7 @@ Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
 Copyright \(co 2004\-2021 Douglas Gilbert
 .br
-This software is distributed under a FreeBSD license. There is NO
+This software is distributed under a BSD\-2\-Clause license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .SH "SEE ALSO"
 .B sg_turs (sg3_utils)
diff --git a/doc/sg_reset_wp.8 b/doc/sg_reset_wp.8
index ecc4ee6b..47d4453c 100644
--- a/doc/sg_reset_wp.8
+++ b/doc/sg_reset_wp.8
@@ -59,7 +59,7 @@ Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
 Copyright \(co 2014\-2022 Douglas Gilbert
 .br
-This software is distributed under a FreeBSD license. There is NO
+This software is distributed under a BSD\-2\-Clause license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .SH "SEE ALSO"
 .B sg_rep_zones,sg_zone(sg3_utils)
diff --git a/doc/sg_rmsn.8 b/doc/sg_rmsn.8
index 294c85ae..7fc279ed 100644
--- a/doc/sg_rmsn.8
+++ b/doc/sg_rmsn.8
@@ -58,7 +58,7 @@ Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
 Copyright \(co 2005\-2012 Douglas Gilbert
 .br
-This software is distributed under a FreeBSD license. There is NO
+This software is distributed under a BSD\-2\-Clause license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .SH "SEE ALSO"
 .B sg_vpd(sg3_utils), sg_get_config(sg3_utils)
diff --git a/doc/sg_rtpg.8 b/doc/sg_rtpg.8
index c4b8d5b1..d2ce33c3 100644
--- a/doc/sg_rtpg.8
+++ b/doc/sg_rtpg.8
@@ -58,7 +58,7 @@ Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
 Copyright \(co 2004\-2014 Christophe Varoqui and Douglas Gilbert
 .br
-This software is distributed under a FreeBSD license. There is NO
+This software is distributed under a BSD\-2\-Clause license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .SH "SEE ALSO"
 .B sg_inq(sg3_utils)
diff --git a/doc/sg_safte.8 b/doc/sg_safte.8
index 863a3426..c46a5b1a 100644
--- a/doc/sg_safte.8
+++ b/doc/sg_safte.8
@@ -126,7 +126,7 @@ Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
 Copyright \(co 2004\-2016 Hannes Reinecke and Douglas Gilbert
 .br
-This software is distributed under a FreeBSD license. There is NO
+This software is distributed under a BSD\-2\-Clause license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .SH "SEE ALSO"
 .B sg_inq, sg_ses (in sg3_utils package); safte\-monitor (internet)
diff --git a/doc/sg_sanitize.8 b/doc/sg_sanitize.8
index db8b74ca..bb7bdc4d 100644
--- a/doc/sg_sanitize.8
+++ b/doc/sg_sanitize.8
@@ -261,7 +261,7 @@ Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
 Copyright \(co 2011\-2020 Douglas Gilbert
 .br
-This software is distributed under a FreeBSD license. There is NO
+This software is distributed under a BSD\-2\-Clause license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .SH "SEE ALSO"
 .B sg_requests(8), sg_format(8)
diff --git a/doc/sg_sat_identify.8 b/doc/sg_sat_identify.8
index e811614a..595321c9 100644
--- a/doc/sg_sat_identify.8
+++ b/doc/sg_sat_identify.8
@@ -161,7 +161,7 @@ Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
 Copyright \(co 2006\-2020 Douglas Gilbert
 .br
-This software is distributed under a FreeBSD license. There is NO
+This software is distributed under a BSD\-2\-Clause license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .SH "SEE ALSO"
 .B sg_vpd(sg3_utils), sg_inq(sg3_utils), sdparm(sdparm), hdparm(hdparm)
diff --git a/doc/sg_sat_phy_event.8 b/doc/sg_sat_phy_event.8
index 8a2f14ae..8b842a3f 100644
--- a/doc/sg_sat_phy_event.8
+++ b/doc/sg_sat_phy_event.8
@@ -102,7 +102,7 @@ Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
 Copyright \(co 2006\-2020 Douglas Gilbert
 .br
-This software is distributed under a FreeBSD license. There is NO
+This software is distributed under a BSD\-2\-Clause license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .SH "SEE ALSO"
 .B sg_sat_identify,sg_sat_read_gplog(sg3_utils),
diff --git a/doc/sg_sat_read_gplog.8 b/doc/sg_sat_read_gplog.8
index cb8f646f..552ad147 100644
--- a/doc/sg_sat_read_gplog.8
+++ b/doc/sg_sat_read_gplog.8
@@ -107,7 +107,7 @@ Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
 Copyright \(co 2014\-2015 Hannes Reinecke, SUSE Linux GmbH
 .br
-This software is distributed under a FreeBSD license. There is NO
+This software is distributed under a BSD\-2\-Clause license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .SH "SEE ALSO"
 .B sg_sat_identify(sg3_utils), sg_inq(sg3_utils), sdparm(sdparm),
diff --git a/doc/sg_sat_set_features.8 b/doc/sg_sat_set_features.8
index d732c3de..304968fa 100644
--- a/doc/sg_sat_set_features.8
+++ b/doc/sg_sat_set_features.8
@@ -105,7 +105,7 @@ Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
 Copyright \(co 2007\-2014 Douglas Gilbert
 .br
-This software is distributed under a FreeBSD license. There is NO
+This software is distributed under a BSD\-2\-Clause license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .SH "SEE ALSO"
 .B sg_sat_identify(sg3_utils), sg_inq(sg3_utils), sdparm(sdparm),
diff --git a/doc/sg_seek.8 b/doc/sg_seek.8
index 1b11f751..52ced593 100644
--- a/doc/sg_seek.8
+++ b/doc/sg_seek.8
@@ -140,7 +140,7 @@ Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
 Copyright \(co 2018 Douglas Gilbert
 .br
-This software is distributed under a FreeBSD license. There is NO
+This software is distributed under a BSD\-2\-Clause license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .SH "SEE ALSO"
 .B sg_vpd(sg3_utils); sdparm(sdparm)
diff --git a/doc/sg_ses.8 b/doc/sg_ses.8
index 175e2fca..79c65978 100644
--- a/doc/sg_ses.8
+++ b/doc/sg_ses.8
@@ -794,7 +794,7 @@ Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
 Copyright \(co 2004\-2021 Douglas Gilbert
 .br
-This software is distributed under a FreeBSD license. There is NO
+This software is distributed under a BSD\-2\-Clause license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .SH "SEE ALSO"
 .B sg_inq, sg_safte, sg_senddiag, sg_ses_microcode, sg3_utils (sg3_utils);
diff --git a/doc/sg_ses_microcode.8 b/doc/sg_ses_microcode.8
index 43e73ac2..70709681 100644
--- a/doc/sg_ses_microcode.8
+++ b/doc/sg_ses_microcode.8
@@ -273,7 +273,7 @@ Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
 Copyright \(co 2014\-2018 Douglas Gilbert
 .br
-This software is distributed under a FreeBSD license. There is NO
+This software is distributed under a BSD\-2\-Clause license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .SH "SEE ALSO"
 .B sg_ses, sg_write_buffer, sg_inq(sg3_utils)
diff --git a/doc/sg_stpg.8 b/doc/sg_stpg.8
index 187054a5..5594878a 100644
--- a/doc/sg_stpg.8
+++ b/doc/sg_stpg.8
@@ -116,7 +116,7 @@ Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
 Copyright \(co 2007\-2014 Hannes Reinecke, Christophe Varoqui and Douglas Gilbert
 .br
-This software is distributed under a FreeBSD license. There is NO
+This software is distributed under a BSD\-2\-Clause license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .SH "SEE ALSO"
 .B sg_inq, sg_rtpg (sg3_utils)
diff --git a/doc/sg_stream_ctl.8 b/doc/sg_stream_ctl.8
index 8451cf55..18d9641c 100644
--- a/doc/sg_stream_ctl.8
+++ b/doc/sg_stream_ctl.8
@@ -111,7 +111,7 @@ Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
 Copyright \(co 2018 Douglas Gilbert
 .br
-This software is distributed under a FreeBSD license. There is NO
+This software is distributed under a BSD\-2\-Clause license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .SH "SEE ALSO"
 .B sg_vpd,sg_write_x(sg3_utils); sdparm(sdparm)
diff --git a/doc/sg_sync.8 b/doc/sg_sync.8
index 64d3e479..77266184 100644
--- a/doc/sg_sync.8
+++ b/doc/sg_sync.8
@@ -91,7 +91,7 @@ Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
 Copyright \(co 2004\-2018 Douglas Gilbert
 .br
-This software is distributed under a FreeBSD license. There is NO
+This software is distributed under a BSD\-2\-Clause license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .SH "SEE ALSO"
 .B sg_start(sg3_utils)
diff --git a/doc/sg_timestamp.8 b/doc/sg_timestamp.8
index f5c69553..dbc1ef16 100644
--- a/doc/sg_timestamp.8
+++ b/doc/sg_timestamp.8
@@ -149,7 +149,7 @@ Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
 Copyright \(co 2015\-2018 Douglas Gilbert
 .br
-This software is distributed under a FreeBSD license. There is NO
+This software is distributed under a BSD\-2\-Clause license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .SH "SEE ALSO"
 .B sdparm(sdparm), sg_logs(sg3_utils)
diff --git a/doc/sg_unmap.8 b/doc/sg_unmap.8
index bd2e35f3..b72ecb05 100644
--- a/doc/sg_unmap.8
+++ b/doc/sg_unmap.8
@@ -160,7 +160,7 @@ Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
 Copyright \(co 2009\-2018 Douglas Gilbert
 .br
-This software is distributed under a FreeBSD license. There is NO
+This software is distributed under a BSD\-2\-Clause license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .SH "SEE ALSO"
 .B sg_format,sg_get_lba_status,sg_readcap,sg_vpd,sg_write_same(sg3_utils)
diff --git a/doc/sg_verify.8 b/doc/sg_verify.8
index 7a55e1da..dae36042 100644
--- a/doc/sg_verify.8
+++ b/doc/sg_verify.8
@@ -212,7 +212,7 @@ Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
 Copyright \(co 2004\-2019 Douglas Gilbert
 .br
-This software is distributed under a FreeBSD license. There is NO
+This software is distributed under a BSD\-2\-Clause license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .SH "SEE ALSO"
 .B sdparm(sdparm), sg_modes(sg3_utils), sg_readcap(sg3_utils),
diff --git a/doc/sg_vpd.8 b/doc/sg_vpd.8
index 53dd1808..842114ea 100644
--- a/doc/sg_vpd.8
+++ b/doc/sg_vpd.8
@@ -343,7 +343,7 @@ Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
 Copyright \(co 2006\-2022 Douglas Gilbert
 .br
-This software is distributed under a FreeBSD license. There is NO
+This software is distributed under a BSD\-2\-Clause license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .SH "SEE ALSO"
 .B sg_inq(sg3_utils), sg3_utils(sg3_utils), sdparm(sdparm), hdparm(hdparm)
diff --git a/doc/sg_wr_mode.8 b/doc/sg_wr_mode.8
index c22be588..e917c76e 100644
--- a/doc/sg_wr_mode.8
+++ b/doc/sg_wr_mode.8
@@ -219,7 +219,7 @@ Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
 Copyright \(co 2004\-2018 Douglas Gilbert
 .br
-This software is distributed under a FreeBSD license. There is NO
+This software is distributed under a BSD\-2\-Clause license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .SH "SEE ALSO"
 .B sdparm(sdparm), sg_modes(sg3_utils), sginfo(sg3_utils)
diff --git a/doc/sg_write_buffer.8 b/doc/sg_write_buffer.8
index 09332e1e..23913e37 100644
--- a/doc/sg_write_buffer.8
+++ b/doc/sg_write_buffer.8
@@ -221,7 +221,7 @@ Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
 Copyright \(co 2006\-2018 Luben Tuikov and Douglas Gilbert
 .br
-This software is distributed under a FreeBSD license. There is NO
+This software is distributed under a BSD\-2\-Clause license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .SH "SEE ALSO"
 .B sg_read_buffer, sg_ses_microcode(sg3_utils)
diff --git a/doc/sg_write_same.8 b/doc/sg_write_same.8
index 0e65dd9f..9d4c7049 100644
--- a/doc/sg_write_same.8
+++ b/doc/sg_write_same.8
@@ -348,7 +348,7 @@ Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
 Copyright \(co 2009\-2020 Douglas Gilbert
 .br
-This software is distributed under a FreeBSD license. There is NO
+This software is distributed under a BSD\-2\-Clause license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .SH "SEE ALSO"
 .B sg_format,sg_get_lba_status,sg_readcap,sg_vpd,sg_unmap,
diff --git a/doc/sg_write_verify.8 b/doc/sg_write_verify.8
index f1837f95..6a784e0a 100644
--- a/doc/sg_write_verify.8
+++ b/doc/sg_write_verify.8
@@ -184,7 +184,7 @@ Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
 Copyright \(co 2014\-2018 Douglas Gilbert
 .br
-This software is distributed under a FreeBSD license. There is NO
+This software is distributed under a BSD\-2\-Clause license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .SH "SEE ALSO"
 .B ddpt(in a package of that name), sg_compare_and_write(8), sg_dd(8),
diff --git a/doc/sg_write_x.8 b/doc/sg_write_x.8
index e907c341..90fefc63 100644
--- a/doc/sg_write_x.8
+++ b/doc/sg_write_x.8
@@ -594,7 +594,7 @@ Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
 Copyright \(co 2017\-2021 Douglas Gilbert
 .br
-This software is distributed under a FreeBSD license. There is NO
+This software is distributed under a BSD\-2\-Clause license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .SH "SEE ALSO"
 .B sg_readcap,sg_vpd,sg_write_same,sg_stream_ctl(sg3_utils)
diff --git a/doc/sg_z_act_query.8 b/doc/sg_z_act_query.8
index 6b816835..7cda1e2c 100644
--- a/doc/sg_z_act_query.8
+++ b/doc/sg_z_act_query.8
@@ -109,7 +109,7 @@ Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
 Copyright \(co 2021 Douglas Gilbert
 .br
-This software is distributed under a FreeBSD license. There is NO
+This software is distributed under a BSD\-2\-Clause license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .SH "SEE ALSO"
 .B sg_zone,sg_rep_zones,sg_reset_wp(sg3_utils)
diff --git a/doc/sg_zone.8 b/doc/sg_zone.8
index 6c39dea2..256009ef 100644
--- a/doc/sg_zone.8
+++ b/doc/sg_zone.8
@@ -91,7 +91,7 @@ Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
 Copyright \(co 2014\-2022 Douglas Gilbert
 .br
-This software is distributed under a FreeBSD license. There is NO
+This software is distributed under a BSD\-2\-Clause license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .SH "SEE ALSO"
 .B sg_rem_rest_elem,sg_rep_zones,sg_reset_wp,sg_z_act_query(sg3_utils)