diff options
author | Douglas Gilbert <dgilbert@interlog.com> | 2008-06-23 22:36:58 +0000 |
---|---|---|
committer | Douglas Gilbert <dgilbert@interlog.com> | 2008-06-23 22:36:58 +0000 |
commit | d4aef9c1c6f2b9a97c1f9505a06f530ed8463e97 (patch) | |
tree | d5a4d84ce31667e5bba72267a7e6bda317fb3c95 /utils | |
parent | 1ed38622e036161089f63939413f673c79ac81f0 (diff) | |
download | sg3_utils-d4aef9c1c6f2b9a97c1f9505a06f530ed8463e97.tar.gz |
changes for spc4r15
git-svn-id: https://svn.bingwo.ca/repos/sg3_utils/trunk@179 6180dd3e-e324-4e3e-922d-17de1ae2f315
Diffstat (limited to 'utils')
-rw-r--r-- | utils/Makefile | 4 | ||||
-rw-r--r-- | utils/Makefile.freebsd | 3 | ||||
-rw-r--r-- | utils/Makefile.solaris | 3 | ||||
-rw-r--r-- | utils/README | 21 | ||||
-rw-r--r-- | utils/sg_chk_asc.c | 7 |
5 files changed, 22 insertions, 16 deletions
diff --git a/utils/Makefile b/utils/Makefile index 3bf73659..77b56fd2 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -8,7 +8,7 @@ CC = gcc LD = gcc EXECS = hxascdmp -# EXECS = hxascdmp sg_chk_asc +EXTRA_EXECS = hxascdmp sg_chk_asc MAN_PGS = hxascdmp.1 MAN_PREF = man1 @@ -25,7 +25,7 @@ depend dep: done > .depend clean: - /bin/rm -f *.o $(EXECS) core .depend + /bin/rm -f *.o $(EXTRA_EXECS) core .depend hxascdmp: hxascdmp.o $(LD) -o $@ $(LDFLAGS) $^ diff --git a/utils/Makefile.freebsd b/utils/Makefile.freebsd index bcb47c9d..6b9b1348 100644 --- a/utils/Makefile.freebsd +++ b/utils/Makefile.freebsd @@ -7,7 +7,8 @@ MANDIR=$(DESTDIR)/$(PREFIX)/man CC = gcc LD = gcc -EXECS = hxascdmp sg_chk_asc +EXECS = hxascdmp +# EXECS = hxascdmp sg_chk_asc MAN_PGS = MAN_PREF = man8 diff --git a/utils/Makefile.solaris b/utils/Makefile.solaris index e72e5bf5..b49115a0 100644 --- a/utils/Makefile.solaris +++ b/utils/Makefile.solaris @@ -7,7 +7,8 @@ MANDIR=$(DESTDIR)/$(PREFIX)/man CC = gcc LD = gcc -EXECS = hxascdmp sg_chk_asc +EXECS = hxascdmp +# EXECS = hxascdmp sg_chk_asc MAN_PGS = MAN_PREF = man8 diff --git a/utils/README b/utils/README index 3faef309..a5e4fcdc 100644 --- a/utils/README +++ b/utils/README @@ -7,19 +7,22 @@ This directory contains these utilities: hxascdmp(1) man page. - sg_chk_asc: utility decodes the SCSI additional sense code table found at http://www.t10.org/lists/asc-num.txt and checks it - against the table found in sg_lib.c in the lib/ subdirectory. - It is designed to keep the table in sg_lib.c in "sync" with the + against the table found in sg_lib_data.c in the lib/ subdirectory. + It is designed to keep the table in sg_lib_data.c in "sync" with the table at the t10.org web site. -These utilities can be built for Linux, FreeBSD or Solaris. -The hxascdmp utility can also be built in a Windows MinGW/MSYS environment. -This command should be sufficient: 'make hxascdmp' . +By default, the Makefile only builds the hxascdmp utility. The 'Makefile' +file (i.e. with no suffix) builds for Linux; the 'Makefile.freebsd' file +builds for FreeBSD (e.g. 'make -f Makefile.freebsd'); the +'Makefile.solaris' file builds for Solaris; and the 'Makefile.mingw' builds +in the Windows MinGW environment (e.g. msys shell). -To build sg_chk_asc the sg_lib.o file must be present (i.e. compiled) in -the lib/ subdirectory. One way to meet that requirement is to execute -'./configure' in the main directory then 'cd lib ; make '. +To build sg_chk_asc the sg_lib.o and sg_lib_data.o files must be present +(i.e. compiled) in the lib/ subdirectory. One way to meet that requirement +is to execute './configure' in the main directory then 'cd lib ; make '. +Then return to this directory and do 'make sg_chk_asc'. Doug Gilbert -26th March 2008 +23rd June 2008 diff --git a/utils/sg_chk_asc.c b/utils/sg_chk_asc.c index 7926d525..14d2c090 100644 --- a/utils/sg_chk_asc.c +++ b/utils/sg_chk_asc.c @@ -47,7 +47,7 @@ * http://www.t10.org/lists/asc-num.txt */ -static char * version_str = "1.03 20080313"; +static char * version_str = "1.03 20080623"; #define ME "sg_chk_asc: " @@ -68,8 +68,9 @@ static void usage() " where: --help|-h print out usage message\n" " --verbose|-v increase verbosity\n" " --version|-V print version string and exit\n\n" - "Checks asc/ascq codes < www.t10.org/lists/asc-num.txt > against " - "sg_lib.c\n" + "Checks asc/ascq codes in <asc_ascq_file> against the sg3_utils " + "library.\nThe additional sense code (asc_ascq) can be found at\n" + "www.t10.org/lists/asc-num.txt .\n" ); } |