add: SPDX-License-Identifier: BSD-2-Clause (or gpl-2-or-later); testing/sgs_dd.c work

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

71 files changed, 188 insertions, 43 deletions

diff --git a/src/sg_bg_ctl.c b/src/sg_bg_ctl.c
index 2c62b1d6..dfdcbc46 100644
--- a/src/sg_bg_ctl.c
+++ b/src/sg_bg_ctl.c
@@ -3,6 +3,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 <unistd.h>
diff --git a/src/sg_compare_and_write.c b/src/sg_compare_and_write.c
index 159e8774..2ac3304f 100644
--- a/src/sg_compare_and_write.c
+++ b/src/sg_compare_and_write.c
@@ -23,6 +23,8 @@
 *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
  * This command performs a SCSI COMPARE AND WRITE. See SBC-3 at
  * http://www.t10.org
  *
diff --git a/src/sg_copy_results.c b/src/sg_copy_results.c
index 864ca8e6..17012be2 100644
--- a/src/sg_copy_results.c
+++ b/src/sg_copy_results.c
@@ -25,18 +25,21 @@
 #include "sg_unaligned.h"
 #include "sg_pr2serr.h"
 
-/* A utility program for the Linux OS SCSI subsystem.
-   *  Copyright (C) 2004-2010 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 issues the SCSI command RECEIVE COPY RESULTS to a given
-   SCSI device.
-   It sends the command with the service action passed as the sa argument,
-   and the optional list identifier passed as the list_id argument.
-*/
+/*
+ * A utility program for the Linux OS SCSI subsystem.
+ *  Copyright (C) 2004-2010 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 program issues the SCSI command RECEIVE COPY RESULTS to a given
+ * SCSI device.
+ * It sends the command with the service action passed as the sa argument,
+ * and the optional list identifier passed as the list_id argument.
+ */
 
 static const char * version_str = "1.23 20180625";
 
diff --git a/src/sg_dd.c b/src/sg_dd.c
index edd8f9c3..28e6be92 100644
--- a/src/sg_dd.c
+++ b/src/sg_dd.c
@@ -7,6 +7,8 @@
  * 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 specialisation of the Unix "dd" command in which
  * either the input or the output file is a scsi generic device, raw
  * device, a block device or a normal file. The block size ('bs') is
diff --git a/src/sg_decode_sense.c b/src/sg_decode_sense.c
index 6bb08ec8..8dd682db 100644
--- a/src/sg_decode_sense.c
+++ b/src/sg_decode_sense.c
@@ -3,6 +3,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 <unistd.h>
diff --git a/src/sg_emc_trespass.c b/src/sg_emc_trespass.c
index fc3219a9..146e26b2 100644
--- a/src/sg_emc_trespass.c
+++ b/src/sg_emc_trespass.c
@@ -11,6 +11,8 @@
  *  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
  */
 
 #include <stdio.h>
diff --git a/src/sg_format.c b/src/sg_format.c
index af1a033d..8113b097 100644
--- a/src/sg_format.c
+++ b/src/sg_format.c
@@ -13,6 +13,8 @@
  *   the Free Software Foundation; either version 2, or (at your option)
  *   any later version.
  *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
  * See http://www.t10.org for relevant standards and drafts. The most recent
  * draft is SBC-4 revision 2.
  */
diff --git a/src/sg_get_config.c b/src/sg_get_config.c
index 28af720a..ad3bce9e 100644
--- a/src/sg_get_config.c
+++ b/src/sg_get_config.c
@@ -3,6 +3,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 <unistd.h>
diff --git a/src/sg_get_lba_status.c b/src/sg_get_lba_status.c
index 91c7a96d..6018d4f1 100644
--- a/src/sg_get_lba_status.c
+++ b/src/sg_get_lba_status.c
@@ -3,6 +3,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 <unistd.h>
diff --git a/src/sg_ident.c b/src/sg_ident.c
index f75fb110..2bf00bb8 100644
--- a/src/sg_ident.c
+++ b/src/sg_ident.c
@@ -3,6 +3,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 <unistd.h>
diff --git a/src/sg_inq.c b/src/sg_inq.c
index b32ab879..61f4fdb3 100644
--- a/src/sg_inq.c
+++ b/src/sg_inq.c
@@ -5,6 +5,8 @@
  * the Free Software Foundation; either version 2, or (at your option)
  * any later version.
  *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
  * This program outputs information provided by a SCSI INQUIRY command.
  * It is mainly based on the SCSI SPC-5 document at http://www.t10.org .
  *
diff --git a/src/sg_inq_data.c b/src/sg_inq_data.c
index 5b6b5331..96792c58 100644
--- a/src/sg_inq_data.c
+++ b/src/sg_inq_data.c
@@ -1,14 +1,16 @@
-/* A utility program originally written for the Linux OS SCSI subsystem.
-*  Copyright (C) 2000-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.
-
-   This is an auxiliary file holding data tables for the sg_inq utility.
-   It is mainly based on the SCSI SPC-5 document at http://www.t10.org .
-
-*/
+/*
+ * A utility program originally written for the Linux OS SCSI subsystem.
+ *     Copyright (C) 2000-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 an auxiliary file holding data tables for the sg_inq utility.
+ * It is mainly based on the SCSI SPC-5 document at http://www.t10.org .
+ */
 
 #include <unistd.h>
 #include <fcntl.h>
diff --git a/src/sg_logs.c b/src/sg_logs.c
index 61443ff1..65eb3947 100644
--- a/src/sg_logs.c
+++ b/src/sg_logs.c
@@ -5,6 +5,8 @@
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
  *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
  * This program outputs information provided by a SCSI LOG SENSE command
  * and in some cases issues a LOG SELECT command.
  *
diff --git a/src/sg_luns.c b/src/sg_luns.c
index 904b2cef..d1a5030e 100644
--- a/src/sg_luns.c
+++ b/src/sg_luns.c
@@ -3,6 +3,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 <unistd.h>
diff --git a/src/sg_map.c b/src/sg_map.c
index 824334a2..ebf2c2e4 100644
--- a/src/sg_map.c
+++ b/src/sg_map.c
@@ -1,9 +1,12 @@
-/* Utility program for the Linux OS SCSI generic ("sg") device driver.
-*  Copyright (C) 2000-2017 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.
+/*
+ * Utility program for the Linux OS SCSI generic ("sg") device driver.
+ *     Copyright (C) 2000-2017 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 shows the mapping from "sg" devices to other scsi devices
    (i.e. sd, scd or st) if any.
diff --git a/src/sg_map26.c b/src/sg_map26.c
index a48fcda5..b96eb042 100644
--- a/src/sg_map26.c
+++ b/src/sg_map26.c
@@ -3,6 +3,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
  */
 
 /* A utility program for the Linux OS SCSI subsystem.
diff --git a/src/sg_modes.c b/src/sg_modes.c
index babb05d2..ee0378e4 100644
--- a/src/sg_modes.c
+++ b/src/sg_modes.c
@@ -5,6 +5,8 @@
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
  *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
  *  This program outputs information provided by a SCSI MODE SENSE command.
  *  Does 10 byte MODE SENSE commands by default, Trent Piepho added a "-6"
  *  switch for force 6 byte mode sense commands.
@@ -30,7 +32,7 @@
 #include "sg_unaligned.h"
 #include "sg_pr2serr.h"
 
-static const char * version_str = "1.66 20180909";
+static const char * version_str = "1.67 20181203";
 
 #define DEF_ALLOC_LEN (1024 * 4)
 #define DEF_6_ALLOC_LEN 252
@@ -133,7 +135,7 @@ static struct page_code_desc pc_desc_disk[] = {
     {0x1, 0x0, "rw", "Read-Write error recovery"},
     {0x3, 0x0, "fo", "Format (obsolete)"},
     {0x4, 0x0, "rd", "Rigid disk geometry (obsolete)"},
-    {0x5, 0x0, "fg", "Flexible geometry (obsolete)"},
+    {0x5, 0x0, "fd", "Flexible disk (obsolete)"},
     {0x7, 0x0, "ve", "Verify error recovery"},
     {0x8, 0x0, "ca", "Caching"},
     {0xa, 0x2, "atag", "Application tag"},
diff --git a/src/sg_opcodes.c b/src/sg_opcodes.c
index a6c3d2ef..16d7c6c9 100644
--- a/src/sg_opcodes.c
+++ b/src/sg_opcodes.c
@@ -5,6 +5,8 @@
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
  *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
  *  This program outputs information provided by a SCSI REPORT SUPPORTED
  *  OPERATION CODES [0xa3/0xc] and REPORT SUPPORTED TASK MANAGEMENT
  *  FUNCTIONS [0xa3/0xd] commands.
diff --git a/src/sg_persist.c b/src/sg_persist.c
index f582d32e..c1324c43 100644
--- a/src/sg_persist.c
+++ b/src/sg_persist.c
@@ -5,6 +5,8 @@
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
  *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
  *  This program issues the SCSI PERSISTENT IN and OUT commands.
  */
 
diff --git a/src/sg_prevent.c b/src/sg_prevent.c
index 40ab1638..487315ac 100644
--- a/src/sg_prevent.c
+++ b/src/sg_prevent.c
@@ -3,6 +3,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 <unistd.h>
diff --git a/src/sg_raw.c b/src/sg_raw.c
index 92c22875..9cc0ab2b 100644
--- a/src/sg_raw.c
+++ b/src/sg_raw.c
@@ -8,6 +8,8 @@
  * the Free Software Foundation; either version 2, or (at your option)
  * any later version.
  *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
  * This program can be used to send raw SCSI commands (with an optional
  * data phase) through a Generic SCSI interface.
  */
diff --git a/src/sg_rbuf.c b/src/sg_rbuf.c
index 61604d38..9f5055e8 100644
--- a/src/sg_rbuf.c
+++ b/src/sg_rbuf.c
@@ -5,6 +5,8 @@
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
  *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
  * This program uses the SCSI command READ BUFFER on the given
  * device, first to find out how big it is and then to read that
  * buffer (data mode, buffer id 0).
diff --git a/src/sg_rdac.c b/src/sg_rdac.c
index 73f4684a..b0d1cdcf 100644
--- a/src/sg_rdac.c
+++ b/src/sg_rdac.c
@@ -11,6 +11,8 @@
  *  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
  */
 
 #include <stdio.h>
diff --git a/src/sg_read.c b/src/sg_read.c
index 135d7408..a356aa35 100644
--- a/src/sg_read.c
+++ b/src/sg_read.c
@@ -1,9 +1,12 @@
-/* A utility program for the Linux OS SCSI generic ("sg") device driver.
-*  Copyright (C) 2001 - 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.
+/*
+ *  A utility program for the Linux OS SCSI generic ("sg") device driver.
+ *    Copyright (C) 2001 - 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 program reads data from the given SCSI device (typically a disk
    or cdrom) and discards that data. Its primary goal is to time
diff --git a/src/sg_read_attr.c b/src/sg_read_attr.c
index 2ae51bf8..4925b905 100644
--- a/src/sg_read_attr.c
+++ b/src/sg_read_attr.c
@@ -3,6 +3,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 <unistd.h>
diff --git a/src/sg_read_block_limits.c b/src/sg_read_block_limits.c
index 597c9b64..804dccc0 100644
--- a/src/sg_read_block_limits.c
+++ b/src/sg_read_block_limits.c
@@ -3,6 +3,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 <unistd.h>
diff --git a/src/sg_read_buffer.c b/src/sg_read_buffer.c
index 23564029..823fed73 100644
--- a/src/sg_read_buffer.c
+++ b/src/sg_read_buffer.c
@@ -3,6 +3,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 <unistd.h>
diff --git a/src/sg_read_long.c b/src/sg_read_long.c
index d094aabb..0a5e6a68 100644
--- a/src/sg_read_long.c
+++ b/src/sg_read_long.c
@@ -5,6 +5,8 @@
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
  *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
  * This program issues the SCSI command READ LONG to a given SCSI device.
  * It sends the command with the logical block address passed as the lba
  * argument, and the transfer length set to the xfer_len argument. the
diff --git a/src/sg_readcap.c b/src/sg_readcap.c
index 70b40bf3..a383ef84 100644
--- a/src/sg_readcap.c
+++ b/src/sg_readcap.c
@@ -7,6 +7,8 @@
  * the Free Software Foundation; either version 2, or (at your option)
  * any later version.
  *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
  * This program was originally written with Linux 2.4 kernel series.
  * It now builds for the Linux 2.6, 3 and 4 kernel series and various other
  * operating systems.
diff --git a/src/sg_reassign.c b/src/sg_reassign.c
index 73565c37..f522ed70 100644
--- a/src/sg_reassign.c
+++ b/src/sg_reassign.c
@@ -3,6 +3,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 <unistd.h>
diff --git a/src/sg_referrals.c b/src/sg_referrals.c
index 89775605..35cf50e6 100644
--- a/src/sg_referrals.c
+++ b/src/sg_referrals.c
@@ -3,6 +3,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 <unistd.h>
diff --git a/src/sg_rep_zones.c b/src/sg_rep_zones.c
index a0d01d25..c9619344 100644
--- a/src/sg_rep_zones.c
+++ b/src/sg_rep_zones.c
@@ -3,6 +3,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 <unistd.h>
diff --git a/src/sg_requests.c b/src/sg_requests.c
index 76053c4e..a13cab63 100644
--- a/src/sg_requests.c
+++ b/src/sg_requests.c
@@ -3,6 +3,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 <unistd.h>
diff --git a/src/sg_reset.c b/src/sg_reset.c
index 9f5648e8..a84c3d83 100644
--- a/src/sg_reset.c
+++ b/src/sg_reset.c
@@ -5,6 +5,8 @@
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
  *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
  * This program send either device, bus or host resets to device,
  * or bus or host associated with the given sg device. This is a Linux
  * only utility (perhaps Android as well).
diff --git a/src/sg_reset_wp.c b/src/sg_reset_wp.c
index 42ece34b..1dc6cab6 100644
--- a/src/sg_reset_wp.c
+++ b/src/sg_reset_wp.c
@@ -3,6 +3,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 <unistd.h>
diff --git a/src/sg_rmsn.c b/src/sg_rmsn.c
index 332a9c70..c413ea43 100644
--- a/src/sg_rmsn.c
+++ b/src/sg_rmsn.c
@@ -3,6 +3,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 <unistd.h>
diff --git a/src/sg_rtpg.c b/src/sg_rtpg.c
index ab955987..48ee4a02 100644
--- a/src/sg_rtpg.c
+++ b/src/sg_rtpg.c
@@ -3,6 +3,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 <unistd.h>
diff --git a/src/sg_safte.c b/src/sg_safte.c
index 3a102e00..588d47f8 100644
--- a/src/sg_safte.c
+++ b/src/sg_safte.c
@@ -3,6 +3,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 <unistd.h>
diff --git a/src/sg_sanitize.c b/src/sg_sanitize.c
index b45462fb..6d6fc11a 100644
--- a/src/sg_sanitize.c
+++ b/src/sg_sanitize.c
@@ -3,6 +3,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 <unistd.h>
diff --git a/src/sg_sat_identify.c b/src/sg_sat_identify.c
index 7016ef97..334ac832 100644
--- a/src/sg_sat_identify.c
+++ b/src/sg_sat_identify.c
@@ -3,6 +3,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 <unistd.h>
diff --git a/src/sg_sat_phy_event.c b/src/sg_sat_phy_event.c
index dc9372b0..a6e89610 100644
--- a/src/sg_sat_phy_event.c
+++ b/src/sg_sat_phy_event.c
@@ -3,6 +3,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 <unistd.h>
diff --git a/src/sg_sat_read_gplog.c b/src/sg_sat_read_gplog.c
index 3ea7f5cc..233ceae2 100644
--- a/src/sg_sat_read_gplog.c
+++ b/src/sg_sat_read_gplog.c
@@ -3,6 +3,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 <unistd.h>
diff --git a/src/sg_sat_set_features.c b/src/sg_sat_set_features.c
index 34336523..81313f96 100644
--- a/src/sg_sat_set_features.c
+++ b/src/sg_sat_set_features.c
@@ -3,6 +3,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 <unistd.h>
diff --git a/src/sg_scan_linux.c b/src/sg_scan_linux.c
index 5c0fc2f0..7354ad4e 100644
--- a/src/sg_scan_linux.c
+++ b/src/sg_scan_linux.c
@@ -5,6 +5,8 @@
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
  *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
  * This program scans the "sg" device space (ie actual + simulated SCSI
  * generic devices). Optionally sg_scan can be given other device names
  * to scan (in place of the sg devices).
diff --git a/src/sg_scan_win32.c b/src/sg_scan_win32.c
index d9349feb..4ba59836 100644
--- a/src/sg_scan_win32.c
+++ b/src/sg_scan_win32.c
@@ -3,6 +3,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
  */
 
 /*
diff --git a/src/sg_seek.c b/src/sg_seek.c
index 093c6b79..9084fd75 100644
--- a/src/sg_seek.c
+++ b/src/sg_seek.c
@@ -3,6 +3,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 <unistd.h>
diff --git a/src/sg_senddiag.c b/src/sg_senddiag.c
index 60144e12..38d4e40d 100644
--- a/src/sg_senddiag.c
+++ b/src/sg_senddiag.c
@@ -1,9 +1,12 @@
-/* A utility program originally written for the Linux OS SCSI subsystem
-*  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.
+/*
+ * A utility program originally written for the Linux OS SCSI subsystem
+ *    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 program issues the SCSI SEND DIAGNOSTIC command and in one case
    the SCSI RECEIVE DIAGNOSTIC command to list supported diagnostic pages.
diff --git a/src/sg_ses.c b/src/sg_ses.c
index 0cce8bd1..a62f6faf 100644
--- a/src/sg_ses.c
+++ b/src/sg_ses.c
@@ -3,6 +3,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 <unistd.h>
diff --git a/src/sg_ses_microcode.c b/src/sg_ses_microcode.c
index 4f9d70ea..25011d5c 100644
--- a/src/sg_ses_microcode.c
+++ b/src/sg_ses_microcode.c
@@ -3,6 +3,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 <unistd.h>
diff --git a/src/sg_start.c b/src/sg_start.c
index a5bf6780..ccf98aa6 100644
--- a/src/sg_start.c
+++ b/src/sg_start.c
@@ -4,6 +4,8 @@
  *  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
 
     Start/Stop parameter by Kurt Garloff <garloff at suse dot de>, 6/2000
     Sync cache parameter by Kurt Garloff <garloff at suse dot de>, 1/2001
diff --git a/src/sg_stpg.c b/src/sg_stpg.c
index c592e804..6cb78932 100644
--- a/src/sg_stpg.c
+++ b/src/sg_stpg.c
@@ -3,6 +3,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 <unistd.h>
diff --git a/src/sg_stream_ctl.c b/src/sg_stream_ctl.c
index 7e977a10..3f5eef2d 100644
--- a/src/sg_stream_ctl.c
+++ b/src/sg_stream_ctl.c
@@ -3,6 +3,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 <unistd.h>
diff --git a/src/sg_sync.c b/src/sg_sync.c
index 26867917..d300354a 100644
--- a/src/sg_sync.c
+++ b/src/sg_sync.c
@@ -3,6 +3,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 <unistd.h>
diff --git a/src/sg_test_rwbuf.c b/src/sg_test_rwbuf.c
index f187ba06..8eb604b0 100644
--- a/src/sg_test_rwbuf.c
+++ b/src/sg_test_rwbuf.c
@@ -16,6 +16,8 @@
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
  *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
  * $Id: sg_test_rwbuf.c,v 1.1 2000/03/02 13:50:03 garloff Exp $
  *
  *   2003/11/11  switch sg3_utils version to use SG_IO ioctl [dpg]
diff --git a/src/sg_timestamp.c b/src/sg_timestamp.c
index 3168997c..18ddab4f 100644
--- a/src/sg_timestamp.c
+++ b/src/sg_timestamp.c
@@ -3,6 +3,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 <unistd.h>
diff --git a/src/sg_turs.c b/src/sg_turs.c
index b68f1a42..8c6e3792 100644
--- a/src/sg_turs.c
+++ b/src/sg_turs.c
@@ -5,6 +5,7 @@
  * the Free Software Foundation; either version 2, or (at your option)
  * any later version.
  *
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 /*
diff --git a/src/sg_unmap.c b/src/sg_unmap.c
index 726eb239..2deb71ad 100644
--- a/src/sg_unmap.c
+++ b/src/sg_unmap.c
@@ -3,6 +3,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 <unistd.h>
diff --git a/src/sg_verify.c b/src/sg_verify.c
index 0e186a9a..ad0057b8 100644
--- a/src/sg_verify.c
+++ b/src/sg_verify.c
@@ -3,6 +3,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 <unistd.h>
diff --git a/src/sg_vpd.c b/src/sg_vpd.c
index a15ed742..70e1fddf 100644
--- a/src/sg_vpd.c
+++ b/src/sg_vpd.c
@@ -3,6 +3,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 <unistd.h>
diff --git a/src/sg_vpd_vendor.c b/src/sg_vpd_vendor.c
index 3c751775..99325c94 100644
--- a/src/sg_vpd_vendor.c
+++ b/src/sg_vpd_vendor.c
@@ -3,6 +3,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 <unistd.h>
diff --git a/src/sg_wr_mode.c b/src/sg_wr_mode.c
index ce900ff0..9db253b3 100644
--- a/src/sg_wr_mode.c
+++ b/src/sg_wr_mode.c
@@ -3,6 +3,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 <unistd.h>
diff --git a/src/sg_write_buffer.c b/src/sg_write_buffer.c
index d3b02942..37dcc295 100644
--- a/src/sg_write_buffer.c
+++ b/src/sg_write_buffer.c
@@ -3,6 +3,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 <unistd.h>
diff --git a/src/sg_write_long.c b/src/sg_write_long.c
index 41c6b8bc..af323cc7 100644
--- a/src/sg_write_long.c
+++ b/src/sg_write_long.c
@@ -5,6 +5,8 @@
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
  *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
  * This program issues the SCSI command WRITE LONG to a given SCSI device.
  * It sends the command with the logical block address passed as the lba
  * argument, and the transfer length set to the xfer_len argument. the
diff --git a/src/sg_write_same.c b/src/sg_write_same.c
index f589d0ea..d1e7d4e9 100644
--- a/src/sg_write_same.c
+++ b/src/sg_write_same.c
@@ -3,6 +3,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 <unistd.h>
diff --git a/src/sg_write_verify.c b/src/sg_write_verify.c
index 55b715ea..781cdd4c 100644
--- a/src/sg_write_verify.c
+++ b/src/sg_write_verify.c
@@ -4,6 +4,8 @@
  * 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
+ *
  * This program issues the SCSI command WRITE AND VERIFY to a given SCSI
  * device. It sends the command with the logical block address passed as the
  * LBA argument, for the given number of blocks. The number of bytes sent is
diff --git a/src/sg_write_x.c b/src/sg_write_x.c
index 3b8f0919..fa84c76b 100644
--- a/src/sg_write_x.c
+++ b/src/sg_write_x.c
@@ -4,6 +4,8 @@
  * 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
+ *
  * The utility can send six variants of the SCSI WRITE command: (normal)
  * WRITE(16 or 32), WRITE ATOMIC(16 or 32), ORWRITE(16 or 32),
  * WRITE SAME(16 or 32), WRITE SCATTERED (16 or 32) or WRITE
diff --git a/src/sg_xcopy.c b/src/sg_xcopy.c
index 5facfc84..6bfd1dba 100644
--- a/src/sg_xcopy.c
+++ b/src/sg_xcopy.c
@@ -11,6 +11,8 @@
  *  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 specialisation of the Unix "dd" command in which
  * either the input or the output file is a scsi generic device, raw
  * device, a block device or a normal file. The block size ('bs') is
diff --git a/src/sg_zone.c b/src/sg_zone.c
index 9c5cda21..b7f8391f 100644
--- a/src/sg_zone.c
+++ b/src/sg_zone.c
@@ -3,6 +3,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 <unistd.h>
diff --git a/src/sginfo.c b/src/sginfo.c
index bddc9641..6a514fc1 100644
--- a/src/sginfo.c
+++ b/src/sginfo.c
@@ -62,6 +62,8 @@
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
  * Michael Weller (eowmob at exp-math dot uni-essen dot de)
  *      11/23/94 massive extensions from 1.4a
  *      08/23/97 fix problems with defect lists
diff --git a/src/sgm_dd.c b/src/sgm_dd.c
index c3b8c717..0b6cf044 100644
--- a/src/sgm_dd.c
+++ b/src/sgm_dd.c
@@ -6,6 +6,8 @@
  * 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 specialisation of the Unix "dd" command in which
    either the input or the output file is a scsi generic device. The block
diff --git a/src/sgp_dd.c b/src/sgp_dd.c
index db871776..b129d575 100644
--- a/src/sgp_dd.c
+++ b/src/sgp_dd.c
@@ -7,6 +7,8 @@
  * 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 specialisation 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