From 14caf8f4de1225f7cf56e4131a3b1cbc5535b1b9 Mon Sep 17 00:00:00 2001 From: Douglas Gilbert Date: Fri, 12 Mar 2010 16:48:12 +0000 Subject: follow google's RE2 lead and add BSD_LICENSE files and refer to them from source git-svn-id: https://svn.bingwo.ca/repos/sg3_utils/trunk@329 6180dd3e-e324-4e3e-922d-17de1ae2f315 --- src/sg_rmsn.c | 38 +++++++------------------------------- 1 file changed, 7 insertions(+), 31 deletions(-) (limited to 'src/sg_rmsn.c') diff --git a/src/sg_rmsn.c b/src/sg_rmsn.c index 2467cdd5..bebd42a4 100644 --- a/src/sg_rmsn.c +++ b/src/sg_rmsn.c @@ -1,30 +1,8 @@ /* - * Copyright (c) 2005-2008 Douglas Gilbert. + * Copyright (c) 2005-2010 Douglas Gilbert. * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 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 - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND 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. - * + * Use of this source code is governed by a BSD-style + * license that can be found in the BSD_LICENSE file. */ #include @@ -41,16 +19,14 @@ #include "sg_cmds_basic.h" #include "sg_cmds_extra.h" -/* A utility program for the Linux OS SCSI subsystem. +/* A utility program was originally written for the Linux OS SCSI subsystem. * * * This program issues the SCSI command READ MEDIA SERIAL NUMBER * to the given SCSI device. */ -static char * version_str = "1.08 20080513"; - -#define ME "sg_rmsn: " +static char * version_str = "1.08 20100312"; #define SERIAL_NUM_SANITY_LEN (16 * 1024) @@ -107,7 +83,7 @@ int main(int argc, char * argv[]) ++verbose; break; case 'V': - fprintf(stderr, ME "version: %s\n", version_str); + fprintf(stderr, "version: %s\n", version_str); return 0; default: fprintf(stderr, "unrecognised option code 0x%x ??\n", c); @@ -143,7 +119,7 @@ int main(int argc, char * argv[]) sg_fd = sg_cmds_open_device(device_name, 0 /* rw */, verbose); if (sg_fd < 0) { - fprintf(stderr, ME "open error: %s: %s\n", device_name, + fprintf(stderr, "open error: %s: %s\n", device_name, safe_strerror(-sg_fd)); return SG_LIB_FILE_ERROR; } -- cgit v1.2.3