diff --git a/CVSROOT/checkoutlist b/CVSROOT/checkoutlist
deleted file mode 100644
index b04b3501f5efd94313942eb7439457bc82f5a2f5..0000000000000000000000000000000000000000
--- a/CVSROOT/checkoutlist
+++ /dev/null
@@ -1,13 +0,0 @@
-# The "checkoutlist" file is used to support additional version controlled
-# administrative files in $CVSROOT/CVSROOT, such as template files.
-#
-# The first entry on a line is a filename which will be checked out from
-# the corresponding RCS file in the $CVSROOT/CVSROOT directory.
-# The remainder of the line is an error message to use if the file cannot
-# be checked out.
-#
-# File format:
-#
-#	[<whitespace>]<filename><whitespace><error message><end-of-line>
-#
-# comment lines begin with '#'
diff --git a/CVSROOT/commitinfo b/CVSROOT/commitinfo
deleted file mode 100644
index b19e7b7a63e8e90cdb49c43f02035646c4a76e0a..0000000000000000000000000000000000000000
--- a/CVSROOT/commitinfo
+++ /dev/null
@@ -1,15 +0,0 @@
-# The "commitinfo" file is used to control pre-commit checks.
-# The filter on the right is invoked with the repository and a list 
-# of files to check.  A non-zero exit of the filter program will 
-# cause the commit to be aborted.
-#
-# The first entry on a line is a regular expression which is tested
-# against the directory that the change is being committed to, relative
-# to the $CVSROOT.  For the first match that is found, then the remainder
-# of the line is the name of the filter to run.
-#
-# If the repository name does not match any of the regular expressions in this
-# file, the "DEFAULT" line is used, if it is specified.
-#
-# If the name "ALL" appears as a regular expression it is always used
-# in addition to the first matching regex or "DEFAULT".
diff --git a/CVSROOT/config b/CVSROOT/config
deleted file mode 100644
index ff43ec005ab332bc2aa7e1378754180e75a4b049..0000000000000000000000000000000000000000
--- a/CVSROOT/config
+++ /dev/null
@@ -1,14 +0,0 @@
-# Set this to "no" if pserver shouldn't check system users/passwords
-#SystemAuth=no
-
-# Put CVS lock files in this directory rather than directly in the repository.
-#LockDir=/var/lock/cvs
-
-# Set `TopLevelAdmin' to `yes' to create a CVS directory at the top
-# level of the new working directory when using the `cvs checkout'
-# command.
-#TopLevelAdmin=no
-
-# Set `LogHistory' to `all' or `TOFEWGCMAR' to log all transactions to the
-# history file, or a subset as needed (ie `TMAR' logs all write operations)
-#LogHistory=TOFEWGCMAR
diff --git a/CVSROOT/cvswrappers b/CVSROOT/cvswrappers
deleted file mode 100644
index 0accaf1b1532448d633d8a183cd8e3a5dd3b4a75..0000000000000000000000000000000000000000
--- a/CVSROOT/cvswrappers
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file affects handling of files based on their names.
-#
-# The -t/-f options allow one to treat directories of files
-# as a single file, or to transform a file in other ways on
-# its way in and out of CVS.
-#
-# The -m option specifies whether CVS attempts to merge files.
-#
-# The -k option specifies keyword expansion (e.g. -kb for binary).
-#
-# Format of wrapper file ($CVSROOT/CVSROOT/cvswrappers or .cvswrappers)
-#
-#  wildcard	[option value][option value]...
-#
-#  where option is one of
-#  -f		from cvs filter		value: path to filter
-#  -t		to cvs filter		value: path to filter
-#  -m		update methodology	value: MERGE or COPY
-#  -k		expansion mode		value: b, o, kkv, &c
-#
-#  and value is a single-quote delimited value.
-# For example:
-#*.gif -k 'b'
diff --git a/CVSROOT/editinfo b/CVSROOT/editinfo
deleted file mode 100644
index d78886c1522b6eae3470c13da218c3d8e197cf71..0000000000000000000000000000000000000000
--- a/CVSROOT/editinfo
+++ /dev/null
@@ -1,21 +0,0 @@
-# The "editinfo" file is used to allow verification of logging
-# information.  It works best when a template (as specified in the
-# rcsinfo file) is provided for the logging procedure.  Given a
-# template with locations for, a bug-id number, a list of people who
-# reviewed the code before it can be checked in, and an external
-# process to catalog the differences that were code reviewed, the
-# following test can be applied to the code:
-#
-#   Making sure that the entered bug-id number is correct.
-#   Validating that the code that was reviewed is indeed the code being
-#       checked in (using the bug-id number or a seperate review
-#       number to identify this particular code set.).
-#
-# If any of the above test failed, then the commit would be aborted.
-#
-# Actions such as mailing a copy of the report to each reviewer are
-# better handled by an entry in the loginfo file.
-#
-# One thing that should be noted is the the ALL keyword is not
-# supported.  There can be only one entry that matches a given
-# repository.
diff --git a/CVSROOT/loginfo b/CVSROOT/loginfo
deleted file mode 100644
index 5a59f0a5440dbfb31dec7af3fbaced68fbf50a8f..0000000000000000000000000000000000000000
--- a/CVSROOT/loginfo
+++ /dev/null
@@ -1,26 +0,0 @@
-# The "loginfo" file controls where "cvs commit" log information
-# is sent.  The first entry on a line is a regular expression which must match
-# the directory that the change is being made to, relative to the
-# $CVSROOT.  If a match is found, then the remainder of the line is a filter
-# program that should expect log information on its standard input.
-#
-# If the repository name does not match any of the regular expressions in this
-# file, the "DEFAULT" line is used, if it is specified.
-#
-# If the name ALL appears as a regular expression it is always used
-# in addition to the first matching regex or DEFAULT.
-#
-# You may specify a format string as part of the
-# filter.  The string is composed of a `%' followed
-# by a single format character, or followed by a set of format
-# characters surrounded by `{' and `}' as separators.  The format
-# characters are:
-#
-#   s = file name
-#   V = old version number (pre-checkin)
-#   v = new version number (post-checkin)
-#
-# For example:
-#DEFAULT (echo ""; id; echo %s; date; cat) >> $CVSROOT/CVSROOT/commitlog
-# or
-#DEFAULT (echo ""; id; echo %{sVv}; date; cat) >> $CVSROOT/CVSROOT/commitlog
diff --git a/CVSROOT/modules b/CVSROOT/modules
deleted file mode 100644
index cb9e9efc94b342879a5fff24b425473fc11edd01..0000000000000000000000000000000000000000
--- a/CVSROOT/modules
+++ /dev/null
@@ -1,26 +0,0 @@
-# Three different line formats are valid:
-#	key	-a    aliases...
-#	key [options] directory
-#	key [options] directory files...
-#
-# Where "options" are composed of:
-#	-i prog		Run "prog" on "cvs commit" from top-level of module.
-#	-o prog		Run "prog" on "cvs checkout" of module.
-#	-e prog		Run "prog" on "cvs export" of module.
-#	-t prog		Run "prog" on "cvs rtag" of module.
-#	-u prog		Run "prog" on "cvs update" of module.
-#	-d dir		Place module in directory "dir" instead of module name.
-#	-l		Top-level directory only -- do not recurse.
-#
-# NOTE:  If you change any of the "Run" options above, you'll have to
-# release and re-checkout any working directories of these modules.
-#
-# And "directory" is a path to a directory relative to $CVSROOT.
-#
-# The "-a" option specifies an alias.  An alias is interpreted as if
-# everything on the right of the "-a" had been typed on the command line.
-#
-# You can encode a module within a module by using the special '&'
-# character to interpose another module into the current module.  This
-# can be useful for creating a module that consists of many directories
-# spread out over the entire source repository.
diff --git a/CVSROOT/notify b/CVSROOT/notify
deleted file mode 100644
index 34f0bc288808e56e499d0852a9bfc9a3214b02d9..0000000000000000000000000000000000000000
--- a/CVSROOT/notify
+++ /dev/null
@@ -1,12 +0,0 @@
-# The "notify" file controls where notifications from watches set by
-# "cvs watch add" or "cvs edit" are sent.  The first entry on a line is
-# a regular expression which is tested against the directory that the
-# change is being made to, relative to the $CVSROOT.  If it matches,
-# then the remainder of the line is a filter program that should contain
-# one occurrence of %s for the user to notify, and information on its
-# standard input.
-#
-# "ALL" or "DEFAULT" can be used in place of the regular expression.
-#
-# For example:
-#ALL mail %s -s "CVS notification"
diff --git a/CVSROOT/rcsinfo b/CVSROOT/rcsinfo
deleted file mode 100644
index 49e59f4d0df9b432c5b99c0b806378a77c9cd870..0000000000000000000000000000000000000000
--- a/CVSROOT/rcsinfo
+++ /dev/null
@@ -1,13 +0,0 @@
-# The "rcsinfo" file is used to control templates with which the editor
-# is invoked on commit and import.
-#
-# The first entry on a line is a regular expression which is tested
-# against the directory that the change is being made to, relative to the
-# $CVSROOT.  For the first match that is found, then the remainder of the
-# line is the name of the file that contains the template.
-#
-# If the repository name does not match any of the regular expressions in this
-# file, the "DEFAULT" line is used, if it is specified.
-#
-# If the name "ALL" appears as a regular expression it is always used
-# in addition to the first matching regex or "DEFAULT".
diff --git a/CVSROOT/taginfo b/CVSROOT/taginfo
deleted file mode 100644
index 274a46dd5b61069f1cea62395178b09aa3120248..0000000000000000000000000000000000000000
--- a/CVSROOT/taginfo
+++ /dev/null
@@ -1,20 +0,0 @@
-# The "taginfo" file is used to control pre-tag checks.
-# The filter on the right is invoked with the following arguments:
-#
-# $1 -- tagname
-# $2 -- operation "add" for tag, "mov" for tag -F, and "del" for tag -d
-# $3 -- repository
-# $4->  file revision [file revision ...]
-#
-# A non-zero exit of the filter program will cause the tag to be aborted.
-#
-# The first entry on a line is a regular expression which is tested
-# against the directory that the change is being committed to, relative
-# to the $CVSROOT.  For the first match that is found, then the remainder
-# of the line is the name of the filter to run.
-#
-# If the repository name does not match any of the regular expressions in this
-# file, the "DEFAULT" line is used, if it is specified.
-#
-# If the name "ALL" appears as a regular expression it is always used
-# in addition to the first matching regex or "DEFAULT".
diff --git a/CVSROOT/verifymsg b/CVSROOT/verifymsg
deleted file mode 100644
index 86f747ce222390e6aa7a488074e372030d57a479..0000000000000000000000000000000000000000
--- a/CVSROOT/verifymsg
+++ /dev/null
@@ -1,21 +0,0 @@
-# The "verifymsg" file is used to allow verification of logging
-# information.  It works best when a template (as specified in the
-# rcsinfo file) is provided for the logging procedure.  Given a
-# template with locations for, a bug-id number, a list of people who
-# reviewed the code before it can be checked in, and an external
-# process to catalog the differences that were code reviewed, the
-# following test can be applied to the code:
-#
-#   Making sure that the entered bug-id number is correct.
-#   Validating that the code that was reviewed is indeed the code being
-#       checked in (using the bug-id number or a seperate review
-#       number to identify this particular code set.).
-#
-# If any of the above test failed, then the commit would be aborted.
-#
-# Actions such as mailing a copy of the report to each reviewer are
-# better handled by an entry in the loginfo file.
-#
-# One thing that should be noted is the the ALL keyword is not
-# supported.  There can be only one entry that matches a given
-# repository.
diff --git a/sm5/atacmds.cpp b/sm5/atacmds.cpp
deleted file mode 100644
index d4e178f41d4400571127dbbdd13a776cea1e9786..0000000000000000000000000000000000000000
--- a/sm5/atacmds.cpp
+++ /dev/null
@@ -1,881 +0,0 @@
-/*
- * atacmds.c
- * 
- * Home page of code is: http://smartmontools.sourceforge.net
- *
- * Copyright (C) 2002 Bruce Allen <smartmontools-support@lists.sourceforge.net>
- * Copyright (C) 1999-2000 Michael Cornwell <cornwell@acm.org>
- * Copyright (C) 2000 Andre Hedrick <andre@linux-ide.org>
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * This code was originally developed as a Senior Thesis by Michael Cornwell
- * at the Concurrent Systems Laboratory (now part of the Storage Systems
- * Research Center), Jack Baskin School of Engineering, University of
- * California, Santa Cruz. http://ssrc.soe.ucsc.edu/
- * 
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#include <stdlib.h>
-#include "atacmds.h"
-
-const char *CVSid1="$Id: atacmds.cpp,v 1.40 2002/11/14 05:42:49 ballen4705 Exp $" CVSID1;
-
-// These Drive Identity tables are taken from hdparm 5.2, and are also
-// given in the ATA/ATAPI specs for the IDENTIFY DEVICE command.  Note
-// that SMART was first added into the ATA/ATAPI-3 Standard with
-// Revision 3 of the document, July 25, 1995.  Look at the "Document
-// Status" revision commands at the beginning of
-// http://www.t13.org/project/d2008r6.pdf to see this.
-#define NOVAL_0			0x0000
-#define NOVAL_1			0xffff
-/* word 81: minor version number */
-#define MINOR_MAX 0x1C
-const char *minor_str[] = {			/* word 81 value: */
-  "Device does not report version",		/* 0x0000	*/
-  "ATA-1 X3T9.2 781D prior to revision 4",	/* 0x0001	*/
-  "ATA-1 published, ANSI X3.221-1994",		/* 0x0002	*/
-  "ATA-1 X3T9.2 781D revision 4",		/* 0x0003	*/
-  "ATA-2 published, ANSI X3.279-1996",		/* 0x0004	*/
-  "ATA-2 X3T10 948D prior to revision 2k",	/* 0x0005	*/
-  "ATA-3 X3T10 2008D revision 1",		/* 0x0006	*/ /* SMART NOT INCLUDED */
-  "ATA-2 X3T10 948D revision 2k",		/* 0x0007	*/
-  "ATA-3 X3T10 2008D revision 0",		/* 0x0008	*/ 
-  "ATA-2 X3T10 948D revision 3",		/* 0x0009	*/
-  "ATA-3 published, ANSI X3.298-199x",		/* 0x000a	*/
-  "ATA-3 X3T10 2008D revision 6",		/* 0x000b	*/ /* 1st VERSION WITH SMART */
-  "ATA-3 X3T13 2008D revision 7 and 7a",	/* 0x000c	*/
-  "ATA/ATAPI-4 X3T13 1153D revision 6",		/* 0x000d	*/
-  "ATA/ATAPI-4 T13 1153D revision 13",		/* 0x000e	*/
-  "ATA/ATAPI-4 X3T13 1153D revision 7",		/* 0x000f	*/
-  "ATA/ATAPI-4 T13 1153D revision 18",		/* 0x0010	*/
-  "ATA/ATAPI-4 T13 1153D revision 15",		/* 0x0011	*/
-  "ATA/ATAPI-4 published, ANSI NCITS 317-1998",	/* 0x0012	*/
-  "ATA/ATAPI-5 T13 1321D revision 3",	        /* 0x0013	*/
-  "ATA/ATAPI-4 T13 1153D revision 14",		/* 0x0014	*/
-  "ATA/ATAPI-5 T13 1321D revision 1",		/* 0x0015	*/
-  "ATA/ATAPI-5 published, ANSI NCITS 340-2000",	/* 0x0016	*/
-  "ATA/ATAPI-4 T13 1153D revision 17",		/* 0x0017	*/
-  "ATA/ATAPI-6 T13 1410D revision 0",		/* 0x0018	*/
-  "ATA/ATAPI-6 T13 1410D revision 3a",		/* 0x0019	*/
-  "Reserved",					/* 0x001a	*/
-  "ATA/ATAPI-6 T13 1410D revision 2",		/* 0x001b	*/
-  "ATA/ATAPI-6 T13 1410D revision 1",		/* 0x001c	*/
-  "reserved"					/* 0x001d	*/
-  "reserved"					/* 0x001e	*/
-  "reserved"					/* 0x001f-0xfffe*/
-};
-
-// NOTE ATA/ATAPI-4 REV 4 was the LAST revision where the device
-// attribute structures were NOT completely vendor specific.  So any
-// disk that is ATA/ATAPI-4 or above can not be trusted to show the
-// vendor values in sensible format.
-
-// Negative values below are because it doesn't support SMART
-const int actual_ver[] = { 
-  /* word 81 value: */
-  0,		/* 0x0000	WARNING: 	*/
-  1,		/* 0x0001	WARNING: 	*/
-  1,		/* 0x0002	WARNING: 	*/
-  1,		/* 0x0003	WARNING: 	*/
-  2,		/* 0x0004	WARNING:   This array 		*/
-  2,		/* 0x0005	WARNING:   corresponds 		*/
-  -3, /*<== */	/* 0x0006	WARNING:   *exactly*		*/
-  2,		/* 0x0007	WARNING:   to the ATA/		*/
-  -3, /*<== */	/* 0x0008	WARNING:   ATAPI version	*/
-  2,		/* 0x0009	WARNING:   listed in	 	*/
-  3,		/* 0x000a	WARNING:   the 		 	*/
-  3,		/* 0x000b	WARNING:   minor_str 		*/
-  3,		/* 0x000c	WARNING:   array		*/
-  4,		/* 0x000d	WARNING:   above.		*/
-  4,		/* 0x000e	WARNING:  			*/
-  4,		/* 0x000f	WARNING:   If you change 	*/
-  4,		/* 0x0010	WARNING:   that one,      	*/
-  4,		/* 0x0011	WARNING:   change this one	*/
-  4,		/* 0x0012	WARNING:   too!!!        	*/
-  5,		/* 0x0013	WARNING:	*/
-  4,		/* 0x0014	WARNING:	*/
-  5,		/* 0x0015	WARNING:	*/
-  5,		/* 0x0016	WARNING:	*/
-  4,		/* 0x0017	WARNING:	*/
-  6,		/* 0x0018	WARNING:	*/
-  6,		/* 0x0019	WARNING:	*/
-  0,		/* 0x001a	WARNING:	*/
-  6,		/* 0x001b	WARNING:	*/
-  6,		/* 0x001c	WARNING:	*/
-  0		/* 0x001d-0xfffe    		*/
-};
-
-// A replacement for perror() that sends output to our choice of
-// printing.
-void syserror(const char *message){
-  const char *errormessage;
-
-  // Get the correct system error message:
-  if (errno<sys_nerr)
-    errormessage=sys_errlist[errno];
-  else
-    errormessage="unrecognized system error";
-
-  // Check that caller has handed a sensible string, and provide
-  // appropriate output. See perrror(3) man page to understand better.
-    if (message && *message)
-      pout("%s: %s\n",message, errormessage);
-    else
-      pout("%s\n",errormessage);
-	
-    return;
-}
-
-// We no longer use this function, because the IOCTL appears to return
-// only the drive identity at the time that the system was booted
-// (perhaps from the BIOS.  It doesn't correctly reflect the current
-// state information, and for example the checksum is usually
-// wrong. The replacement function follows afterwards
-#if (0)
-int ataReadHDIdentity (int device, struct hd_driveid *buf){
-  if (ioctl(device, HDIO_GET_IDENTITY, buf)){ 
-    perror ("Error ATA GET HD Identity Failed");
-    return -1;
-  }
-  return 0;
-}
-#endif
-
-// Reads current Device Identity info (512 bytes) into buf
-int ataReadHDIdentity (int device, struct hd_driveid *buf){
-  unsigned short driveidchecksum;
-  unsigned char parms[HDIO_DRIVE_CMD_HDR_SIZE+sizeof(*buf)]=
-  {WIN_IDENTIFY, 0, 0, 1,};
-  
-  if (ioctl(device ,HDIO_DRIVE_CMD,parms)){
-    // See if device responds to packet command...
-    parms[0]=WIN_PIDENTIFY;
-    if (ioctl(device ,HDIO_DRIVE_CMD,parms)){
-      perror ("Error ATA GET HD Identity Failed");
-      return -1; 
-    }
-  }
-  // copy data into driveid structure
-  memcpy(buf,parms+HDIO_DRIVE_CMD_HDR_SIZE,sizeof(*buf));
-  
-#if 0
-  // The following ifdef is a HACK to distinguish different versions
-  // of the header file defining hd_driveid
-#ifdef CFA_REQ_EXT_ERROR_CODE
-  driveidchecksum=buf->integrity_word;
-#else
-  // Note -- the declaration that appears in
-  // /usr/include/linux/hdreg.h: short words160_255[95], is WRONG.
-  // It should say: short words160_255[96]. I have written to Andre
-  // Hedrick about this on Oct 17 2002.  Please remove this comment
-  // once the fix has made it into the stock kernel tree.
-  driveidchecksum=buf->words160_255[95];
-#endif
-#else
-  // This way is ugly and you may feel ill -- but it always works...
-  {
-    unsigned short *rawstructure=
-      (unsigned short *)buf;
-    driveidchecksum=rawstructure[255];
-  }
-#endif
-  
-  if ((driveidchecksum & 0x00ff) == 0x00a5){
-    // Device identity structure contains a checksum
-    unsigned char cksum=0;
-    int i;
-    
-    for (i=0;i<sizeof(*buf);i++)
-      cksum+=parms[i+HDIO_DRIVE_CMD_HDR_SIZE];
-    
-    if (cksum)
-      checksumwarning("Drive Identity Structure");
-  }
- 
- return 0;
-}
-
-// Returns ATA version as an integer, and a pointer to a string
-// describing which revision.  Note that Revision 0 of ATA-3 does NOT
-// support SMART.  For this one case we return -3 rather than +3 as
-// the version number.  See notes above.
-int ataVersionInfo (const char** description, struct hd_driveid *drive, unsigned short *minor){
-  unsigned short major;
-  int i;
-  
-  // get major and minor ATA revision numbers
-#ifdef __NEW_HD_DRIVE_ID
-  major=drive->major_rev_num;
-  *minor=drive->minor_rev_num;
-#else
-  major=drive->word80;
-  *minor=drive->word81;
-#endif
-  
-  // First check if device has ANY ATA version information in it
-  if (major==NOVAL_0 || major==NOVAL_1) {
-    *description=NULL;
-    return -1;
-  }
-  
-  // The minor revision number has more information - try there first
-  if (*minor && (*minor<=MINOR_MAX)){
-    int std = actual_ver[*minor];
-    if (std) {
-      *description=minor_str[*minor];
-      return std;
-    }
-  }
-  
-  // HDPARM has a very complicated algorithm from here on. Since SMART only
-  // exists on ATA-3 and later standards, let's punt on this.  If you don't
-  // like it, please fix it.  The code's in CVS.
-  for (i=15; i>0; i--)
-    if (major & (0x1<<i))
-      break;
-  
-  *description=NULL; 
-  if (i==0)
-    return 1;
-  else
-    return i;;
-}
-
-// returns 1 if SMART supported, 0 if not supported or can't tell
-int ataSmartSupport(struct hd_driveid *drive){
-  unsigned short word82,word83;
-
-  // get correct bits of IDENTIFY DEVICE structure
-#ifdef __NEW_HD_DRIVE_ID
-  word82=drive->command_set_1;
-  word83=drive->command_set_2;
-#else
-  word82=drive->command_sets;
-  word83=drive->word83;
-#endif
-
-  // Note this does not work for ATA3 < Revision 6, when word82 and word83 were added
-  // we should check for ATA3 Rev 0 in minor identity code...  
-  return (word83 & 0x0001<<14) && !(word83 & 0x0001<<15) && (word82 & 0x0001);
-}
-
-// returns 1 if SMART enabled, 0 if SMART disabled, -1 if can't tell
-int ataIsSmartEnabled(struct hd_driveid *drive){
-    unsigned short word85,word87;
-
-  // Get correct bits of IDENTIFY DRIVE structure
-#ifdef __NEW_HD_DRIVE_ID
-  word85=drive->cfs_enable_1;
-  word87=drive->csf_default;
-#else
-  word85=drive->word85;
-  word87=drive->word87;
-#endif
-  
-  if ((word87 & 0x0001<<14) && !(word87 & 0x0001<<15))
-    // word85 contains valid information, so
-    return word85 & 0x0001;
-  
-  // Since we can't rely word85, we don't know if SMART is enabled.
-  return -1;
-}
-
-
-// Reads SMART attributes into *data
-int ataReadSmartValues(int device, struct ata_smart_values *data){	
-  int i;
-  unsigned char chksum=0;
-  unsigned char buf[HDIO_DRIVE_CMD_HDR_SIZE+ATA_SMART_SEC_SIZE]= 
-    {WIN_SMART, 0, SMART_READ_VALUES, 1, };
-  
-  if (ioctl(device,HDIO_DRIVE_CMD,buf)){
-    syserror("Error SMART Values Read failed");
-    return -1;
-  }
-  
-  // compute checksum
-  for (i=0;i<ATA_SMART_SEC_SIZE;i++)
-    chksum+=buf[i+HDIO_DRIVE_CMD_HDR_SIZE];
-  
-  // verify that checksum vanishes
-  if (chksum)
-    checksumwarning("SMART Attribute Data Structure");
-  
-  // copy data and return
-  memcpy(data,buf+HDIO_DRIVE_CMD_HDR_SIZE,ATA_SMART_SEC_SIZE);
-  return 0;
-}
-
-
-// Reads the Self Test Log (log #6)
-int ataReadSelfTestLog (int device, struct ata_smart_selftestlog *data){	
-  int i;
-  unsigned char chksum=0;	
-  unsigned char buf[HDIO_DRIVE_CMD_HDR_SIZE+ATA_SMART_SEC_SIZE] = 
-    {WIN_SMART, 0x06, SMART_READ_LOG_SECTOR, 1,};
-  
-  // get data from device
-  if (ioctl(device, HDIO_DRIVE_CMD, buf)){
-    syserror("Error SMART Error Self-Test Log Read failed");
-    return -1;
-  }
-  
-  // compute its checksum, and issue a warning if needed
-  for (i=0;i<ATA_SMART_SEC_SIZE;i++)
-    chksum+=buf[HDIO_DRIVE_CMD_HDR_SIZE+i];
-  if (chksum)
-    checksumwarning("SMART Self-Test Log Structure");
-  
-  // copy data back to the user and return
-  memcpy(data,buf+HDIO_DRIVE_CMD_HDR_SIZE, ATA_SMART_SEC_SIZE); 
-  return 0;
-}
-
-// Reads the Error Log (log #1)
-int ataReadErrorLog (int device, struct ata_smart_errorlog *data){	
-  int i;
-  unsigned char chksum=0;	
-  unsigned char buf[HDIO_DRIVE_CMD_HDR_SIZE+ATA_SMART_SEC_SIZE] = 
-    {WIN_SMART, 0x01, SMART_READ_LOG_SECTOR, 1,};
-  
-  // get data from device
-  if (ioctl(device,HDIO_DRIVE_CMD,buf)) {
-    syserror("Error SMART Error Log Read failed");
-    return -1;
-  }
-  
-  // compute checksum and issue warning if needed
-  for (i=0;i<ATA_SMART_SEC_SIZE;i++)
-    chksum+=buf[HDIO_DRIVE_CMD_HDR_SIZE+i];
-  if (chksum)
-    checksumwarning("SMART ATA Error Log Structure");
-  
-  //copy data back to user and return
-  memcpy(data, buf+HDIO_DRIVE_CMD_HDR_SIZE, ATA_SMART_SEC_SIZE);
-  return 0;
-}
-
-
-int ataReadSmartThresholds (int device, struct ata_smart_thresholds *data){
-  int i;
-  unsigned char chksum=0;	
-  unsigned char buf[HDIO_DRIVE_CMD_HDR_SIZE+ATA_SMART_SEC_SIZE] = 
-    {WIN_SMART, 1, SMART_READ_THRESHOLDS, 1,};
-  
-  // get data from device
-  if (ioctl(device ,HDIO_DRIVE_CMD, buf)){
-    syserror("Error SMART Thresholds Read failed");
-    return -1;
-  }
-  
-  // compute checksum and issue warning if needed
-  for (i=0;i<ATA_SMART_SEC_SIZE;i++)
-    chksum+=buf[HDIO_DRIVE_CMD_HDR_SIZE+i];
-  if (chksum)
-    checksumwarning("SMART Attribute Thresholds Structure");
-  
-  // copy data back to user and return
-  memcpy(data,buf+HDIO_DRIVE_CMD_HDR_SIZE, ATA_SMART_SEC_SIZE);
-  return 0;
-}
-
-
-// This routine is not currently in use, and it's been marked as
-// "Obsolete" in the ANSI ATA-5 spec.  So it should probably be left
-// alone and unused.  If you do modify the thresholds, be sure to set
-// the checksum correctly before putting the structure back!
-int ataSetSmartThresholds ( int device, struct ata_smart_thresholds *data){	
-  unsigned char buf[HDIO_DRIVE_CMD_HDR_SIZE+ATA_SMART_SEC_SIZE] = 
-    {WIN_SMART, 1, 0xD7, 1,};
-  
-  memcpy(buf+HDIO_DRIVE_CMD_HDR_SIZE, data, ATA_SMART_SEC_SIZE);
-  
-  if (ioctl(device, HDIO_DRIVE_CMD, buf)){
-    syserror("Error SMART Thresholds Write failed");
-    return -1;
-  }
-  return 0;
-}
-
-int ataEnableSmart (int device ){	
-  unsigned char parms[4] = {WIN_SMART, 1, SMART_ENABLE, 0};
-  
-  if (ioctl (device, HDIO_DRIVE_CMD, parms)){
-    syserror("Error SMART Enable failed");
-    return -1;
-  }
-  return 0;
-}
-
-int ataDisableSmart (int device ){	
-  unsigned char parms[4] = {WIN_SMART, 1, SMART_DISABLE, 0};
-  
-  if (ioctl(device, HDIO_DRIVE_CMD, parms)){
-    syserror("Error SMART Disable failed");
-    return -1;
-  }  
-  return 0;
-}
-
-int ataEnableAutoSave(int device){
-  unsigned char parms[4] = {WIN_SMART, 241, SMART_AUTOSAVE, 0};
-  
-  if (ioctl(device, HDIO_DRIVE_CMD, parms)){
-    syserror("Error SMART Enable Auto-save failed");
-    return -1;
-  }
-  return 0;
-}
-
-int ataDisableAutoSave(int device){
-  unsigned char parms[4] = {WIN_SMART, 0, SMART_AUTOSAVE, 0};
-  
-  if (ioctl(device, HDIO_DRIVE_CMD, parms)){
-    syserror("Error SMART Disable Auto-save failed");
-    return -1;
-  }
-  return 0;
-}
-
-// Note that in the ATA-5 standard this command is marked "OBSOLETE"
-int ataEnableAutoOffline (int device ){	
-  
-  /* timer hard coded to 4 hours */
-  unsigned char parms[4] = {WIN_SMART, 248, SMART_AUTO_OFFLINE, 0};
-  
-  if (ioctl(device , HDIO_DRIVE_CMD, parms)){
-    syserror("Error SMART Enable Automatic Offline failed");
-    return -1;
-  }
-  return 0;
-}
-
-// Another Obsolete Command!
-int ataDisableAutoOffline (int device ){	
-  unsigned char parms[4] = {WIN_SMART, 0, SMART_AUTO_OFFLINE, 0};
-  
-  if (ioctl(device , HDIO_DRIVE_CMD, parms)){
-    syserror("Error SMART Disable Automatic Offline failed");
-    return -1;
-  }
-  return 0;
-}
-
-
-// This function does NOTHING except tell us if SMART is working &
-// enabled on the device.  See ataSmartStatus2() for one that actually
-// returns SMART status.
-int ataSmartStatus (int device ){	
-   unsigned char parms[4] = {WIN_SMART, 0, SMART_STATUS, 0};
-
-   if (ioctl(device, HDIO_DRIVE_CMD, parms)){
-     syserror("Error Return SMART Status via HDIO_DRIVE_CMD failed");
-     return -1;
-   }
-   return 0;
-}
-
-// If SMART is enabled, supported, and working, then this call is
-// guaranteed to return 1, else zero.  Silent inverse of
-// ataSmartStatus()
-int ataDoesSmartWork(int device){	
-   unsigned char parms[4] = {WIN_SMART, 0, SMART_STATUS, 0};
-   return !ioctl(device, HDIO_DRIVE_CMD, parms);
-}
-
-
-#ifdef HDIO_DRIVE_TASK
-// This function uses a different interface (DRIVE_TASK) than the
-// other commands in this file.
-int ataSmartStatus2(int device){
-  unsigned char normal_cyl_lo=0x4f, normal_cyl_hi=0xc2;
-  unsigned char failed_cyl_lo=0xf4, failed_cyl_hi=0x2c;
-  
-  unsigned char parms[HDIO_DRIVE_TASK_HDR_SIZE]=
-    {WIN_SMART, SMART_STATUS, 0, 0, 0, 0, 0};
-  
-  // load CL and CH values
-  parms[4]=normal_cyl_lo;
-  parms[5]=normal_cyl_hi;
-
-  if (ioctl(device,HDIO_DRIVE_TASK,parms)){
-    syserror("Error SMART Status command via HDIO_DRIVE_TASK failed");
-    return -1;
-  }
-  
-  // Cyl low and Cyl high unchanged means "Good SMART status"
-  if (parms[4]==normal_cyl_lo && parms[5]==normal_cyl_hi)
-    return 0;
-  
-  // These values mean "Bad SMART status"
-  if (parms[4]==failed_cyl_lo && parms[5]==failed_cyl_hi)
-    return 1;
-
-  // We haven't gotten output that makes sense; print out some debugging info
-  syserror("Error SMART Status command failed");
-  pout("Please get assistance from %s\n",PROJECTHOME);
-  pout("Register values returned from SMART Status command are:\n");
-  pout("CMD=0x%02x\n",(int)parms[0]);
-  pout("FR =0x%02x\n",(int)parms[1]);
-  pout("NS =0x%02x\n",(int)parms[2]);
-  pout("SC =0x%02x\n",(int)parms[3]);
-  pout("CL =0x%02x\n",(int)parms[4]);
-  pout("CH =0x%02x\n",(int)parms[5]);
-  pout("SEL=0x%02x\n",(int)parms[6]);
-  return -1;
-}
-#else
-// Just a hack so that the code compiles on 
-// 2.2 kernels without HDIO_DRIVE TASK support.  
-// Should be fixed by putting in a call to code 
-// that compares smart data to thresholds.
-int ataSmartStatus2(int device){
-  return ataSmartStatus(device);
-}
-#endif
-
-
-// This is the way to execute ALL tests: offline, short self-test,
-// extended self test, with and without captive mode, etc.
-int ataSmartTest(int device, int testtype){	
-  unsigned char parms[4] = {WIN_SMART, 0, SMART_IMMEDIATE_OFFLINE};
-  char cmdmsg[128],*type,*captive;
-  int errornum;
-
-  parms[1]=testtype;
-
-  // Set up strings that describe the type of test
-  if (testtype==SHORT_CAPTIVE_SELF_TEST || testtype==EXTEND_CAPTIVE_SELF_TEST)
-    captive="captive";
-  else
-    captive="off-line";
-
-  if (testtype==OFFLINE_FULL_SCAN)
-    type="off-line";
-  else  if (testtype==SHORT_SELF_TEST || testtype==SHORT_CAPTIVE_SELF_TEST)
-    type="Short self-test";
-  else 
-    type="Extended self-test";
-
-  //  Print ouf message that we are sending the command to test
-  if (testtype==ABORT_SELF_TEST)
-    sprintf(cmdmsg,"Abort SMART off-line mode self-test routine");
-  else
-    sprintf(cmdmsg,"Execute SMART %s routine immediately in %s mode",type,captive);
-  pout("Sending command: \"%s\".\n",cmdmsg);
-
-  // Now send the command to test
-  errornum=ioctl(device, HDIO_DRIVE_CMD, parms);
-  if (errornum && !((testtype=SHORT_CAPTIVE_SELF_TEST || testtype==EXTEND_CAPTIVE_SELF_TEST) && errno==EIO)){
-    char errormsg[128];
-    sprintf(errormsg,"Command \"%s\" failed",cmdmsg); 
-    syserror(errormsg);
-    fprintf(stderr,"\n");
-    return -1;
-  }
-  
-  // Since the command succeeded, tell user
-  if (testtype==ABORT_SELF_TEST)
-    pout("Self-testing aborted!\n");
-  else
-    pout("Drive command \"%s\" successful.\nTesting has begun.\n",cmdmsg);
-  return 0;
-}
-
-/* Test Time Functions */
-int TestTime(struct ata_smart_values *data,int testtype){
-  switch (testtype){
-  case OFFLINE_FULL_SCAN:
-    return (int) data->total_time_to_complete_off_line;
-  case SHORT_SELF_TEST:
-  case SHORT_CAPTIVE_SELF_TEST:
-    return (int) data->short_test_completion_time;
-  case EXTEND_SELF_TEST:
-  case EXTEND_CAPTIVE_SELF_TEST:
-    return (int) data->extend_test_completion_time;
-  default:
-    return 0;
-  }
-}
-
-// This function tells you both about the ATA error log and the
-// self-test error log capability.  The bit is poorly documented in
-// the ATA/ATAPI standard.
-int isSmartErrorLogCapable ( struct ata_smart_values *data){
-   return data->errorlog_capability & 0x01;
-}
-int isSupportExecuteOfflineImmediate ( struct ata_smart_values *data){
-   return data->offline_data_collection_capability & 0x01;
-}
-int isSupportAutomaticTimer ( struct ata_smart_values *data){
-   return data->offline_data_collection_capability & 0x02;
-}
-int isSupportOfflineAbort ( struct ata_smart_values *data){
-   return data->offline_data_collection_capability & 0x04;
-}
-int isSupportOfflineSurfaceScan ( struct ata_smart_values *data){
-   return data->offline_data_collection_capability & 0x08;
-}
-int isSupportSelfTest (struct ata_smart_values *data){
-   return data->offline_data_collection_capability & 0x10;
-}
-
-
-// Loop over all valid attributes.  If they are prefailure attributes
-// and are at or below the threshold value, then return the ID of the
-// first failing attribute found.  Return 0 if all prefailure
-// attributes are in bounds.  The spec says "Bit 0
-// -Pre-failure/advisory - If the value of this bit equals zero, an
-// attribute value less than or equal to its corresponding attribute
-// threshold indicates an advisory condition where the usage or age of
-// the device has exceeded its intended design life period. If the
-// value of this bit equals one, an atribute value less than or equal
-// to its corresponding attribute threshold indicates a pre-failure
-// condition where imminent loss of data is being predicted."
-
-
-// onlyfailed=0 : are or were any age or prefailure attributes <= threshold
-// onlyfailed=1:  are any prefailure attributes <= threshold now
-int ataCheckSmart(struct ata_smart_values *data,
-		  struct ata_smart_thresholds *thresholds,
-		  int onlyfailed){
-  int i;
-  
-  // loop over all attributes
-  for (i=0; i<NUMBER_ATA_SMART_ATTRIBUTES; i++){
-
-    // pointers to disk's values and vendor's thresholds
-    struct ata_smart_attribute *disk=data->vendor_attributes+i;
-    struct ata_smart_threshold_entry *thre=thresholds->thres_entries+i;
- 
-    // consider only valid attributes
-    if (disk->id && thre->id){
-      int failednow,failedever;
-      
-      failednow =disk->current <= thre->threshold;
-      failedever=disk->worst   <= thre->threshold;
-      
-      if (!onlyfailed && failedever)
-	return disk->id;
-      
-      if (onlyfailed && failednow && disk->status.flag.prefailure)
-	return disk->id;      
-    }
-  }
-  return 0;
-}
-
-
-
-// This checks the n'th attribute in the attribute list, NOT the
-// attribute with id==n.  If the attribute does not exist, or the
-// attribute is > threshold, then returns zero.  If the attribute is
-// <= threshold (failing) then we the attribute number if it is a
-// prefail attribute.  Else we return minus the attribute number if it
-// is a usage attribute.
-int ataCheckAttribute(struct ata_smart_values *data,
-		      struct ata_smart_thresholds *thresholds,
-		      int n){
-  struct ata_smart_attribute *disk;
-  struct ata_smart_threshold_entry *thre;
-  
-  if (n<0 || n>=NUMBER_ATA_SMART_ATTRIBUTES || !data || !thresholds)
-    return 0;
-  
-  // pointers to disk's values and vendor's thresholds
-  disk=data->vendor_attributes+n;
-  thre=thresholds->thres_entries+n;
-
-  if (!disk || !thre)
-    return 0;
-  
-  // consider only valid attributes, check for failure
-  if (!disk->id || !thre->id || (disk->id != thre->id) || disk->current> thre->threshold)
-    return 0;
-  
-  // We have found a failed attribute.  Return positive or negative? 
-  if (disk->status.flag.prefailure)
-    return disk->id;
-  else
-    return -1*(disk->id);
-}
-
-// Note some attribute names appear redundant because different
-// manufacturers use different attribute IDs for an attribute with the
-// same name.
-void ataPrintSmartAttribName(char *out, unsigned char id){
-  char *name;
-  switch (id){
-    
-  case 1:
-    name="Raw_Read_Error_Rate";
-    break;
-  case 2:
-    name="Throughput_Performance";
-    break;
-  case 3:
-    name="Spin_Up_Time";
-    break;
-  case 4:
-    name="Start_Stop_Count";
-    break;
-  case 5:
-    name="Reallocated_Sector_Ct";
-    break;
-  case 6:
-    name="Read_Channel_Margin";
-    break;
-  case 7:
-    name="Seek_Error_Rate";
-    break;
-  case 8:
-    name="Seek_Time_Performance";
-    break;
-  case 9:
-    name="Power_On_Hours";
-    break;
-  case 10:
-    name="Spin_Retry_Count";
-    break;
-  case 11:
-    name="Calibration_Retry_Count";
-    break;
-  case 12:
-    name="Power_Cycle_Count";
-    break;
-  case 13:
-    name="Read_Soft_Error_Rate";
-    break;
-  case 191:
-    name="G-Sense_Error_Rate";
-    break;
-  case 192:
-    name="Power-Off_Retract_Count";
-    break;
-  case 193:
-    name="Load_Cycle_Count";
-    break;
-  case 194:
-    name="Temperature_Celsius";
-    break;
-  case 195:
-    name="Hardware_ECC_Recovered";
-    break;
-  case 196:
-    name="Reallocated_Event_Count";
-    break;
-  case 197:
-    name="Current_Pending_Sector";
-    break;
-  case 198:
-    name="Offline_Uncorrectable";
-    break;
-  case 199:
-    name="UDMA_CRC_Error_Count";
-    break;
-  case 220:
-    // Note -- this is also apparently used for temperature.
-    name="Disk_Shift";
-    break;
-  case 221:
-    name="G-Sense_Error_Rate";
-    break;
-  case 222:
-    name="Loaded_Hours";
-    break;
-  case 223:
-    name="Load_Retry_Count";
-    break;
-  case 224:
-    name="Load_Friction";
-    break;
-  case 225:
-    name="Load_Cycle_Count";
-    break;
-  case 226:
-    name="Load-in_Time";
-    break;
-  case 227:
-    name="Torq-amp_Count";
-    break;
-  case 228:
-    name="Power-off_Retract_Count";
-    break;
-  case 231:
-    name="Temperature_Celsius";
-    break;
-  default:
-    name="Unknown_Attribute";
-    break;
-  }
-  sprintf(out,"%3hhu %s",id,name);
-  return;
-}
-
-
-// These are two utility functions for printing CVS IDs. They don't
-// really belong here.  But it's the only common source file included
-// in both smartd and smartctl.  returns distance that it has moved
-// ahead in the input string
-int massagecvs(char *out, const char *cvsid){
-  char *copy,*filename,*date,*version;
-  const char delimiters[] = " ,$";
-
-  // make a copy on stack, go to first token,
-  if (!(copy=strdup(cvsid)) || !(filename=strtok(copy, delimiters))) 
-    return 0;
-
-  // move to first instance of "Id:"
-  while (strcmp(filename,"Id:"))
-    if (!(filename=strtok(NULL, delimiters)))
-      return 0;
-
-  // get filename, skip "v", get version and date
-  if (!(  filename=strtok(NULL, delimiters)  ) ||
-      !(           strtok(NULL, delimiters)  ) ||
-      !(   version=strtok(NULL, delimiters)  ) ||
-      !(      date=strtok(NULL, delimiters)  ) )
-    return 0;
-
-   sprintf(out,"%-13s revision: %-6s date: %-15s", filename, version, date);
-   free(copy);
-   return  (date-copy)+strlen(date);
-}
-
-// prints a single set of CVS ids
-void printone(char *block, const char *cvsid){
-  char strings[CVSMAXLEN];
-  const char *here=cvsid;
-  int line=1,len=strlen(cvsid)+1;
-
-  // check that the size of the output block is sufficient
-  if (len>=CVSMAXLEN) {
-    fprintf(stderr,"CVSMAXLEN=%d must be at least %d\n",CVSMAXLEN,len+1);
-    exit(1);
-  }
-
-  // loop through the different strings
-  while ((len=massagecvs(strings,here))){
-    switch (line++){
-    case 1:
-      block+=snprintf(block,CVSMAXLEN,"Module:");
-      break;
-    default:
-      block+=snprintf(block,CVSMAXLEN,"  uses:");
-    } 
-    block+=snprintf(block,CVSMAXLEN," %s\n",strings);
-    here+=len;
-  }
-  return;
-}
diff --git a/sm5/ataprint.cpp b/sm5/ataprint.cpp
deleted file mode 100644
index eac4d660d4a43cdddc9366bd12dbd1c7f72fe313..0000000000000000000000000000000000000000
--- a/sm5/ataprint.cpp
+++ /dev/null
@@ -1,1011 +0,0 @@
-/*
- * ataprint.c
- *
- * Home page of code is: http://smartmontools.sourceforge.net
- *
- * Copyright (C) 2002 Bruce Allen <smartmontools-support@lists.sourceforge.net>
- * Copyright (C) 1999-2000 Michael Cornwell <cornwell@acm.org>
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * This code was originally developed as a Senior Thesis by Michael Cornwell
- * at the Concurrent Systems Laboratory (now part of the Storage Systems
- * Research Center), Jack Baskin School of Engineering, University of
- * California, Santa Cruz. http://ssrc.soe.ucsc.edu/
- *
- */
-
-#include <ctype.h>
-#include <stdio.h>
-#include <syslog.h>
-#include "atacmds.h"
-#include "ataprint.h"
-#include "smartctl.h"
-#include "extern.h"
-
-const char *CVSid2="$Id: ataprint.cpp,v 1.44 2002/11/14 14:57:20 ballen4705 Exp $"
-CVSID1 CVSID2 CVSID3 CVSID6;
-
-// for passing global control variables
-extern atamainctrl *con;
-
-// Function for printing ASCII byte-swapped strings, skipping white
-// space. This is needed on little-endian architectures, eg Intel,
-// Alpha. If someone wants to run this on SPARC they'll need to test
-// for the Endian-ness and skip the byte swapping if it's big-endian.
-void printswap(char *in, unsigned int n){
-  unsigned int i;
-  char out[64];
-
-  // swap bytes
-  for (i=0;i<n;i+=2){
-    unsigned int j=i+1;
-    out[i]=in[j];
-    out[j]=in[i];
-  }
-
-  // find the end of the white space
-  for (i=0;i<n && isspace(out[i]);i++);
-
-  // and do the printing starting from first non-white space
-  if (n-i)
-    pout("%.*s\n",(int)(n-i),out+i);
-  else
-    pout("[No Information Found]\n");
-
-  return;
-}
-
-
-void ataPrintDriveInfo (struct hd_driveid *drive){
-  int version;
-  const char *description;
-  char unknown[64];
-  unsigned short minorrev;
-
-  // print out model, serial # and firmware versions  (byte-swap ASCI strings)
-  pout("Device Model:     ");
-  printswap(drive->model,40);
-
-  pout("Serial Number:    ");
-  printswap(drive->serial_no,20);
-
-  pout("Firmware Version: ");
-  printswap(drive->fw_rev,8);
-
-  // now get ATA version info
-  version=ataVersionInfo(&description,drive, &minorrev);
-
-  // unrecognized minor revision code
-  if (!description){
-    sprintf(unknown,"Unrecognized. Minor revision code: 0x%02hx",minorrev);
-    description=unknown;
-  }
-  
-  
-  // SMART Support was first added into the ATA/ATAPI-3 Standard with
-  // Revision 3 of the document, July 25, 1995.  Look at the "Document
-  // Status" revision commands at the beginning of
-  // http://www.t13.org/project/d2008r6.pdf to see this.  So it's not
-  // enough to check if we are ATA-3.  Version=-3 indicates ATA-3
-  // BEFORE Revision 3.
-  pout("ATA Version is:   %d\n",(int)abs(version));
-  pout("ATA Standard is:  %s\n",description);
-  
-  if (version>=3)
-    return;
-  
-  pout("SMART is only available in ATA Version 3 Revision 3 or greater.\n");
-  pout("We will try to proceed in spite of this.\n");
-  return;
-}
-
-
-/*  prints verbose value Off-line data collection status byte */
-void PrintSmartOfflineStatus(struct ata_smart_values *data){
-  pout("Off-line data collection status: ");	
-  
-  switch(data->offline_data_collection_status){
-  case 0x00:
-  case 0x80:
-    pout("(0x%02x)\tOffline data collection activity was\n\t\t\t\t\t",
-	 (int)data->offline_data_collection_status);
-    pout("never started.\n");
-    break;
-  case 0x01:
-  case 0x81:
-    pout("(0x%02x)\tReserved.\n",
-	 (int)data->offline_data_collection_status);
-    break;
-  case 0x02:
-  case 0x82:
-    pout("(0x%02x)\tOffline data collection activity \n\t\t\t\t\t",
-	 (int)data->offline_data_collection_status);
-    pout("completed without error.\n");
-    break;
-  case 0x03:
-  case 0x83:
-    pout("(0x%02x)\tReserved.\n",
-	 (int)data->offline_data_collection_status);
-    break;
-  case 0x04:
-  case 0x84:
-    pout("(0x%02x)\tOffline data collection activity was \n\t\t\t\t\t",
-	 (int)data->offline_data_collection_status);
-    pout("suspended by an interrupting command from host.\n");
-    break;
-  case 0x05:
-  case 0x85:
-    pout("(0x%02x)\tOffline data collection activity was \n\t\t\t\t\t",
-	 (int)data->offline_data_collection_status);
-    pout("aborted by an interrupting command from host.\n");
-    break;
-  case 0x06:
-  case 0x86:
-    pout("(0x%02x)\tOffline data collection activity was \n\t\t\t\t\t",
-	 (int)data->offline_data_collection_status);
-    pout("aborted by the device with a fatal error.\n");
-    break;
-  default:
-    if ( ((data->offline_data_collection_status >= 0x07) &&
-	  (data->offline_data_collection_status <= 0x3f)) ||
-	 ((data->offline_data_collection_status >= 0xc0) &&
-	  (data->offline_data_collection_status <= 0xff)) )
-      pout("(0x%02x)\tVendor Specific.\n",(int)data->offline_data_collection_status);
-    else
-      pout("(0x%02x)\tReserved.\n",(int)data->offline_data_collection_status);
-  }
-}
-
-
-
-void PrintSmartSelfExecStatus(struct ata_smart_values *data)
-{
-   pout("Self-test execution status:      ");
-   
-   switch (data->self_test_exec_status >> 4)
-   {
-      case 0:
-        pout("(%4d)\tThe previous self-test routine completed\n\t\t\t\t\t",
-                (int)data->self_test_exec_status);
-        pout("without error or no self-test has ever \n\t\t\t\t\tbeen run.\n");
-        break;
-       case 1:
-         pout("(%4d)\tThe self-test routine was aborted by\n\t\t\t\t\t",
-                 (int)data->self_test_exec_status);
-         pout("the host.\n");
-         break;
-       case 2:
-         pout("(%4d)\tThe self-test routine was interrupted\n\t\t\t\t\t",
-                 (int)data->self_test_exec_status);
-         pout("by the host with a hard or soft reset.\n");
-         break;
-       case 3:
-          pout("(%4d)\tA fatal error or unknown test error\n\t\t\t\t\t",
-                  (int)data->self_test_exec_status);
-          pout("occurred while the device was executing\n\t\t\t\t\t");
-          pout("its self-test routine and the device \n\t\t\t\t\t");
-          pout("was unable to complete the self-test \n\t\t\t\t\t");
-          pout("routine.\n");
-          break;
-       case 4:
-          pout("(%4d)\tThe previous self-test completed having\n\t\t\t\t\t",
-                  (int)data->self_test_exec_status);
-          pout("a test element that failed and the test\n\t\t\t\t\t");
-          pout("element that failed is not known.\n");
-          break;
-       case 5:
-          pout("(%4d)\tThe previous self-test completed having\n\t\t\t\t\t",
-                  (int)data->self_test_exec_status);
-          pout("the electrical element of the test\n\t\t\t\t\t");
-          pout("failed.\n");
-          break;
-       case 6:
-          pout("(%4d)\tThe previous self-test completed having\n\t\t\t\t\t",
-                  (int)data->self_test_exec_status);
-          pout("the servo (and/or seek) element of the \n\t\t\t\t\t");
-          pout("test failed.\n");
-          break;
-       case 7:
-          pout("(%4d)\tThe previous self-test completed having\n\t\t\t\t\t",
-                  (int)data->self_test_exec_status);
-          pout("the read element of the test failed.\n");
-          break;
-       case 15:
-          pout("(%4d)\tSelf-test routine in progress...\n\t\t\t\t\t",
-                  (int)data->self_test_exec_status);
-          pout("%1d0%% of test remaining.\n", 
-                  (int)(data->self_test_exec_status & 0x0f));
-          break;
-       default:
-          pout("(%4d)\tReserved.\n",
-                  (int)data->self_test_exec_status);
-          break;
-   }
-	
-}
-
-
-
-void PrintSmartTotalTimeCompleteOffline ( struct ata_smart_values *data){
-  pout("Total time to complete off-line \n");
-  pout("data collection: \t\t (%4d) seconds.\n", 
-       (int)data->total_time_to_complete_off_line);
-}
-
-
-
-void PrintSmartOfflineCollectCap(struct ata_smart_values *data)
-{
-   pout("Offline data collection\n");
-   pout("capabilities: \t\t\t (0x%02x) ",
-            (int)data->offline_data_collection_capability);
-
-   if (data->offline_data_collection_capability == 0x00)
-   {
-      pout("\tOff-line data collection not supported.\n");
-   } 
-   else 
-   {
-      pout( "%s\n", isSupportExecuteOfflineImmediate(data)?
-              "SMART execute Offline immediate." :
-              "No SMART execute Offline immediate.");
-
-      pout( "\t\t\t\t\t%s\n", isSupportAutomaticTimer(data)? 
-              "Automatic timer ON/OFF support.":
-              "No Automatic timer ON/OFF support.");
-		
-      pout( "\t\t\t\t\t%s\n", isSupportOfflineAbort(data)? 
-              "Abort Offline collection upon new\n\t\t\t\t\tcommand.":
-              "Suspend Offline collection upon new\n\t\t\t\t\tcommand.");
-
-      pout( "\t\t\t\t\t%s\n", isSupportOfflineSurfaceScan(data)? 
-              "Offline surface scan supported.":
-              "No Offline surface scan supported.");
-
-      pout( "\t\t\t\t\t%s\n", isSupportSelfTest(data)? 
-              "Self-test supported.":
-              "No Self-test supported.");
-    }
-}
-
-
-
-void PrintSmartCapability ( struct ata_smart_values *data)
-{
-   pout("SMART capabilities:            ");
-   pout("(0x%04x)\t", (int)data->smart_capability);
-   
-   if (data->smart_capability == 0x00)
-   {
-       pout("Automatic saving of SMART data\t\t\t\t\tis not implemented.\n");
-   } 
-   else 
-   {
-	
-      pout( "%s\n", (data->smart_capability & 0x01)? 
-              "Saves SMART data before entering\n\t\t\t\t\tpower-saving mode.":
-              "Does not save SMART data before\n\t\t\t\t\tentering power-saving mode.");
-		
-      if ( data->smart_capability & 0x02 )
-      {
-          pout("\t\t\t\t\tSupports SMART auto save timer.\n");
-      }
-   }
-}
-
-
-
-void PrintSmartErrorLogCapability ( struct ata_smart_values *data)
-{
-
-   pout("Error logging capability:       ");
-    
-   if ( isSmartErrorLogCapable(data) )
-   {
-      pout(" (0x%02x)\tError logging supported.\n",
-               (int)data->errorlog_capability);
-   }
-   else {
-       pout(" (0x%02x)\tError logging NOT supported.\n",
-                (int)data->errorlog_capability);
-   }
-}
-
-
-
-void PrintSmartShortSelfTestPollingTime (struct ata_smart_values *data)
-{
-   if ( isSupportSelfTest(data) )
-   {
-      pout("Short self-test routine \n");
-      pout("recommended polling time: \t (%4d) minutes.\n", 
-               (int)data->short_test_completion_time);
-
-   }
-   else
-   {
-      pout("Short self-test routine \n");
-      pout("recommended polling time: \t        Not Supported.\n");
-   }
-}
-
-
-void PrintSmartExtendedSelfTestPollingTime ( struct ata_smart_values *data)
-{
-   if ( isSupportSelfTest(data) )
-   {
-      pout("Extended self-test routine \n");
-      pout("recommended polling time: \t (%4d) minutes.\n", 
-               (int)data->extend_test_completion_time);
-   }
-   else
-   {
-      pout("Extended self-test routine \n");
-      pout("recommended polling time: \t        Not Supported.\n");
-   }
-}
-
-
-// onlyfailed=0 : print all attribute values
-// onlyfailed=1:  just ones that are currently failed and have prefailure bit set
-// onlyfailed=2:  ones that are failed, or have failed with or without prefailure bit set
-void PrintSmartAttribWithThres (struct ata_smart_values *data, 
-				struct ata_smart_thresholds *thresholds,
-				int onlyfailed){
-  int i,j;
-  long long rawvalue;
-  int needheader=1;
-    
-  // step through all vendor attributes
-  for (i=0; i<NUMBER_ATA_SMART_ATTRIBUTES; i++){
-    char *status;
-    struct ata_smart_attribute *disk=data->vendor_attributes+i;
-    struct ata_smart_threshold_entry *thre=thresholds->thres_entries+i;
-    
-    // consider only valid attributes
-    if (disk->id && thre->id){
-      char *type;
-      int failednow,failedever;
-      char attributename[64];
-
-      failednow = (disk->current <= thre->threshold);
-      failedever= (disk->worst   <= thre->threshold);
-      
-      // These break out of the loop if we are only printing certain entries...
-      if (onlyfailed==1 && (!disk->status.flag.prefailure || !failednow))
-	continue;
-      
-      if (onlyfailed==2 && !failedever)
-	continue;
-      
-      // print header only if needed
-      if (needheader){
-	if (!onlyfailed){
-	  pout("SMART Attributes Data Structure revision number: %d\n",(int)data->revnumber);
-	  pout("Vendor Specific SMART Attributes with Thresholds:\n");
-	}
-	pout("ID# ATTRIBUTE_NAME          FLAG     VALUE WORST THRESH TYPE     WHEN_FAILED RAW_VALUE\n");
-	needheader=0;
-      }
-      
-      // is this currently failed, or has it ever failed?
-      if (failednow)
-	status="FAILING_NOW";
-      else if (failedever)
-	status="In_the_past";
-      else
-	status="    -";
-      
-      // Print name of attribute
-      ataPrintSmartAttribName(attributename,disk->id);
-      pout("%-28s",attributename);
-
-      // printing line for each valid attribute
-      type=disk->status.flag.prefailure?"Pre-fail":"Old_age";
-      pout("0x%04x   %.3d   %.3d   %.3d    %-9s%-12s", 
-	     (int)disk->status.all, (int)disk->current, (int)disk->worst,
-	     (int)thre->threshold, type, status);
-      
-      // convert the six individual bytes to a long long (8 byte) integer
-      rawvalue = 0;
-      for (j = 0 ; j < 6 ; j++)
-	rawvalue |= disk->raw[j] << (8*j) ;
-      
-      // This switch statement is where we handle Raw attributes
-      // that are stored in an unusual vendor-specific format,
-      switch (disk->id){
-	// Power on time
-      case 9:
-	if (con->smart009minutes){
-	  // minutes
-	  long long tmp1=rawvalue/60;
-	  long long tmp2=rawvalue%60;
-	  pout("%llu h + %2llu m\n", tmp1, tmp2);
-	}
-	else
-	  // hours
-	  pout("%llu\n", rawvalue);  //stored in hours
-	break;
-	
-	// Temperature
-      case 194:
-	pout("%d", (int)disk->raw[0]);
-	if (rawvalue==disk->raw[0])
-	  pout("\n");
-	else
-	  // The other bytes are in use. Try IBM's model
-	  pout(" (Lifetime Min/Max %d/%d)\n",(int)disk->raw[2],
-		 (int)disk->raw[4]);
-	break;
-      default:
-	pout("%llu\n", rawvalue);
-      }
-      
-      // print a warning if there is inconsistency here!
-      if (disk->id != thre->id){
-	char atdat[64],atthr[64];
-	ataPrintSmartAttribName(atdat,disk->id);
-	ataPrintSmartAttribName(atthr,thre->id);
-	pout("%-28s<== Data Page      |  WARNING: PREVIOUS ATTRIBUTE HAS TWO\n",atdat);
-	pout("%-28s<== Threshold Page |  INCONSISTENT IDENTITIES IN THE DATA\n",atthr);
-      }
-    }
-  }
-  if (!needheader) pout("\n");
-}
-
-
-void ataPrintGeneralSmartValues(struct ata_smart_values *data){
-  pout("General SMART Values:\n");
-  
-  PrintSmartOfflineStatus(data); 
-  
-  if (isSupportSelfTest(data)){
-    PrintSmartSelfExecStatus (data);
-  }
-  
-  PrintSmartTotalTimeCompleteOffline(data);
-  PrintSmartOfflineCollectCap(data);
-  PrintSmartCapability(data);
-  
-  PrintSmartErrorLogCapability(data);
-  if (isSupportSelfTest(data)){
-    PrintSmartShortSelfTestPollingTime (data);
-    PrintSmartExtendedSelfTestPollingTime (data);
-  }
-  pout("\n");
-}
-
-// Returns nonzero if region of memory contains non-zero entries
-int nonempty(unsigned char *testarea,int n){
-  int i;
-  for (i=0;i<n;i++)
-    if (testarea[i])
-      return 1;
-  return 0;
-}
-
-// returns number of errors
-void ataPrintSmartErrorlog (struct ata_smart_errorlog *data){
-  int i,j,k;
-  
-  pout("SMART Error Log Version: %d\n", (int)data->revnumber);
-  
-  // if no errors logged, return
-  if (!data->error_log_pointer){
-    pout("No Errors Logged\n\n");
-    return;
-  }
-  QUIETON(con);
-  // If log pointer out of range, return
-  if (data->error_log_pointer>5){
-    pout("Invalid Error Log index = %02x (T13/1321D rev 1c"
-	 "Section 8.41.6.8.2.2 gives valid range from 1 to 5)\n\n",
-	 (int)data->error_log_pointer);
-    return;
-  }
-
-  // Some internal consistency checking of the data structures
-  if ((data->ata_error_count-data->error_log_pointer)%5) {
-    pout("Warning: ATA error count %d inconsistent with error log pointer %d\n\n",
-	 data->ata_error_count,data->error_log_pointer);
-  }
-  
-  // starting printing error log info
-  if (data->ata_error_count<=5)
-    pout( "ATA Error Count: %d\n", (int)data->ata_error_count);
-  else
-    pout( "ATA Error Count: %d (device log contains only the most recent five errors)\n",
-	   (int)data->ata_error_count);
-  QUIETOFF(con);
-  pout("\tDCR = Device Control Register\n");
-  pout("\tFR  = Features Register\n");
-  pout("\tSC  = Sector Count Register\n");
-  pout("\tSN  = Sector Number Register\n");
-  pout("\tCL  = Cylinder Low Register\n");
-  pout("\tCH  = Cylinder High Register\n");
-  pout("\tD/H = Device/Head Register\n");
-  pout("\tCR  = Content written to Command Register\n");
-  pout("\tER  = Error register\n");
-  pout("\tSTA = Status register\n");
-  pout("Timestamp is seconds since the previous disk power-on.\n");
-  pout("Note: timestamp \"wraps\" after 2^32 msec = 49.710 days.\n\n");
-  
-  // now step through the five error log data structures (table 39 of spec)
-  for (k = 4; k >= 0; k-- ) {
-    
-    // The error log data structure entries are a circular buffer
-    i=(data->error_log_pointer+k)%5;
-    
-    // Spec says: unused error log structures shall be zero filled
-    if (nonempty((unsigned char*)&(data->errorlog_struct[i]),sizeof(data->errorlog_struct[i]))){
-      char *msgstate;
-      switch (data->errorlog_struct[i].error_struct.state){
-      case 0x00: msgstate="in an unknown state";break;
-      case 0x01: msgstate="sleeping"; break;
-      case 0x02: msgstate="in standby mode"; break;
-      case 0x03: msgstate="active or idle"; break;
-      case 0x04: msgstate="doing SMART off-line or self test"; break;
-      default:   msgstate="in a vendor specific or reserved state";
-      }
-      // See table 42 of ATA5 spec
-      QUIETON(con);
-      pout("Error %d occurred at disk power-on lifetime: %d hours\n",
-	     (int)(data->ata_error_count+k-4), (int)data->errorlog_struct[i].error_struct.timestamp);
-      QUIETOFF(con);
-      pout("When the command that caused the error occurred, the device was %s.\n",msgstate);
-      pout("After command completion occurred, registers were:\n");
-      pout("ER:%02x SC:%02x SN:%02x CL:%02x CH:%02x D/H:%02x ST:%02x\n",
-	   (int)data->errorlog_struct[i].error_struct.error_register,
-	   (int)data->errorlog_struct[i].error_struct.sector_count,
-	   (int)data->errorlog_struct[i].error_struct.sector_number,
-	   (int)data->errorlog_struct[i].error_struct.cylinder_low,
-	   (int)data->errorlog_struct[i].error_struct.cylinder_high,
-	   (int)data->errorlog_struct[i].error_struct.drive_head,
-	   (int)data->errorlog_struct[i].error_struct.status);
-      pout("Sequence of commands leading to the command that caused the error were:\n");
-      pout("DCR   FR   SC   SN   CL   CH   D/H   CR   Timestamp\n");
-      for ( j = 4; j >= 0; j--){
-	struct ata_smart_errorlog_command_struct *thiscommand=&(data->errorlog_struct[i].commands[j]);
-	
-	// Spec says: unused data command structures shall be zero filled
-	if (nonempty((unsigned char*)thiscommand,sizeof(*thiscommand)))
-	  pout(" %02x   %02x   %02x   %02x   %02x   %02x    %02x   %02x     %d.%03d\n", 
-	       (int)thiscommand->devicecontrolreg,
-	       (int)thiscommand->featuresreg,
-	       (int)thiscommand->sector_count,
-	       (int)thiscommand->sector_number,
-	       (int)thiscommand->cylinder_low,
-	       (int)thiscommand->cylinder_high,
-	       (int)thiscommand->drive_head,
-	       (int)thiscommand->commandreg,
-	       (unsigned int)(thiscommand->timestamp / 1000U),
-	       (unsigned int)(thiscommand->timestamp % 1000U)); 
-      }
-      pout("\n");
-    }
-  }
-  QUIETON(con);
-  if (con->quietmode)
-    pout("\n");
-  QUIETOFF(con);
-  return;  
-}
-
-// return value is number of entries found where the self-test showed an error
-int ataPrintSmartSelfTestlog(struct ata_smart_selftestlog *data,int allentries){
-  int i,j,noheaderprinted=1;
-  int retval=0;
-
-  if (allentries)
-    pout("SMART Self-test log, version number %d\n",(int)data->revnumber);
-  if ((data->revnumber!=0x0001) && allentries)
-    pout("Warning - structure revision number does not match spec!\n");
-  if (data->mostrecenttest==0){
-    if (allentries)
-      pout("No self-tests have been logged\n\n");
-    return 0;
-  }
-
-  // print log      
-  for (i=20;i>=0;i--){    
-    struct ata_smart_selftestlog_struct *log;
-    // log is a circular buffer
-    j=(i+data->mostrecenttest)%21;
-    log=data->selftest_struct+j;
-
-    if (nonempty((unsigned char*)log,sizeof(*log))){
-      char *msgtest,*msgstat,percent[64],firstlba[64];
-      int errorfound=0;
-
-      // test name
-      switch(log->selftestnumber){
-      case   0: msgtest="Off-line           "; break;
-      case   1: msgtest="Short off-line     "; break;
-      case   2: msgtest="Extended off-line  "; break;
-      case 127: msgtest="Abort off-line test"; break;
-      case 129: msgtest="Short captive      "; break;
-      case 130: msgtest="Extended captive   "; break;
-      default:  msgtest="Unknown test       ";
-      }
-      
-      // test status
-      switch((log->selfteststatus)>>4){
-      case  0:msgstat="Completed                    "; break;
-      case  1:msgstat="Aborted by host              "; break;
-      case  2:msgstat="Interrupted (host reset)     "; break;
-      case  3:msgstat="Fatal or unknown error       "; errorfound=1; break;
-      case  4:msgstat="Completed: unknown failure   "; errorfound=1; break;
-      case  5:msgstat="Completed: electrical failure"; errorfound=1; break;
-      case  6:msgstat="Completed: servo/seek failure"; errorfound=1; break;
-      case  7:msgstat="Completed: read failure      "; errorfound=1; break;
-      case 15:msgstat="Test in progress             "; break;
-      default:msgstat="Unknown test status          ";
-      }
-
-      retval+=errorfound;
-      sprintf(percent,"%1d0%%",(log->selfteststatus)&0xf);
-
-      // T13/1321D revision 1c: (Data structure Rev #1)
-
-      //The failing LBA shall be the LBA of the uncorrectable sector
-      //that caused the test to fail. If the device encountered more
-      //than one uncorrectable sector during the test, this field
-      //shall indicate the LBA of the first uncorrectable sector
-      //encountered. If the test passed or the test failed for some
-      //reason other than an uncorrectable sector, the value of this
-      //field is undefined.
-
-      // This is true in ALL ATA-5 specs
-      
-      if (!errorfound || log->lbafirstfailure==0xffffffff || log->lbafirstfailure==0x00000000)
-	sprintf(firstlba,"%s","");
-      else	
-	sprintf(firstlba,"0x%08x",log->lbafirstfailure);
-
-      if (noheaderprinted && (allentries || errorfound)){
-	pout("Num  Test_Description    Status                  Remaining  LifeTime(hours)  LBA_of_first_error\n");
-	noheaderprinted=0;
-      }
-      
-      if (allentries || errorfound)
-	pout("#%2d  %s %s %s  %8d         %s\n",21-i,msgtest,msgstat,
-	     percent,(int)log->timestamp,firstlba);
-    }
-  }
-  if (!allentries && retval)
-    pout("\n");
-  return retval;
-}
-
-void ataPseudoCheckSmart ( struct ata_smart_values *data, 
-                           struct ata_smart_thresholds *thresholds) {
-  int i;
-  int failed = 0;
-  for (i = 0 ; i < NUMBER_ATA_SMART_ATTRIBUTES ; i++) {
-    if (data->vendor_attributes[i].id &&   
-	thresholds->thres_entries[i].id &&
-	data->vendor_attributes[i].status.flag.prefailure &&
-	(data->vendor_attributes[i].current <= thresholds->thres_entries[i].threshold) &&
-	(thresholds->thres_entries[i].threshold != 0xFE)){
-      pout("Attribute ID %d Failed\n",(int)data->vendor_attributes[i].id);
-      failed = 1;
-    } 
-  }   
-  pout("%s\n", ( failed )?
-	 "SMART overall-health self-assessment test result: FAILED!\n"
-	 "Drive failure expected in less than 24 hours. SAVE ALL DATA":
-	 "SMART overall-health self-assessment test result: PASSED");
-}
-
-
-// Compares failure type to policy in effect, and either exits or
-// simply returns to the calling routine.
-void failuretest(int type, int returnvalue){
-
-  // If this is an error in an "optional" SMART command
-  if (type==OPTIONAL_CMD){
-    if (con->conservative){
-      pout("An optional SMART command has failed: exiting.  To continue, turn off the -%c option\n",
-	   ULTRACONSERVATIVE);
-      exit(returnvalue);
-    }
-    return;
-  }
-
-  // If this is an error in a "mandatory" SMART command
-  if (type==MANDATORY_CMD){
-    if (con->permissive)
-      return;
-    pout("A mandatory SMART command has failed: exiting. To continue, turn on the -%c option\n",
-	 PERMISSIVE);
-    exit(returnvalue);
-  }
-
-  fprintf(stderr,"Smartctl internal error in failuretest(type=%d). Please contact %s\n",type,PROJECTHOME);
-  exit(returnvalue|FAILCMD);
-}
-
-// Used to warn users about invalid checksums.  However we will not
-// abort on invalid checksums.
-void checksumwarning(const char *string){
-  pout("Warning! %s error: invalid SMART checksum.\n",string);
-  if (con->checksumfail)
-    exit(FAILSMART);
-  return;
-}
-
-// Initialize to zero just in case some SMART routines don't work
-struct hd_driveid drive;
-struct ata_smart_values smartval;
-struct ata_smart_thresholds smartthres;
-struct ata_smart_errorlog smarterror;
-struct ata_smart_selftestlog smartselftest;
-
-int ataPrintMain (int fd){
-  int timewait,code;
-  int returnval=0;
-
-  // Start by getting Drive ID information.  We need this, to know if SMART is supported.
-  if (ataReadHDIdentity(fd,&drive)){
-    pout("Smartctl: Hard Drive Read Identity Failed\n\n");
-    failuretest(MANDATORY_CMD, returnval|=FAILID);
-  }
-  
-  // Print most drive identity information if requested
-  if (con->driveinfo){
-    pout("=== START OF INFORMATION SECTION ===\n");
-    ataPrintDriveInfo(&drive);
-  }
-  
-  // now check if drive supports SMART; otherwise time to exit
-  if (!ataSmartSupport(&drive)){
-    pout("SMART support is: Unavailable - device lacks SMART capability.\n");
-    failuretest(MANDATORY_CMD, returnval|=FAILSMART);
-    pout("                  Checking to be sure by trying SMART ENABLE command.\n");
-    if (ataEnableSmart(fd)){
-      pout("                  No SMART functionality found. Sorry.\n");
-      failuretest(MANDATORY_CMD,returnval|=FAILSMART);
-    }
-    else
-      pout("                  SMART appears to work.  Continuing.\n"); 
-    if (!con->driveinfo) pout("\n");
-  }
-  
-  // Now print remaining drive info: is SMART enabled?    
-  if (con->driveinfo){
-    pout("SMART support is: Available - device has SMART capability.\n");
-    if (ataDoesSmartWork(fd))
-      pout("SMART support is: Enabled\n");
-    else
-      pout("SMART support is: Disabled\n");
-    pout("\n");
-  }
-
-  
-  // START OF THE ENABLE/DISABLE SECTION OF THE CODE
-  if (con->smartenable || con->smartdisable || 
-      con->smartautosaveenable || con->smartautosavedisable || 
-      con->smartautoofflineenable || con->smartautoofflinedisable)
-    pout("=== START OF ENABLE/DISABLE COMMANDS SECTION ===\n");
-  
-  // Enable/Disable SMART commands
-  if (con->smartenable){
-    if (ataEnableSmart(fd)) {
-      pout("Smartctl: SMART Enable Failed.\n\n");
-      failuretest(MANDATORY_CMD, returnval|=FAILSMART);
-    }
-    else
-      pout("SMART Enabled.\n");
-  }
-  
-  // From here on, every command requires that SMART be enabled...
-  if (!ataDoesSmartWork(fd)) {
-    pout("SMART Disabled. Use option -%c to enable it.\n", (int)SMARTENABLE );
-    return returnval;
-  }
-  
-  // Turn off SMART on device
-  if (con->smartdisable){    
-    if (ataDisableSmart(fd)) {
-      pout( "Smartctl: SMART Disable Failed.\n\n");
-      failuretest(MANDATORY_CMD,returnval|=FAILSMART);
-    }
-    pout("SMART Disabled. Use option -%c to enable it.\n",(int)SMARTENABLE);
-    return returnval;		
-  }
-  
-  // Let's ALWAYS issue this command to get the SMART status
-  code=ataSmartStatus2(fd);
-  if (code==-1)
-    failuretest(MANDATORY_CMD, returnval|=FAILSMART);
-
-  // Enable/Disable Auto-save attributes
-  if (con->smartautosaveenable){
-    if (ataEnableAutoSave(fd)){
-      pout( "Smartctl: SMART Enable Attribute Autosave Failed.\n\n");
-      failuretest(MANDATORY_CMD, returnval|=FAILSMART);
-    }
-    else
-      pout("SMART Attribute Autosave Enabled.\n");
-  }
-  if (con->smartautosavedisable){
-    if (ataDisableAutoSave(fd)){
-      pout( "Smartctl: SMART Disable Attribute Autosave Failed.\n\n");
-      failuretest(MANDATORY_CMD, returnval|=FAILSMART);
-    }
-    else
-      pout("SMART Attribute Autosave Disabled.\n");
-  }
-  
-  // for everything else read values and thresholds are needed
-  if (ataReadSmartValues(fd, &smartval)){
-    pout("Smartctl: SMART Read Values failed.\n\n");
-    failuretest(OPTIONAL_CMD, returnval|=FAILSMART);
-  }
-  if (ataReadSmartThresholds(fd, &smartthres)){
-    pout("Smartctl: SMART Read Thresholds failed.\n\n");
-    failuretest(OPTIONAL_CMD, returnval|=FAILSMART);
-  }
-
-  // Enable/Disable Off-line testing
-  if (con->smartautoofflineenable){
-    if (!isSupportAutomaticTimer(&smartval)){
-      pout("Warning: device does not support SMART Automatic Timers.\n\n");
-      failuretest(OPTIONAL_CMD, returnval|=FAILSMART);
-    }
-    if (ataEnableAutoOffline(fd)){
-      pout( "Smartctl: SMART Enable Automatic Offline Failed.\n\n");
-      failuretest(OPTIONAL_CMD, returnval|=FAILSMART);
-    }
-    else
-      pout("SMART Automatic Offline Testing Enabled every four hours.\n");
-  }
-  if (con->smartautoofflinedisable){
-    if (!isSupportAutomaticTimer(&smartval)){
-      pout("Warning: device does not support SMART Automatic Timers.\n\n");
-      failuretest(OPTIONAL_CMD, returnval|=FAILSMART);
-    }
-    if (ataDisableAutoOffline(fd)){
-      pout("Smartctl: SMART Disable Automatic Offline Failed.\n\n");
-      failuretest(OPTIONAL_CMD, returnval|=FAILSMART);
-    }
-    else
-      pout("SMART Automatic Offline Testing Disabled.\n");
-  }
-
-  // all this for a newline!
-  if (con->smartenable || con->smartdisable || 
-      con->smartautosaveenable || con->smartautosavedisable || 
-      con->smartautoofflineenable || con->smartautoofflinedisable)
-    pout("\n");
-
-  // START OF READ-ONLY OPTIONS APART FROM -V and -i
-  if (con->checksmart || con->generalsmartvalues || con->smartvendorattrib || con->smarterrorlog || con->smartselftestlog)
-    pout("=== START OF READ SMART DATA SECTION ===\n");
-  
-  // Check SMART status (use previously returned value)
-  if (con->checksmart){
-    if (code) {
-      QUIETON(con);
-      pout("SMART overall-health self-assessment test result: FAILED!\n"
-	     "Drive failure expected in less than 24 hours. SAVE ALL DATA.\n");
-      QUIETOFF(con);
-      if (ataCheckSmart(&smartval, &smartthres,1)){
-	returnval|=FAILATTR;
-	if (con->smartvendorattrib)
-	  pout("See vendor-specific Attribute list for failed Attributes.\n\n");
-	else {
-	  QUIETON(con);
-	  pout("Failed Attributes:\n");
-	  PrintSmartAttribWithThres(&smartval, &smartthres,1);
-	}
-      }
-      else
-	pout("No failed Attributes found.\n\n");   
-      returnval|=FAILSTATUS;
-      QUIETOFF(con);
-    }
-    else {
-      pout("SMART overall-health self-assessment test result: PASSED\n");
-      if (ataCheckSmart(&smartval, &smartthres,0)){
-	if (con->smartvendorattrib)
-	  pout("See vendor-specific Attribute list for marginal Attributes.\n\n");
-	else {
-	  QUIETON(con);
-	  pout("Please note the following marginal Attributes:\n");
-	  PrintSmartAttribWithThres(&smartval, &smartthres,2);
-	} 
-	returnval|=FAILAGE;
-      }
-      else
-	pout("\n");
-    }
-    QUIETOFF(con);
-  }
-  
-  // Print general SMART values
-  if (con->generalsmartvalues)
-    ataPrintGeneralSmartValues(&smartval); 
-  
-  // Print vendor-specific attributes
-  if (con->smartvendorattrib){
-    QUIETON(con);
-    PrintSmartAttribWithThres(&smartval, &smartthres,con->quietmode?2:0);
-    QUIETOFF(con);
-  }
-  
-  // Print SMART error log
-  if (con->smarterrorlog){
-    if (!isSmartErrorLogCapable(&smartval)){
-      pout("Warning: device does not support Error Logging\n");
-      failuretest(OPTIONAL_CMD, returnval|=FAILSMART);
-    }
-    if (ataReadErrorLog(fd, &smarterror)){
-      pout("Smartctl: SMART Errorlog Read Failed\n");
-      failuretest(OPTIONAL_CMD, returnval|=FAILSMART);
-    }
-    else {
-      // quiet mode is turned on inside ataPrintSmartErrorLog()
-      ataPrintSmartErrorlog(&smarterror);
-      QUIETOFF(con);
-    }
-  }
-  
-  // Print SMART self-test log
-  if (con->smartselftestlog){
-    if (!isSmartErrorLogCapable(&smartval)){
-      pout("Warning: device does not support Self Test Logging\n");
-      failuretest(OPTIONAL_CMD, returnval|=FAILSMART);
-    }    
-    else {
-      if(ataReadSelfTestLog(fd, &smartselftest)){
-	pout("Smartctl: SMART Self Test Log Read Failed\n");
-	failuretest(OPTIONAL_CMD, returnval|=FAILSMART);
-      }
-      else {
-	QUIETON(con);
-	if (ataPrintSmartSelfTestlog(&smartselftest,!con->quietmode))
-	  returnval|=FAILLOG;
-	QUIETOFF(con);
-	pout("\n");
-      }
-    } 
-  }
-  
-  // START OF THE TESTING SECTION OF THE CODE.  IF NO TESTING, RETURN
-  if (con->testcase==-1)
-    return returnval;
-  
-  pout("=== START OF OFFLINE IMMEDIATE AND SELF-TEST SECTION ===\n");
-  // if doing a self-test, be sure it's supported by the hardware
-  if (con->testcase==OFFLINE_FULL_SCAN &&  !isSupportExecuteOfflineImmediate(&smartval)){
-    pout("Warning: device does not support Execute Off-Line Immediate function.\n\n");
-    failuretest(OPTIONAL_CMD, returnval|=FAILSMART);
-  }
-  else if (!isSupportSelfTest(&smartval)){
-    pout("Warning: device does not support Self-Test functions.\n\n");
-    failuretest(OPTIONAL_CMD, returnval|=FAILSMART);
-  }
-  // Now do the test
-  if (ataSmartTest(fd, con->testcase))
-    failuretest(OPTIONAL_CMD, returnval|=FAILSMART);
-  
-  // Tell user how long test will take to complete  
-  if ((timewait=TestTime(&smartval,con->testcase))){ 
-    pout("Please wait %d %s for test to complete.\n",
-	    (int)timewait, con->testcase==OFFLINE_FULL_SCAN?"seconds":"minutes");
-    
-    if (con->testcase!=SHORT_CAPTIVE_SELF_TEST && con->testcase!=EXTEND_CAPTIVE_SELF_TEST)
-      pout("Use smartctl -%c to abort test.\n", (int)SMARTSELFTESTABORT);	
-  }    
-  return returnval;
-}
diff --git a/sm5/scsicmds.cpp b/sm5/scsicmds.cpp
deleted file mode 100644
index 8afc8cba7b08e550c10c839b5e8eae34108752a4..0000000000000000000000000000000000000000
--- a/sm5/scsicmds.cpp
+++ /dev/null
@@ -1,819 +0,0 @@
-/*
- * scsicmds.c
- *
- * Home page of code is: http://smartmontools.sourceforge.net
- *
- * Copyright (C) 2002 Bruce Allen <smartmontools-support@lists.sourceforge.net>
- * Copyright (C) 1999-2000 Michael Cornwell <cornwell@acm.org>
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * This code was originally developed as a Senior Thesis by Michael Cornwell
- * at the Concurrent Systems Laboratory (now part of the Storage Systems
- * Research Center), Jack Baskin School of Engineering, University of
- * California, Santa Cruz. http://ssrc.soe.ucsc.edu/
- *
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <getopt.h>
-#include <unistd.h>
-#include <sys/ioctl.h>
-#include <linux/hdreg.h>
-// We do NOT want to include the kernel SCSI header file, just user space one
-#define  _LINUX_SCSI_H
-#include <scsi/scsi.h>
-#include "scsicmds.h"
-
-const char *CVSid3="$Id: scsicmds.cpp,v 1.13 2002/11/17 05:30:11 ballen4705 Exp $" CVSID4;
-
-
-UINT8 logsense (int device, UINT8 pagenum, UINT8 *pBuf)
-{
-  struct cdb10hdr *ioctlhdr;
-  UINT8 tBuf[1024 + CDB_12_HDR_SIZE];
-  UINT8 status;
-
-  
-  memset ( &tBuf, 0, 255);
-    
-  ioctlhdr = (struct cdb10hdr *) &tBuf;
-  
-  ioctlhdr->inbufsize = 0;
-  ioctlhdr->outbufsize = 1024;
-   
-  ioctlhdr->cdb[0] = LOG_SENSE;
-  ioctlhdr->cdb[1] = 0x00;
-  ioctlhdr->cdb[2] = 0x40 | pagenum;
-  ioctlhdr->cdb[3] = 0x00;
-  ioctlhdr->cdb[4] = 0x00;
-  ioctlhdr->cdb[5] = 0x00;
-  ioctlhdr->cdb[6] = 0x00;
-  ioctlhdr->cdb[7] = 0x04;
-  ioctlhdr->cdb[8] = 0x00;
-  ioctlhdr->cdb[9] = 0x00;
-
-  status =  ioctl( device, 1 , &tBuf);
-
-	
-  memcpy ( pBuf, &tBuf[8], 1024); 
-
-  return status;
-  
-}
-
-
-
-
-UINT8 modesense (int device,  UINT8 pagenum, UINT8 *pBuf)
-{
-  
-  UINT8 tBuf[CDB_6_MAX_DATA_SIZE + CDB_6_HDR_SIZE ];
- 
-  struct cdb6hdr *ioctlhdr;
-  	
-  UINT8 status;
-
-  memset ( &tBuf, 0, CDB_6_MAX_DATA_SIZE + CDB_6_HDR_SIZE );
-  
-  ioctlhdr = (struct cdb6hdr *) &tBuf;
-  
-  ioctlhdr->inbufsize = 0;
-  ioctlhdr->outbufsize = 0xff;
-   
-  ioctlhdr->cdb[0] = MODE_SENSE;
-  ioctlhdr->cdb[1] = 0x00;
-  ioctlhdr->cdb[2] = pagenum;
-  ioctlhdr->cdb[3] = 0x00;
-  ioctlhdr->cdb[4] = CDB_6_MAX_DATA_SIZE;
-  ioctlhdr->cdb[5] = 0x00;
-  
-  
-  status =  ioctl( device, 1 , &tBuf);
-  
-  memcpy ( pBuf, &tBuf[8], 256); 
-
-  return status;
-
-}
-
-
-
-
-UINT8 modeselect (int device,  UINT8 pagenum, UINT8 *pBuf)
-{
-  struct cdb6hdr *ioctlhdr;
-  UINT8 tBuf[CDB_6_MAX_DATA_SIZE + CDB_6_HDR_SIZE ];
-  UINT8 status;
-
-  memset ( &tBuf, 0, CDB_6_MAX_DATA_SIZE + CDB_6_HDR_SIZE );
-
-  ioctlhdr = (struct cdb6hdr *) &tBuf;
-  
-  ioctlhdr->inbufsize = pBuf[0] + 1;
-  ioctlhdr->outbufsize = 0;
-  
-  
-  ioctlhdr->cdb[0] = MODE_SELECT;
-  ioctlhdr->cdb[1] = 0x11;
-  ioctlhdr->cdb[2] = 0x00;
-  ioctlhdr->cdb[3] = 0x00;
-  ioctlhdr->cdb[4] = pBuf[0] + 1;
-  ioctlhdr->cdb[5] = 0x00;
-  
-  tBuf[CDB_6_HDR_SIZE + 3]  = 0x08;
-  tBuf[CDB_6_HDR_SIZE + 10] = 0x02;
-  
-    
-  memcpy ( &tBuf[ CDB_6_HDR_SIZE + MODE_DATA_HDR_SIZE],
-			 pBuf +  MODE_DATA_HDR_SIZE,
-			pBuf[0] - MODE_DATA_HDR_SIZE + 1);
-
-  tBuf[26] &= 0x3f;		
- 
-  status = ioctl( device, 1 , &tBuf);
-
-  return status;
-
-}
-
-
-
-
-UINT8 modesense10 (int device, UINT8 pagenum, UINT8 *pBuf)
-{
-  
-    struct cdb10hdr *ioctlhdr;
-  UINT8 tBuf[1024];
-  UINT8 status;
-	
-  memset ( &tBuf, 0, 1024);
-    
-  ioctlhdr = (struct cdb10hdr *) &tBuf;
-  
-  ioctlhdr->inbufsize = 0;
-  ioctlhdr->outbufsize = 0xff;
-   
-  ioctlhdr->cdb[0] = MODE_SELECT_10;
-  ioctlhdr->cdb[1] = 0x00;
-  ioctlhdr->cdb[2] = 0x11;
-  ioctlhdr->cdb[3] = 0x00;
-  ioctlhdr->cdb[4] = 0x00;
-  ioctlhdr->cdb[5] = 0x00;
-  ioctlhdr->cdb[6] = 0x00;
-  ioctlhdr->cdb[7] = 0x00;
-  ioctlhdr->cdb[8] = 0xff;
-  ioctlhdr->cdb[9] = 0x00;
-
-  status =  ioctl( device, 1 , &tBuf);
- 
-  memcpy ( pBuf, &tBuf[8], 0xff); 
-  
-  return status;
-
-}
-
-
-
-
-UINT8 modeselect10 (int device,  UINT8 pagenum, UINT8 *pBuf)
-{
-  struct cdb10hdr *ioctlhdr;
-  UINT8 tBuf[CDB_10_MAX_DATA_SIZE + CDB_10_HDR_SIZE ];
-  UINT8 status;
-
-  memset ( &tBuf, 0, CDB_10_MAX_DATA_SIZE + CDB_10_HDR_SIZE );
-
-  ioctlhdr = (struct cdb10hdr *) &tBuf;
-  
-  ioctlhdr->inbufsize = pBuf[0] + 1;
-  ioctlhdr->outbufsize = 0;
-  
-  ioctlhdr->cdb[0] = MODE_SELECT_10;
-  ioctlhdr->cdb[1] = 0x00;
-  ioctlhdr->cdb[2] = pagenum;
-  ioctlhdr->cdb[3] = 0x00;
-  ioctlhdr->cdb[4] = 0x00;
-  ioctlhdr->cdb[5] = 0x00;
-  ioctlhdr->cdb[6] = 0x00;
-  ioctlhdr->cdb[7] = 0x00;
-  ioctlhdr->cdb[8] = pBuf[0] + 1;
-  ioctlhdr->cdb[9] = 0x00;
-  
-  tBuf[CDB_10_HDR_SIZE + 3]  = 0x08;
-  tBuf[CDB_10_HDR_SIZE + 10] = 0x02;
-  
-    
-  memcpy ( &tBuf[ CDB_10_HDR_SIZE + MODE_DATA_HDR_SIZE],
-			 pBuf +  MODE_DATA_HDR_SIZE,
-			pBuf[0] - MODE_DATA_HDR_SIZE + 1);
-
-  tBuf[26] &= 0x3f;		
- 
-  status = ioctl( device, 1 , &tBuf);
-
-  return status;
-
-}
-
-
-
-
-UINT8 stdinquiry ( int device, UINT8 *pBuf)
-{
- 
-  UINT8 tBuf[CDB_6_MAX_DATA_SIZE + CDB_6_HDR_SIZE ];
- 
-  struct cdb6hdr *ioctlhdr;
-  	
-  UINT8 status;
-
-  memset ( &tBuf, 0, CDB_6_MAX_DATA_SIZE + CDB_6_HDR_SIZE );
-  
-  ioctlhdr = (struct cdb6hdr *) &tBuf;
-  
-  ioctlhdr->inbufsize = 0;
-  ioctlhdr->outbufsize = CDB_6_MAX_DATA_SIZE;
-   
-  ioctlhdr->cdb[0] = INQUIRY;
-  ioctlhdr->cdb[1] = 0x00;
-  ioctlhdr->cdb[2] = 0x00;
-  ioctlhdr->cdb[3] = 0x00;
-  ioctlhdr->cdb[4] = CDB_6_MAX_DATA_SIZE;
-  ioctlhdr->cdb[5] = 0x00;
-  
-  
-  status =  ioctl( device, 1, &tBuf );
-  
-  memcpy ( pBuf, &tBuf[8], 255); 
-
-  return status;
-
-}
-
-
-
-
-UINT8 inquiry ( int device, UINT8 pagenum, UINT8 *pBuf)
-{
- 
-  UINT8 tBuf[CDB_6_MAX_DATA_SIZE + CDB_6_HDR_SIZE ];
- 
-  struct cdb6hdr *ioctlhdr;
-  	
-  UINT8 status;
-
-  memset ( &tBuf, 0, CDB_6_MAX_DATA_SIZE + CDB_6_HDR_SIZE );
-  
-  ioctlhdr = (struct cdb6hdr *) &tBuf;
-  
-  ioctlhdr->inbufsize = 0;
-  ioctlhdr->outbufsize = 0xff;
-   
-  ioctlhdr->cdb[0] = INQUIRY;
-  ioctlhdr->cdb[1] = 0x01;
-  ioctlhdr->cdb[2] = 0x00;
-  ioctlhdr->cdb[3] = pagenum;
-  ioctlhdr->cdb[4] = CDB_6_MAX_DATA_SIZE;
-  ioctlhdr->cdb[5] = 0x00;
-  
-  
-  status =  ioctl( device, 6 , &tBuf);
-  /*status =  ioctl( device, 1 , &tBuf);*/
-  
-  memcpy ( pBuf, &tBuf[8], 255); 
-
-  return status;
-
-}
-
-
-
-
-UINT8 requestsense (int device, UINT8 *pBuf)
-{
-    
-  UINT8 tBuf[CDB_6_MAX_DATA_SIZE + CDB_6_HDR_SIZE ];
- 
-  struct cdb6hdr *ioctlhdr;
-  	
-  UINT8 status;
-
-  memset ( &tBuf, 0, CDB_6_MAX_DATA_SIZE + CDB_6_HDR_SIZE );
-  
-  ioctlhdr = (struct cdb6hdr *) &tBuf;
-  
-  ioctlhdr->inbufsize = 0;
-  ioctlhdr->outbufsize = 0xff;
-   
-  ioctlhdr->cdb[0] = REQUEST_SENSE;
-  ioctlhdr->cdb[1] = 0x00;
-  ioctlhdr->cdb[2] = 0x00;
-  ioctlhdr->cdb[3] = 0x00;
-  ioctlhdr->cdb[4] = CDB_6_MAX_DATA_SIZE;
-  ioctlhdr->cdb[5] = 0x00;
-  
-  
-  status =  ioctl( device, 1 , &tBuf);
-  
-  memcpy ( pBuf, &tBuf[8], 255); 
-
-  return status;
-}
-
-
-UINT8 senddiagnostic (int device, UINT8 functioncode,  UINT8 *pBuf)
-{
-  UINT8 tBuf[CDB_6_MAX_DATA_SIZE + CDB_6_HDR_SIZE ];
- 
-  struct cdb6hdr *ioctlhdr;
-  	
-  UINT8 status;
-
-  memset ( &tBuf, 0, CDB_6_MAX_DATA_SIZE + CDB_6_HDR_SIZE );
-  
-  ioctlhdr = (struct cdb6hdr *) &tBuf;
-  
-  ioctlhdr->inbufsize = 0;
-  ioctlhdr->outbufsize = 0xff;
-   
-  ioctlhdr->cdb[0] = SEND_DIAGNOSTIC;
-  
-  if (functioncode != SCSI_DIAG_SELF_TEST)
-	ioctlhdr->cdb[1] = ( functioncode <<5 ) | 0x10;
-  
-  ioctlhdr->cdb[2] = 0x00;
-  ioctlhdr->cdb[3] = 0x00;
-  ioctlhdr->cdb[4] = 0x00;
-  ioctlhdr->cdb[5] = 0x00;
-  
-  if (pBuf != NULL)
-  {
-	  ioctlhdr->inbufsize = pBuf[0];	
-      ioctlhdr->cdb[4] = pBuf[0];
-	  memcpy ( &tBuf[CDB_6_HDR_SIZE],
-				pBuf + 1,
-				pBuf[0]);
-  }
-
-  status =  ioctl( device, 1 , &tBuf);
-  
-  if (pBuf != NULL)
-  	memcpy ( pBuf, &tBuf[8], 256); 
-
-  return status;
-
-}
-
-
-
-UINT8 receivediagnostic (int device, UINT8 pagenum,  UINT8 *pBuf)
-{
-  UINT8 tBuf[CDB_6_MAX_DATA_SIZE + CDB_6_HDR_SIZE ];
- 
-  struct cdb6hdr *ioctlhdr;
-  	
-  UINT8 status;
-
-  memset ( &tBuf, 0, CDB_6_MAX_DATA_SIZE + CDB_6_HDR_SIZE );
-  
-  ioctlhdr = (struct cdb6hdr *) &tBuf;
-  
-  ioctlhdr->inbufsize = 0;
-  ioctlhdr->outbufsize = 0xff;
-   
-  ioctlhdr->cdb[0] = RECEIVE_DIAGNOSTIC;
-  
-  ioctlhdr->cdb[1] = 0x01;
-  
-  ioctlhdr->cdb[2] = pagenum;
-  ioctlhdr->cdb[3] = 0x00;
-  ioctlhdr->cdb[4] = 0x00;
-  ioctlhdr->cdb[5] = 0x00;
-  
-
-  status =  ioctl( device, 1 , &tBuf);
-  
-  memcpy ( pBuf, &tBuf[8], 256); 
-
-  return status;
-
-}
-
-// See if the device accepts IOCTLs at all...
-UINT8 testunitnotready (int device)
-{
-  return ioctl( device, 2 , NULL);
-
-}
-
-
-
-
-/* ModePage1C Handler */
-
-#define SMART_SUPPORT	0x00	
-
-UINT8 scsiSmartModePage1CHandler (int device, UINT8 setting, UINT8 *retval)
-{
-	char tBuf[CDB_6_MAX_DATA_SIZE];
-	
-	if (modesense ( device, 0x1c, (UINT8 *) &tBuf) != 0)
-	{
-		return 1;
-	}
-	
-	switch (setting)
-	{
-		case DEXCPT_DISABLE:
- 			tBuf[14] &= 0xf7;
-			tBuf[15] = 0x04;
-			break;
-		case DEXCPT_ENABLE:
-			tBuf[14] |= 0x08;
-			break;
-		case EWASC_ENABLE:
-			tBuf[14] |= 0x10;
-			break;
-		case EWASC_DISABLE:
-			tBuf[14] &= 0xef;
-			break;
-		case SMART_SUPPORT:
-			*retval = tBuf[14] & 0x08;
-			return 0;
-			break;
-		default:
-			return 1;
-	}
-			
-	if (modeselect ( device, 0x1c, (UINT8 *) &tBuf ) != 0)
-	{
-		return 1;
-	}
-	
-	return 0;
-}
-
-
-
-
-UINT8 scsiSmartSupport (int device, UINT8 *retval)
-{
-	return scsiSmartModePage1CHandler( device, SMART_SUPPORT, retval);
-}
-
-
-
-
-UINT8 scsiSmartEWASCEnable (int device)
-{
-	return scsiSmartModePage1CHandler( device, EWASC_ENABLE, NULL);
-}
-
-
-
-
-UINT8 scsiSmartEWASCDisable (int device)
-{
-	return scsiSmartModePage1CHandler( device, EWASC_DISABLE, NULL);
-}
-
-
-
-
-UINT8 scsiSmartDEXCPTEnable (int device)
-{
-	return scsiSmartModePage1CHandler( device, DEXCPT_ENABLE, NULL);
-}
-
-
-
-
-UINT8 scsiSmartDEXCPTDisable (int device)
-{
-	return scsiSmartModePage1CHandler( device, DEXCPT_DISABLE, NULL);
-}
-
-UINT8 scsiGetTemp ( int device, UINT8 *currenttemp, UINT8 *triptemp)
-{
-    
-   UINT8 tBuf[1024];
-
-  if (logsense ( device , TEMPERATURE_PAGE, (UINT8 *) &tBuf) != 0)
-  {
-     perror ( "Log Sense failed");
-     exit (1);
-  }
-  *currenttemp = tBuf[9];
-  *triptemp = tBuf[15];
-  return 0;
-}
-
-UINT8 scsiCheckSmart(int device, UINT8 method, UINT8 *retval,
-                     UINT8 *currenttemp, UINT8 *triptemp)
-{
-   UINT8 tBuf[1024];
-   UINT8 asc;
-   UINT8 ascq;
-   unsigned short pagesize;
- 
-   *currenttemp = *triptemp = 0;
-  
-   if ( method == CHECK_SMART_BY_LGPG_2F)
-   {
-      if (logsense ( device , SMART_PAGE, (UINT8 *) &tBuf) != 0)
-      {
-	perror ( "Log Sense failed");
-	exit (1);
-      }
-
-      pagesize = (unsigned short) (tBuf[2] << 8) | tBuf[3];
-
-      if ( !pagesize )
-      {
-	/* failed read of page 2F\n */
-	return 1;
-      } 
-
-      asc  = tBuf[8]; 
-      ascq = tBuf[9];
-
-      if ( pagesize == 8 && (currenttemp != NULL) && (triptemp != NULL) )
-      {
-	*currenttemp = tBuf[10];
-	*triptemp =  tBuf[11];
-      }	
-
-   }
-   else
-   {
-      if (requestsense ( device , (UINT8 *) &tBuf) != 0)
-      {
-	perror ( "Request Sense failed");
-	exit (1);
-      }
-      
-      asc = tBuf[12]; 
-      ascq = tBuf[13];
-	
-   }
-
-   if ( asc == 0x5d )
-	*retval = ascq;
-   else
-         *retval = 0;
-
-   return 0;
-}
-
-
-char* scsiTapeAlertsTapeDevice ( unsigned short code)
-{
-
-#define NUMENTRIESINTAPEALERTSTABLE 54
-
-    char *TapeAlertsMessageTable[]=
-    {  " ",
-   "The tape drive is having problems reading data. No data has been lost, but there has been a reduction in the performance of the tape.",
-   "The tape drive is having problems writing data. No data has been lost, but there has been a reduction in the performance of the tape.",
-   "The operation has stopped because an error has occurred while reading or writing data which the drive cannot correct.",
-   "Your data is at risk:\n1. Copy any data you require from this tape. \n2. Do not use this tape again.\n3. Restart the operation with a different tape.",
-   "The tape is damaged or the drive is faulty. Call the tape drive supplier helpline.",
-   "The tape is from a faulty batch or the tape drive is faulty:\n1. Use a good tape to test the drive.\n2. If problem persists, call the tape drive supplier helpline.",
-   "The tape cartridge has reached the end of its calculated useful life: \n1. Copy data you need to another tape.\n2. Discard the old tape.",
-   "The tape cartridge is not data-grade. Any data you back up to the tape is at risk. Replace the cartridge with a data-grade tape.",
-   "You are trying to write to a write-protected cartridge. Remove the write-protection or use another tape.",
-   "You cannot eject the cartridge because the tape drive is in use. Wait until the operation is complete before ejecting the cartridge.",
-   "The tape in the drive is a cleaning cartridge.",
-   "You have tried to load a cartridge of a type which is not supported by this drive.",
-   "The operation has failed because the tape in the drive has snapped:\n1. Discard the old tape.\n2. Restart the operation with a different tape.",
-   "The operation has failed because the tape in the drive has snapped:\n1. Do not attempt to extract the tape cartridge\n2. Call the tape drive supplier helpline.",
-   "The memory in the tape cartridge has failed, which reduces performance. Do not use the cartridge for further backup operations.",
-   "The operation has failed because the tape cartridge was manually ejected while the tape drive was actively writing or reading.",
-   "You have loaded of a type that is read-only in this drive. The cartridge will appear as write-protected.",
-   "The directory on the tape cartridge has been corrupted. File search performance will be degraded. The tape directory can be rebuilt by reading all the data on the cartridge.",
-   "The tape cartridge is nearing the end of its calculated life. It is recommended that you:\n1. Use another tape cartridge for your next backup.\n2.Store this tape in a safe place in case you need to restore data from it.",
-   "The tape drive needs cleaning:\n1. If the operation has stopped, eject the tape and clean the drive.\n2. If the operation has not stopped, wait for it ti finish and then clean the drive. Check the tape drive users manual for device specific cleaning instructions.",
-   "The tape drive is due for routine cleaning:\n1. Wait for the current operation to finish.\n2. The use a cleaning cartridge. Check the tape drive users manual for device specific cleaning instructions.",
-   "The last cleaning cartridge used in the tape drive has worn out:\n1. Discard the worn out cleaning cartridge.\n2. Wait for the current operation to finish.\n 3.Then use a new cleaning cartridge.",
-   "The last cleaning cartridge used in the tape drive was an invalid type:\n1. Do not use this cleaning cartridge in this drive.\n2. Wait for the current operation to finish.\n 3.Then use a new cleaning cartridge.",
-   "The tape drive has requested a retention operation",
-   "A redundant interface port on the tape drive has failed",
-   "A tape drive cooling fan has failed",
-   "A redundant power supply has failed inside the tape drive enclosure. Check the enclosure users manual for instructions on replacing the failed power supply.",
-   "The tape drive power consumption is outside the specified range.",
-   "Preventive maintenance of the tape drive is required. Check the tape drive users manual for device specific preventive maintenance tasks or call the tape drive supplier helpline.",
-   "The tape drive has a hardware fault:\n1. Eject the tape or magazine.\n2. Reset the drive.\n3. Restart the operation.",
-   "The tape drive has a hardware fault:\n1. Turn the tape drive off and then on again.\n2. Restart the operation.\n3. If the problem persists, call the tape drive supplier helpline.\n Check the tape drive users manual for device specific instructions on turning the device power in and off.",
-   "The tape drive has a problem with the host interface:\n1. Check the cables and cable connections.\n2. Restart the operation.",
-   "The operation has failed:\n1. Eject the tape or magazine.\n2. Insert the tape or magazine again.\n3. Restart the operation.",
-   "The firmware download has failed because you have tried to use the incorrect firmware for this tape drive. Obtain the correct firmware and try again.",
-   "Environmental conditions inside the tape drive are outside the specified humidity range.",
-   "Environmental conditions inside the tape drive are outside the specified temperature range.",
-   "The voltage supply to the tape drive is outside the specified range.",
-   "A hardware failure of the tape drive is predicted. Call the tape drive supplier helpline.",
-   "The tape drive may have a fault. Check for availability of diagnostic information and run extended diagnostics if applicable. Check the tape drive users manual for instruction on running extended diagnostic tests and retrieving diagnostic data",
-   "The changer mechanism is having difficulty communicating with the tape drive:\n1. Turn the autoloader off then on.\n2. Restart the operation.\n3. If problem persists, call the tape drive supplier helpline.",
-   "A tape has been left in the autoloader by a previous hardware fault:\n1. Insert an empty magazine to clear the fault.\n2. If the fault does not clear, turn the autoloader off and then on again.\n3. If the problem persists, call the tape drive supplier helpline.",
-   "There is a problem with the autoloader mechanism.",
-   "The operation has failed because the autoloader door is open:\n1. Clear any obstructions from the autoloader door.\n2. Eject the magazine and then insert it again.\n3. If the fault does not clear, turn the autoloader off and then on again.\n4. If the problem persists, call the tape drive supplier helpline.",
-   "The autoloader has a hardware fault:\n1. Turn the autoloader off and then on again.\n2. Restart the operation.\n3. If the problem persists, call the tape drive supplier helpline.\n Check the autoloader users manual for device specific instructions on turning the device power on and off.",
-   "The autoloader cannot operate without the magazine,\n1. Insert the magazine into the autoloader.\n 2. Restart the operation.",
-   "A hardware failure of the changer mechanism is predicted. Call the tape drive supplier helpline.",
-   " ",
-   " ",
-   " ",
-   "Media statistics have been lost at some time in the past",
-   "The tape directory on the tape cartridge just unloaded has been corrupted. File search performance will be degraded. The tape directory can be rebuilt by reading all the data.",
-   "The tape just unloaded could not write its system area successfully:\n1. Copy data to another tape cartridge.\n2. Discard the old cartridge.",
-   "The tape system are could not be read successfully at load time:\n1. Copy data to another tape cartridge.\n2. Discard the old cartridge.",
-   "The start or data could not be found on the tape:\n1. Check you are using the correct format tape.\n2. Discard the tape or return the tape to you supplier",
-    };
-            
-    return ( code > NUMENTRIESINTAPEALERTSTABLE)? "Unknown Alert" : TapeAlertsMessageTable[code];
-}
-
-
-char* scsiSmartGetSenseCode ( UINT8 ascq)
-{
-
- char *smartsensetable [] =   {
-	"FAILURE PREDICTION THRESHOLD EXCEEDED",
-	"MEDIA FAILURE PREDICTION THRESHOLD EXCEEDED",
-	"LOGICAL UNIT FAILURE PREDICTION THRESHOLD EXCEEDED",
-	"Unknown Failure",
-	"Unknown Failure",
-	"Unknown Failure",
-	"Unknown Failure",
-	"Unknown Failure",
-	"Unknown Failure",
-	"Unknown Failure",
-	"Unknown Failure",
-	"Unknown Failure",
-	"Unknown Failure",
-	"Unknown Failure",
-	"Unknown Failure",
-	"Unknown Failure",
-	"HARDWARE IMPENDING FAILURE GENERAL HARD DRIVE FAILURE",
-	"HARDWARE IMPENDING FAILURE DRIVE ERROR RATE TOO HIGH",
-	"HARDWARE IMPENDING FAILURE DATA ERROR RATE TOO HIGH",
-	"HARDWARE IMPENDING FAILURE SEEK ERROR RATE TOO HIGH",
-	"HARDWARE IMPENDING FAILURE TOO MANY BLOCK REASSIGNS",
-	"HARDWARE IMPENDING FAILURE ACCESS TIMES TOO HIGH",
-	"HARDWARE IMPENDING FAILURE START UNIT TIMES TOO HIGH",
-	"HARDWARE IMPENDING FAILURE CHANNEL PARAMETRICS",
-	"HARDWARE IMPENDING FAILURE CONTROLLER DETECTED",
-	"HARDWARE IMPENDING FAILURE THROUGHPUT PERFORMANCE",
-	"HARDWARE IMPENDING FAILURE SEEK TIME PERFORMANCE",
-	"HARDWARE IMPENDING FAILURE SPIN-UP RETRY COUNT",
-	"HARDWARE IMPENDING FAILURE DRIVE CALIBRATION RETRY COUNT",
-	"Unknown Failure",
-	"Unknown Failure",
-	"Unknown Failure",
-	"CONTROLLER IMPENDING FAILURE GENERAL HARD DRIVE FAILURE",
-	"CONTROLLER IMPENDING FAILURE DRIVE ERROR RATE TOO HIGH",
-	"CONTROLLER IMPENDING FAILURE DATA ERROR RATE TOO HIGH",
-	"CONTROLLER IMPENDING FAILURE SEEK ERROR RATE TOO HIGH",
-	"CONTROLLER IMPENDING FAILURE TOO MANY BLOCK REASSIGNS",
-	"CONTROLLER IMPENDING FAILURE ACCESS TIMES TOO HIGH",
-	"CONTROLLER IMPENDING FAILURE START UNIT TIMES TOO HIGH",
-	"CONTROLLER IMPENDING FAILURE CHANNEL PARAMETRICS",
-	"CONTROLLER IMPENDING FAILURE CONTROLLER DETECTED",
-	"CONTROLLER IMPENDING FAILURE THROUGHPUT PERFORMANCE",
-	"CONTROLLER IMPENDING FAILURE SEEK TIME PERFORMANCE",
-	"CONTROLLER IMPENDING FAILURE SPIN-UP RETRY COUNT",
-	"CONTROLLER IMPENDING FAILURE DRIVE CALIBRATION RETRY COUNT",
-	"Unknown Failure",
-	"Unknown Failure",
-	"Unknown Failure",
-	"DATA CHANNEL IMPENDING FAILURE GENERAL HARD DRIVE FAILURE",
-	"DATA CHANNEL IMPENDING FAILURE DRIVE ERROR RATE TOO HIGH",
-	"DATA CHANNEL IMPENDING FAILURE DATA ERROR RATE TOO HIGH",
-	"DATA CHANNEL IMPENDING FAILURE SEEK ERROR RATE TOO HIGH",
-	"DATA CHANNEL IMPENDING FAILURE TOO MANY BLOCK REASSIGNS",
-	"DATA CHANNEL IMPENDING FAILURE ACCESS TIMES TOO HIGH",
-	"DATA CHANNEL IMPENDING FAILURE START UNIT TIMES TOO HIGH",
-	"DATA CHANNEL IMPENDING FAILURE CHANNEL PARAMETRICS",
-	"DATA CHANNEL IMPENDING FAILURE CONTROLLER DETECTED",
-	"DATA CHANNEL IMPENDING FAILURE THROUGHPUT PERFORMANCE",
-	"DATA CHANNEL IMPENDING FAILURE SEEK TIME PERFORMANCE",
-	"DATA CHANNEL IMPENDING FAILURE SPIN-UP RETRY COUNT",
-	"DATA CHANNEL IMPENDING FAILURE DRIVE CALIBRATION RETRY COUNT",
-	"Unknown Failure",
-	"Unknown Failure",
-	"Unknown Failure",
-	"SERVO IMPENDING FAILURE GENERAL HARD DRIVE FAILURE",
-	"SERVO IMPENDING FAILURE DRIVE ERROR RATE TOO HIGH",
-	"SERVO IMPENDING FAILURE DATA ERROR RATE TOO HIGH",
-	"SERVO IMPENDING FAILURE SEEK ERROR RATE TOO HIGH",
-	"SERVO IMPENDING FAILURE TOO MANY BLOCK REASSIGNS",
-	"SERVO IMPENDING FAILURE ACCESS TIMES TOO HIGH",
-	"SERVO IMPENDING FAILURE START UNIT TIMES TOO HIGH",
-	"SERVO IMPENDING FAILURE CHANNEL PARAMETRICS",
-	"SERVO IMPENDING FAILURE CONTROLLER DETECTED",
-	"SERVO IMPENDING FAILURE THROUGHPUT PERFORMANCE",
-	"SERVO IMPENDING FAILURE SEEK TIME PERFORMANCE",
-	"SERVO IMPENDING FAILURE SPIN-UP RETRY COUNT",
-	"SERVO IMPENDING FAILURE DRIVE CALIBRATION RETRY COUNT",
-	"Unknown Failure",
-	"Unknown Failure",
-	"Unknown Failure",
-	"SPINDLE IMPENDING FAILURE GENERAL HARD DRIVE FAILURE",
-	"SPINDLE IMPENDING FAILURE DRIVE ERROR RATE TOO HIGH",
-	"SPINDLE IMPENDING FAILURE DATA ERROR RATE TOO HIGH",
-	"SPINDLE IMPENDING FAILURE SEEK ERROR RATE TOO HIGH",
-	"SPINDLE IMPENDING FAILURE TOO MANY BLOCK REASSIGNS",
-	"SPINDLE IMPENDING FAILURE ACCESS TIMES TOO HIGH",
-	"SPINDLE IMPENDING FAILURE START UNIT TIMES TOO HIGH",
-	"SPINDLE IMPENDING FAILURE CHANNEL PARAMETRICS",
-	"SPINDLE IMPENDING FAILURE CONTROLLER DETECTED",
-	"SPINDLE IMPENDING FAILURE THROUGHPUT PERFORMANCE",
-	"SPINDLE IMPENDING FAILURE SEEK TIME PERFORMANCE",
-	"SPINDLE IMPENDING FAILURE SPIN-UP RETRY COUNT",
-	"SPINDLE IMPENDING FAILURE DRIVE CALIBRATION RETRY COUNT",
-	"Unknown Failure",
-	"Unknown Failure",
-	"Unknown Failure",
-	"FIRMWARE IMPENDING FAILURE GENERAL HARD DRIVE FAILURE",
-	"FIRMWARE IMPENDING FAILURE DRIVE ERROR RATE TOO HIGH",
-	"FIRMWARE IMPENDING FAILURE DATA ERROR RATE TOO HIGH",
-	"FIRMWARE IMPENDING FAILURE SEEK ERROR RATE TOO HIGH",
-	"FIRMWARE IMPENDING FAILURE TOO MANY BLOCK REASSIGNS",
-	"FIRMWARE IMPENDING FAILURE ACCESS TIMES TOO HIGH",
-	"FIRMWARE IMPENDING FAILURE START UNIT TIMES TOO HIGH",
-	"FIRMWARE IMPENDING FAILURE CHANNEL PARAMETRICS",
-	"FIRMWARE IMPENDING FAILURE CONTROLLER DETECTED",
-	"FIRMWARE IMPENDING FAILURE THROUGHPUT PERFORMANCE",
-	"FIRMWARE IMPENDING FAILURE SEEK TIME PERFORMANCE",
-	"FIRMWARE IMPENDING FAILURE SPIN-UP RETRY COUNT",
-	"FIRMWARE IMPENDING FAILURE DRIVE CALIBRATION RETRY COUNT"};
-
-	if ( ascq == 0xff)
-		return "SMART Sense: False Alarm";
-	else if ( ascq <= SMART_SENSE_MAX_ENTRY)
-		return smartsensetable[ascq];
-	else
-		return "Unknown Failure";
-
-}
-
-
-
-
-UINT8 scsiSmartOfflineTest (int device)
-{	
-	UINT8 tBuf[256];
-	
-	memset ( &tBuf, 0, 256);
-
-	/* Build SMART Off-line Immediate Diag Header */
-	tBuf[0] = 8;    /* Buffer Length n-1 */
-	tBuf[1] = 0x80; /* Page Code */
-	tBuf[2] = 0x00; /* Reserved */
-	tBuf[3] = 0x00; /* Page Length MSB */
-	tBuf[4] = 0x04; /* Page Length LSB */
-	tBuf[5] = 0x03; /* SMART Revision */
-	tBuf[6] = 0x00; /* Reserved */
-	tBuf[7] = 0x00; /* Off-line Immediate Time MSB */
-	tBuf[8] = 0x00; /* Off-line Immediate Time LSB */
-
-	return senddiagnostic (device, SCSI_DIAG_NO_SELF_TEST, (UINT8 *) &tBuf);
-}
-
-
-UINT8 scsiSmartShortSelfTest (int device)
-{	
-	return senddiagnostic (device, SCSI_DIAG_BG_SHORT_SELF_TEST, NULL);
-}
-
-
-UINT8 scsiSmartExtendSelfTest (int device)
-{	
-	return senddiagnostic (device, SCSI_DIAG_BG_EXTENDED_SELF_TEST, NULL);
-}
-
-
-UINT8 scsiSmartShortCapSelfTest (int device)
-{	
-	return senddiagnostic (device, SCSI_DIAG_FG_SHORT_SELF_TEST, NULL);
-}
-
-
-UINT8 scsiSmartExtendCapSelfTest (int device)
-{
-	return senddiagnostic (device, SCSI_DIAG_FG_EXTENDED_SELF_TEST, NULL);
-}
-
-
-UINT8 scsiSmartSelfTestAbort (int device)
-{
-	return senddiagnostic (device, SCSI_DIAG_ABORT_SELF_TEST, NULL);
-}
diff --git a/sm5/scsiprint.cpp b/sm5/scsiprint.cpp
deleted file mode 100644
index 7a6b239ac839be3c9f5244d8b3a94fafcd123974..0000000000000000000000000000000000000000
--- a/sm5/scsiprint.cpp
+++ /dev/null
@@ -1,407 +0,0 @@
-/*
- * scsiprint.c
- *
- * Home page of code is: http://smartmontools.sourceforge.net
- *
- * Copyright (C) 2002 Bruce Allen <smartmontools-support@lists.sourceforge.net>
- * Copyright (C) 2000 Michael Cornwell <cornwell@acm.org>
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * This code was originally developed as a Senior Thesis by Michael Cornwell
- * at the Concurrent Systems Laboratory (now part of the Storage Systems
- * Research Center), Jack Baskin School of Engineering, University of
- * California, Santa Cruz. http://ssrc.soe.ucsc.edu/
- *
- */
-
-
-#include <stdio.h>
-#include <unistd.h>
-#include <string.h>
-#include <fcntl.h>
-#include <errno.h>
-
-#include "smartctl.h"
-#include "scsicmds.h"
-#include "scsiprint.h"
-#include "extern.h"
-
-#define GBUF_SIZE 65535
-
-const char* CVSid4="$Id: scsiprint.cpp,v 1.11 2002/11/17 05:57:32 ballen4705 Exp $"
-CVSID3 CVSID4 CVSID5 CVSID6;
-
-// control block which points to external global control variables
-extern atamainctrl *con;
-
-UINT8 gBuf[GBUF_SIZE];
-
-UINT8 gSmartPage = 0;
-UINT8 gTempPage = 0;
-UINT8 gSelfTestPage = 0;
-UINT8 gStartStopPage = 0;
-UINT8 gTapeAlertsPage = 0;
-
-
-
-
-
-void scsiGetSupportPages ( int device)
-{
-   int i;
-
-   if (logsense ( device , SUPPORT_LOG_PAGES, (UINT8 *) &gBuf) != 0)
-   {
-       perror ( "Log Sense failed"); 
-       exit (1);
-   } 
-
-   for ( i = 4; i < gBuf[3] + LOGPAGEHDRSIZE ; i++)
-   {
-      switch ( gBuf[i])
-      {
-         case TEMPERATURE_PAGE:
-            gTempPage = 1;
-            break;
-         case STARTSTOP_CYCLE_COUNTER_PAGE:
-            gStartStopPage = 1;
-            break;
-         case SELFTEST_RESULTS_PAGE:
-            gSelfTestPage = 1;
-            break;
-         case SMART_PAGE:
-            gSmartPage = 1;
-            break;
-         case TAPE_ALERTS_PAGE:
-            gTapeAlertsPage = 1;
-            break;
-         default:
-            break;
-
-       }
-   }
-}
-
-void scsiGetSmartData (int device)
-{
-
-   UINT8 returnvalue;
-   UINT8 currenttemp;
-   UINT8 triptemp;
-
-   if ( scsiCheckSmart(device, gSmartPage, 
-                       &returnvalue, &currenttemp, &triptemp ) != 0)
-   {
-      perror ( "scsiGetSmartData Failed");
-      exit (1);
-   }
-	
-   if ( returnvalue )
-      printf("S.M.A.R.T. Sense: (%02x) %s\n", (UINT8) returnvalue, 
-                scsiSmartGetSenseCode(returnvalue));
-   else
-      printf("S.M.A.R.T. Sense: Ok!\n");
-
-   if ( (currenttemp || triptemp) && !gTempPage)
-   {
-      printf("Current Drive Temperature:     %d C\n", currenttemp);
-      printf("Drive Trip Temperature:        %d C\n", triptemp);
-   }
-}
-
-
-void scsiGetTapeAlertsData (int device)
-{
-    unsigned short pagelength;
-    unsigned short parametercode;
-    int i;
-    int failure = 0;
-
-    if ( logsense( device, TAPE_ALERTS_PAGE, (UINT8 *) &gBuf) != 0)
-    {
-   	     perror ( "scsiGetSmartData Failed");
-	     exit (1);
-    }
-
-    if ( gBuf[0] != 0x2e )
-    {
-         printf("TapeAlerts Log Sense Failed\n");
-         exit(-1);
-    }
-
-    pagelength = (unsigned short) gBuf[2] << 8 | gBuf[3];
-
-    for ( i = 4; i < pagelength;i+=5 )
-    {
-        parametercode = (unsigned short) gBuf[i] << 8 | gBuf[i+1];
-
-        if (gBuf[i+4])
-        {
-           printf("Tape Alerts Error!!!\n%s\n",
-              scsiTapeAlertsTapeDevice(parametercode));
-           failure = 1; 
-        }          
-    }
-
-    if(!failure)
-      printf("No Tape Alerts Failure\n");
-
-}
-
-void scsiGetStartStopData ( int device)
-{
-    UINT32 currentStartStop;
-    UINT32 recommendedStartStop; 
-
-    if ( logsense( device, STARTSTOP_CYCLE_COUNTER_PAGE, (UINT8 *) &gBuf) != 0)
-    {
-   	     perror ( "scsiGetStartStopData Failed");
-	     exit (1);
-    }
-
-
-    if ( gBuf[0] != STARTSTOP_CYCLE_COUNTER_PAGE )
-    {
-         printf("StartStop Log Sense Failed\n");
-         exit(-1);
-    }
-
-
-    recommendedStartStop= (UINT32) gBuf[28]<< 24 | gBuf[29] << 8 |
-                                       gBuf[30] << 16 | gBuf[31];
-    currentStartStop= (UINT32) gBuf[36]<< 24 | gBuf[37] << 8 |
-                                       gBuf[38] << 16 | gBuf[39];
-
-    printf("Current start stop count:      %u times\n", currentStartStop);
-    printf("Recommended start stop count:  %u times\n", recommendedStartStop);
-} 
-
- 
-void scsiGetDriveInfo ( int device)
-{
-   char manufacturer[9];
-   char product[17];
-   char revision[5];
-
-   UINT8 smartsupport;
-	
-   if (stdinquiry ( device, (UINT8 *) &gBuf) != 0)
-   {
-      perror ( "Standard Inquiry failed");
-   }
-
-   memset ( &manufacturer, 0, 8);
-   manufacturer[8] = '\0';
-   strncpy ((char *) &manufacturer, (char *) &gBuf[8], 8);
- 
-   memset ( &product, 0, 16);
-   strncpy ((char *) &product, (char *) &gBuf[16], 16);
-   product[16] = '\0';
-	
-   memset ( &revision, 0, 4);
-   strncpy ((char *) &revision, (char *) &gBuf[32], 4);
-   revision[4] = '\0';
-   printf("Device: %s %s Version: %s\n", manufacturer, product, revision);
-	
-   if ( scsiSmartSupport( device, (UINT8 *) &smartsupport) != 0)
-   {
-      printf("Device does not support %s\n",(gBuf[0] & 0x1f)?
-                         "TapeAlerts": "S.M.A.R.T.");
-      exit (1);
-   }
-	
-   printf("Device supports %s and is %s\n%s\n", 
-            (gBuf[0] & 0x1f)? "TapeAlerts" : "S.M.A.R.T.",
-            (smartsupport & DEXCPT_ENABLE)? "Disable" : "Enabled",
-            (smartsupport & EWASC_ENABLE)? "Temperature Warning Enabled":
-		"Temperature Warning Disabled or Not Supported");
-
-}
-
-
-void scsiSmartEnable( int device)
-{
-	
-	/* Enable Exception Control */
-
-	if ( scsiSmartDEXCPTDisable(device) != 0)
-	{
-		exit (1);
-	}
-	printf("S.M.A.R.T. enabled\n");
-		
-
-	if (scsiSmartEWASCEnable(device) != 0)
-	{
-		printf("Temperature Warning not Supported\n");
-		
-	}
-	else
-	{
-		printf("Temperature Warning Enabled\n");
-		
-	}
-
-	return;
-
-}
-	
-
-void scsiSmartDisable (int device)
-{
-
-	if ( scsiSmartDEXCPTEnable(device) != 0)
-	{
-		exit (1);
-	}
-	printf("S.M.A.R.T. Disabled\n");
-		
-
-}
-
-void scsiPrintTemp (int device)
-{
-  UINT8 temp;
-  UINT8 trip;
-
-  if ( scsiGetTemp(device, &temp, &trip) != 0)
-  {
-   exit (1);
-  }
-  
-  printf("Current Drive Temperature:     %d C\n", temp);
-  printf("Drive Trip Temperature:        %d C\n", trip);
-
-
-}
-
-void scsiPrintStopStart ( int device )
-{
-/**
-  unsigned int css;
-
-  if ( scsiGetStartStop(device, unsigned int *css) != 0)
-  {
-   exit (1);
-  }
-  
-  printf ("Start Stop Count: %d\n", css);
-**/
-}
-
-void scsiPrintMain (char *device, int fd)
-{
-
-  // See if unit accepts SCSI commmands from us
-  if (testunitnotready(fd)){
-    printf("Smartctl: device %s failed Test Unit Ready\n", device);
-    exit(1);
-  }
-
-    if (con->driveinfo)
-	scsiGetDriveInfo(fd); 
-
-    if (con->smartenable) 
-	scsiSmartEnable(fd);
-
-    if (con->smartdisable)
-	scsiSmartDisable(fd);
-
-    if (con->checksmart)
-    {
-	scsiGetSupportPages (fd);
-        if(gTapeAlertsPage)
-          scsiGetTapeAlertsData (fd);
-       else
-        {
-           scsiGetSmartData(fd);
-           if(gTempPage)
-            scsiPrintTemp(fd);         
-           if(gStartStopPage)
-            scsiGetStartStopData (fd);
-        }
-    }	
-
-	
-    if ( con->smartexeoffimmediate )
-    {
-	if ( scsiSmartOfflineTest (fd) != 0) 
-	{
-          printf( "Smartctl: Smart Offline Failed\n");
-          exit(-1);
-	}
-	printf ("Drive Command Successful offline test has begun\n");
-
-        printf ("Use smartctl -%c to abort test\n", SMARTSELFTESTABORT);	
-			
-    }
-
-
-    if ( con->smartshortcapselftest )
-    {
-	if ( scsiSmartShortCapSelfTest (fd) != 0) 
-	{
-            printf( "Smartctl: Smart Short Self Test Failed\n");
-            exit(-1);
-	}
-	printf ("Drive Command Successful Short Self test has begun\n");
-        printf ("Use smartctl -%c to abort test\n", SMARTSELFTESTABORT);	
-   }
-
-   if ( con->smartshortselftest )
-   { 
-		
-      if ( scsiSmartShortSelfTest (fd) != 0) 
-      {
-	printf( "Smartctl: Smart Short Self Test Failed\n");
-	exit(-1);
-      }
-	printf ("Drive Command Successful Short Self test has begun\n");
-        printf ("Use smartctl -%c to abort test\n", SMARTSELFTESTABORT);
-   }
-	
-   if ( con->smartextendselftest )
-   {
-      if ( scsiSmartExtendSelfTest (fd) != 0) 
-      {
-	printf( "S.M.A.R.T. Extended Self Test Failed\n");
-	exit(-1);
-      }
-
-   printf ("Drive Command Successful Extended Self test has begun\n");
-   printf ("Use smartctl -%c to abort test\n", SMARTSELFTESTABORT);	
-   }
-	
-	if ( con->smartextendcapselftest )
-	{
-		
-		if ( scsiSmartExtendCapSelfTest (fd) != 0) 
-		{
-			printf( "S.M.A.R.T. Extended Self Test Failed\n");
-			exit(-1);
-		}
-		
-		printf ("Drive Command Successful Extended Self test has begun\n");
-        printf ("Use smartctl -%c to abort test\n", SMARTSELFTESTABORT);	
-	}
-
-	if ( con->smartselftestabort )
-	{
-		
-		if ( scsiSmartSelfTestAbort (fd) != 0) 
-		{
-			printf( "S.M.A.R.T. Self Test Abort Failed\n");
-			exit(-1);
-		}
-		
-		printf ("Drive Command Successful self test aborted\n");
-     }		
-}
diff --git a/sm5/smartctl.cpp b/sm5/smartctl.cpp
deleted file mode 100644
index 7fa60619cec3064d50356eee0117549ad64ad436..0000000000000000000000000000000000000000
--- a/sm5/smartctl.cpp
+++ /dev/null
@@ -1,363 +0,0 @@
-/*
- * smartctl.c
- *
- * Home page of code is: http://smartmontools.sourceforge.net
- *
- * Copyright (C) 2002 Bruce Allen <smartmontools-support@lists.sourceforge.net>
- * Copyright (C) 2000 Michael Cornwell <cornwell@acm.org>
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * This code was originally developed as a Senior Thesis by Michael Cornwell
- * at the Concurrent Systems Laboratory (now part of the Storage Systems
- * Research Center), Jack Baskin School of Engineering, University of
- * California, Santa Cruz. http://ssrc.soe.ucsc.edu/
- *
- */
-
-
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/ioctl.h>
-#include <linux/hdreg.h>
-#include <sys/fcntl.h>
-#include <sys/types.h>
-#include <string.h>
-#include <stdarg.h>
-#include "smartctl.h"
-#include "atacmds.h"
-#include "ataprint.h"
-#include "scsicmds.h"
-#include "scsiprint.h"
-#include "extern.h"
-
-extern const char *CVSid1, *CVSid2, *CVSid3, *CVSid4; 
-const char* CVSid5="$Id: smartctl.cpp,v 1.28 2002/11/17 05:57:32 ballen4705 Exp $"
-CVSID1 CVSID2 CVSID3 CVSID4 CVSID5 CVSID6;
-
-// This is a block containing all the "control variables".  We declare
-// this globally in this file, and externally in other files.
-atamainctrl *con=NULL;
-
-void printslogan(){
-  pout("smartctl version %d.%d-%d Copyright (C) 2002 Bruce Allen\n",
-      (int)RELEASE_MAJOR, (int)RELEASE_MINOR, (int)SMARTMONTOOLS_VERSION);
-  pout("Home page is %s\n\n",PROJECTHOME);
-  return;
-}
-
-
-void printcopy(){
-  char out[CVSMAXLEN];
-  pout("smartctl comes with ABSOLUTELY NO WARRANTY. This\n");
-  pout("is free software, and you are welcome to redistribute it\n");
-  pout("under the terms of the GNU General Public License Version 2.\n");
-  pout("See http://www.gnu.org for further details.\n\n");
-  pout("CVS version IDs of files used to build this code are:\n");
-  printone(out,CVSid1);
-  pout("%s",out);
-  printone(out,CVSid2);
-  pout("%s",out);
-  printone(out,CVSid3);
-  pout("%s",out);
-  printone(out,CVSid4);
-  pout("%s",out);
-  printone(out,CVSid5);
-  pout("%s",out);
-  return;
-}
-
-/*  void prints help information for command syntax */
-void Usage ( void){
-  printf("Usage: smartctl -[options] [device]\n");
-  printf("\nShow Information Options:\n");
-  printf("  %c  Show Version, Copyright and License info\n", PRINTCOPYLEFT);
-  printf("  %c  Show SMART Drive Info                   (ATA/SCSI)\n",DRIVEINFO);
-  printf("  %c  Show all SMART Information              (ATA/SCSI)\n",SMARTVERBOSEALL);
-  printf("\nRun-time Behavior Options:\n");
-  printf("  %c  Quiet: only show SMART Drive Errors     (ATA Only)\n",    QUIETMODE);
-  printf("  %c  Very Quiet: no display, use Exit Status (ATA Only)\n",    VERYQUIETMODE);  
-  printf("  %c  Device is an ATA Device                 (ATA Only)\n",    NOTSCSIDEVICE);
-  printf("  %c  Device is a SCSI Device                 (SCSI Only)\n",   NOTATADEVICE);
-  printf("  %c  Permissive: continue on Mandatory fails (ATA Only)\n",    PERMISSIVE);
-  printf("  %c  Conservative: exit if Optional Cmd fail (ATA Only)\n",    ULTRACONSERVATIVE);  
-  printf("  %c  Warning: exit if Struct Checksum bad    (ATA Only)\n",    EXITCHECKSUMERROR);
-  printf("\nSMART Feature Enable/Disable Commands:\n");
-  printf("  %c  Enable  SMART data collection           (ATA/SCSI)\n",    SMARTENABLE);
-  printf("  %c  Disable SMART data collection           (ATA/SCSI)\n",    SMARTDISABLE);
-  printf("  %c  Enable  SMART Automatic Offline Test    (ATA Only)\n",    SMARTAUTOOFFLINEENABLE);
-  printf("  %c  Disable SMART Automatic Offline Test    (ATA Only)\n",    SMARTAUTOOFFLINEDISABLE);
-  printf("  %c  Enable  SMART Attribute Autosave        (ATA Only)\n",    SMARTAUTOSAVEENABLE);
-  printf("  %c  Disable SMART Attribute Autosave        (ATA Only)\n",    SMARTAUTOSAVEDISABLE);
-  printf("\nRead and Display Data Options:\n");
-  printf("  %c  Show SMART Status                       (ATA/SCSI)\n",    CHECKSMART);
-  printf("  %c  Show SMART General Attributes           (ATA Only)\n",    GENERALSMARTVALUES);
-  printf("  %c  Show SMART Vendor Attributes            (ATA Only)\n",    SMARTVENDORATTRIB);
-  printf("  %c  Show SMART Drive Error Log              (ATA Only\n",     SMARTERRORLOG);
-  printf("  %c  Show SMART Drive Self Test Log          (ATA Only)\n",    SMARTSELFTESTLOG);
-  printf("\nVendor-specific Attribute Display Options:\n");
-  printf("  %c  Raw Attribute id=009 stored in minutes  (ATA Only)\n",    SMART009MINUTES);
-  printf("\nSelf-Test Options (no more than one):\n");
-  printf("  %c  Execute Off-line data collection        (ATA/SCSI)\n",    SMARTEXEOFFIMMEDIATE);
-  printf("  %c  Execute Short Self Test                 (ATA/SCSI)\n",    SMARTSHORTSELFTEST );
-  printf("  %c  Execute Short Self Test (Captive Mode)  (ATA/SCSI)\n",    SMARTSHORTCAPSELFTEST );
-  printf("  %c  Execute Extended Self Test              (ATA/SCSI)\n",    SMARTEXTENDSELFTEST );
-  printf("  %c  Execute Extended Self Test (Captive)    (ATA/SCSI)\n",    SMARTEXTENDCAPSELFTEST );
-  printf("  %c  Execute Self Test Abort                 (ATA/SCSI)\n",    SMARTSELFTESTABORT );
-  printf("\nExamples:\n");
-  printf("  smartctl -etf /dev/hda  (Enables SMART on first disk)\n");
-  printf("  smartctl -a   /dev/hda  (Prints all SMART information)\n");
-  printf("  smartctl -X   /dev/hda  (Executes extended disk self-test)\n");
-  printf("  smartctl -qvL /dev/hda  (Prints Self-Test & Attribute errors.)\n");
-}
-
-const char opts[] = { 
-  DRIVEINFO, CHECKSMART, SMARTVERBOSEALL, SMARTVENDORATTRIB,
-  GENERALSMARTVALUES, SMARTERRORLOG, SMARTSELFTESTLOG, SMARTDISABLE,
-  SMARTENABLE, SMARTAUTOOFFLINEENABLE, SMARTAUTOOFFLINEDISABLE,
-  SMARTEXEOFFIMMEDIATE, SMARTSHORTSELFTEST, SMARTEXTENDSELFTEST, 
-  SMARTSHORTCAPSELFTEST, SMARTEXTENDCAPSELFTEST, SMARTSELFTESTABORT,
-  SMARTAUTOSAVEENABLE,SMARTAUTOSAVEDISABLE,PRINTCOPYLEFT,SMART009MINUTES,
-  QUIETMODE,VERYQUIETMODE,NOTSCSIDEVICE,NOTATADEVICE,
-  EXITCHECKSUMERROR,ULTRACONSERVATIVE,PERMISSIVE,
-  'h','?','\0'
-};
-
-unsigned char printcopyleft=0,tryata=0,tryscsi=0;
-
-/*      Takes command options and sets features to be run */	
-void ParseOpts (int argc, char** argv){
-  int optchar;
-  extern char *optarg;
-  extern int optopt, optind, opterr;
-  
-  memset(con,0,sizeof(*con));
-  con->testcase=-1;
-  opterr=optopt=0;
-  while (-1 != (optchar = getopt(argc, argv, opts))) {
-    switch (optchar){
-    case EXITCHECKSUMERROR:
-      con->checksumfail=1;
-      break;
-    case PERMISSIVE:
-      con->permissive=1;
-      break;
-    case ULTRACONSERVATIVE:
-      con->conservative=1;
-      break;
-    case NOTATADEVICE:
-      tryata=0;
-      tryscsi=1;
-      break;
-    case NOTSCSIDEVICE:
-      tryata=1;
-      tryscsi=0;
-      break;
-    case QUIETMODE:
-      con->quietmode=TRUE;
-      break;
-    case VERYQUIETMODE:
-      con->veryquietmode=TRUE;
-      break;
-    case SMART009MINUTES:
-      con->smart009minutes=TRUE;
-      break;
-    case PRINTCOPYLEFT :
-      printcopyleft=TRUE;
-      break;
-    case DRIVEINFO :
-      con->driveinfo  = TRUE;
-      break;		
-    case CHECKSMART :
-      con->checksmart = TRUE;		
-      break;
-    case SMARTVERBOSEALL :
-      con->driveinfo = TRUE;
-      con->checksmart = TRUE;
-      con->generalsmartvalues = TRUE;
-      con->smartvendorattrib = TRUE;
-      con->smarterrorlog = TRUE;
-      con->smartselftestlog = TRUE;
-      break;
-    case SMARTVENDORATTRIB :
-      con->smartvendorattrib = TRUE;
-      break;
-    case GENERALSMARTVALUES :
-      con->generalsmartvalues = TRUE;
-      break;
-    case SMARTERRORLOG :
-      con->smarterrorlog = TRUE;
-      break;
-    case SMARTSELFTESTLOG :
-      con->smartselftestlog = TRUE;
-      break;
-    case SMARTDISABLE :
-      con->smartdisable = TRUE;
-      break;
-    case SMARTENABLE :
-      con->smartenable   = TRUE;
-      break;
-    case SMARTAUTOSAVEENABLE:
-      con->smartautosaveenable = TRUE;
-      break;
-    case SMARTAUTOSAVEDISABLE:
-      con->smartautosavedisable = TRUE;
-      break;
-    case SMARTAUTOOFFLINEENABLE: 
-      con->smartautoofflineenable = TRUE;
-      break;
-    case SMARTAUTOOFFLINEDISABLE:
-      con->smartautoofflinedisable = TRUE;
-      break;
-    case SMARTEXEOFFIMMEDIATE:
-      con->smartexeoffimmediate = TRUE;
-      con->testcase=OFFLINE_FULL_SCAN;
-      break;
-    case SMARTSHORTSELFTEST :
-      con->smartshortselftest = TRUE;
-      con->testcase=SHORT_SELF_TEST;
-      break;
-    case SMARTEXTENDSELFTEST :
-      con->smartextendselftest = TRUE;
-      con->testcase=EXTEND_SELF_TEST;
-      break;
-    case SMARTSHORTCAPSELFTEST:
-      con->smartshortcapselftest = TRUE;
-      con->testcase=SHORT_CAPTIVE_SELF_TEST;
-      break;
-    case SMARTEXTENDCAPSELFTEST:
-      con->smartextendcapselftest = TRUE;
-      con->testcase=EXTEND_CAPTIVE_SELF_TEST;
-      break;
-    case SMARTSELFTESTABORT:
-      con->smartselftestabort = TRUE;
-      con->testcase=ABORT_SELF_TEST;
-      break;
-    case 'h':
-    case '?':
-    default:
-      con->veryquietmode=FALSE;
-      printslogan();
-      if (optopt){
-	pout("=======> UNRECOGNIZED OPTION: %c <=======\n\n",(int)optopt);
-	Usage();
-	exit(FAILCMD);
-      }
-      Usage();
-      exit(0);	
-    }
-  }
-  // Do this here, so results are independent of argument order	
-  if (con->quietmode)
-    con->veryquietmode=TRUE;
-  
-  // error message if user has asked for more than one test
-  if (1<(con->smartexeoffimmediate+con->smartshortselftest+con->smartextendselftest+
-	 con->smartshortcapselftest+con->smartextendcapselftest+con->smartselftestabort)){
-    con->veryquietmode=FALSE;
-    printslogan();
-    Usage();
-    printf ("\nERROR: smartctl can only run a single test (or abort) at a time.\n\n");
-    exit(FAILCMD);
-  }
-
-  // From here on, normal operations...
-  printslogan();
-  
-  // Print Copyright/License info if needed
-  if (printcopyleft){
-    printcopy();
-    if (argc==2)
-      exit(0);
-  }   
-}
-
-
-// Printing function (controlled by global con->veryquietmode) 
-
-// [From GLIBC Manual: Since the prototype doesn't specify types for
-// optional arguments, in a call to a variadic function the default
-// argument promotions are performed on the optional argument
-// values. This means the objects of type char or short int (whether
-// signed or not) are promoted to either int or unsigned int, as
-// appropriate.]
-void pout(char *fmt, ...){
-  va_list ap;
-
-  // initialize variable argument list 
-  va_start(ap,fmt);
-  if (con->veryquietmode){
-    va_end(ap);
-    return;
-  }
-
-  // print out
-  vprintf(fmt,ap);
-  va_end(ap);
-  return;
-}
-
-
-/* Main Program */
-int main (int argc, char **argv){
-  int fd,retval=0;
-  char *device;
-  atamainctrl control;
-  const char *devroot="/dev/";
-
-  // define control block for external functions
-  con=&control;
-
-  // Part input arguments
-  ParseOpts(argc,argv);
-    
-  // Further argument checking
-  if (argc != 3){
-    Usage();
-    return FAILCMD;
-  }
-  
-  // open device - read-only mode is enough to issue needed commands
-  fd = open(device=argv[2], O_RDONLY);  
-  if (fd<0) {
-    perror("Smartctl device open failed");
-    return FAILDEV;
-  }
-
-  // if necessary, try to guess if this is an ATA or SCSI device
-  if (!tryata && !tryscsi) {
-    if (!strncmp(device,devroot,strlen(devroot)) && strlen(device)>5){
-      if (device[5] == 'h')
-	tryata=1;
-      if (device[5] == 's')
-	tryscsi=1;
-    }
-    else if (strlen(device)){
-	if (device[0] == 'h')
-	  tryata=1;
-	if (device[0] == 's')
-	  tryscsi=1;
-      }
-  }
-
-  // now call appropriate ATA or SCSI routine
-  if (tryata)
-    retval=ataPrintMain(fd);
-  else if (tryscsi)
-    scsiPrintMain (device, fd);
-  else {
-    pout("Smartctl: specify if this is an ATA or SCSI device with the -%c or -%c options respectively.\n",
-	 NOTSCSIDEVICE, NOTATADEVICE);
-    Usage();
-    return FAILCMD;
-  }
-
-  return retval;
-}
diff --git a/sm5/smartd.cpp b/sm5/smartd.cpp
deleted file mode 100644
index 7912baa7824b517c61fa5958062151205843d7c7..0000000000000000000000000000000000000000
--- a/sm5/smartd.cpp
+++ /dev/null
@@ -1,1316 +0,0 @@
-/*
- * Home page of code is: http://smartmontools.sourceforge.net
- *
- * Copyright (C) 2002 Bruce Allen <smartmontools-support@lists.sourceforge.net>
- * Copyright (C) 2000 Michael Cornwell <cornwell@acm.org>
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * This code was originally developed as a Senior Thesis by Michael Cornwell
- * at the Concurrent Systems Laboratory (now part of the Storage Systems
- * Research Center), Jack Baskin School of Engineering, University of
- * California, Santa Cruz. http://ssrc.soe.ucsc.edu/
- *
- */
-
-#define _GNU_SOURCE
-#include <stdio.h>
-#include <sys/ioctl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <string.h>
-#include <linux/hdreg.h>
-#include <syslog.h>
-#include <stdarg.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <string.h>
-#include <time.h>
-#include "atacmds.h"
-#include "scsicmds.h"
-#include "smartd.h"
-#include "ataprint.h"
-#include "extern.h"
-
-
-// CVS ID strings
-extern const char *CVSid1, *CVSid2;
-const char *CVSid6="$Id: smartd.cpp,v 1.66 2002/11/17 05:30:11 ballen4705 Exp $" 
-CVSID1 CVSID2 CVSID3 CVSID4 CVSID7;
-
-// global variable used for control of printing, passing arguments, etc.
-atamainctrl *con=NULL;
-
-// Two other globals -- number of ATA and SCSI devices being monitored
-int numatadevices=0;
-int numscsidevices=0;
-
-// How long to sleep between checks.  Handy as global variable for
-// debugging
-int checktime=CHECKTIME;
-
-// Global Variables for command line options. These should go into a
-// structure at some point.
-unsigned char debugmode               = FALSE;
-unsigned char printcopyleft           = FALSE;
-
-// This function prints either to stdout or to the syslog as needed
-
-// [From GLIBC Manual: Since the prototype doesn't specify types for
-// optional arguments, in a call to a variadic function the default
-// argument promotions are performed on the optional argument
-// values. This means the objects of type char or short int (whether
-// signed or not) are promoted to either int or unsigned int, as
-// appropriate.]
-void printout(int priority,char *fmt, ...){
-  va_list ap;
-  // initialize variable argument list 
-  va_start(ap,fmt);
-  if (debugmode) 
-    vprintf(fmt,ap);
-  else {
-    openlog("smartd",LOG_PID,LOG_DAEMON);
-    vsyslog(priority,fmt,ap);
-    closelog();
-  }
-  va_end(ap);
-  return;
-}
-
-// If address is null, this just prints a warning message.  But if
-// address is non-null then send and log a warning email.
-void printandmail(char *address, mailinfo *mail, int priority, char *fmt, ...){
-  char command[2048], message[256], hostname[256];
-  int status;
-  va_list ap;
-  
-  // See if user wants us to send mail, or if we already have
-  if (!address || mail->logged)
-    return;
-  
-  // record the time of the mail message, and increment counter.  This
-  // is for later use if we decide to implement multiple email warning
-  // messages after some delay time.
-  mail->logged++;
-  mail->lastsent=time(NULL);
-  
-  // get system host name (not null terminated if length=MAX) 
-  if (gethostname(hostname, 256))
-    sprintf(hostname,"Unknown host");
-  else
-    hostname[255]='\0';
-  
-  // print warning string into message
-  va_start(ap, fmt);
-  vsnprintf(message, 256, fmt, ap);
-  va_end(ap);
-  
-  // now construct a command to send this as EMAIL, and issue it.
-  snprintf(command, 2048, "mail -s '%s: SMART errors detected' %s > /dev/null 2> /dev/null << \"ENDMAIL\"\n"
-	   "This email was generated by the smartd daemon running on machine:\n"
-	   "%s\n"
-	   "The following warning/error was logged by the smartd daemon:\n"
-	   "%s"
-	   "Further details can be found in the machine's syslog (/var/log/messages).\n"
-	   "You can also use the smartctl utility for further investigation.\n"
-	   "No additional email messages about this problem will be sent.\n"
-	   "ENDMAIL\n",
-	   hostname, address, hostname, message);
-#if (0)
-  snprintf(command,1024, "echo '%s' | mail -s '%s: smartd detected SMART errors' %s > /dev/null 2> /dev/null",
-	   message, hostname, address);
-#endif
-
-  status=system(command);
-  if (WEXITSTATUS(status))
-    printout(LOG_CRIT,"Email warning message to %s failed (32-bit exit status: %d)\n",address,status);
-  else
-    printout(LOG_INFO,"Email warning message sent to %s\n",address);
-  
-  return;
-}
-
-// Printing function for watching ataprint commands, or losing them
-void pout(char *fmt, ...){
-  va_list ap;
-  // initialize variable argument list 
-  va_start(ap,fmt);
-  // in debug mode we will print the output from the ataprint.o functions!
-  if (debugmode)
-    vprintf(fmt,ap);
-  va_end(ap);
-  return;
-}
-
-// tell user that we ignore HUP signals
-void huphandler(int sig){
-  printout(LOG_CRIT,"HUP ignored: smartd does NOT re-read /etc/smartd.conf.\n");
-  return;
-}
-
-// simple signal handler to print goodby message to syslog
-void sighandler(int sig){
-    printout(LOG_CRIT,"smartd received signal %d: %s\n",
-	     sig, strsignal(sig));
-    exit(1);
-}
-
-void goobye(){
-  printout(LOG_CRIT,"smartd is exiting\n");
-  return;
-}
-
-// Forks new process, closes all file descriptors, redirects stdin,
-// stdout, stderr
-int daemon_init(void){
-  pid_t pid;
-  int i;  
-
-  if ((pid=fork()) < 0) {
-    // unable to fork!
-    printout(LOG_CRIT,"smartd unable to fork daemon process!\n");
-    exit(1);
-  }
-  else if (pid)
-    // we are the parent process -- exit cleanly
-    exit(0);
-  
-  // from here on, we are the child process.
-  setsid();
-
-  // Fork one more time to avoid any possibility of having terminals
-  if ((pid=fork()) < 0) {
-    // unable to fork!
-    printout(LOG_CRIT,"smartd unable to fork daemon process!\n");
-    exit(1);
-  }
-  else if (pid)
-    // we are the parent process -- exit cleanly
-    exit(0);
-
-  // Now we are the child's child...
-
-  // close any open file descriptors
-  for (i=getdtablesize();i>=0;--i)
-    close(i);
-  
-  // redirect any IO attempts to /dev/null for stdin
-  i=open("/dev/null",O_RDWR);
-  // stdout
-  dup(i);
-  // stderr
-  dup(i);
-  umask(0);
-  chdir("/");
-  return 0;
-}
-
-// Prints header identifying version of code and home
-void printhead(){
-  printout(LOG_INFO,"smartd version %d.%d-%d - S.M.A.R.T. Daemon.\n",
-           (int)RELEASE_MAJOR, (int)RELEASE_MINOR, (int)SMARTMONTOOLS_VERSION);
-  printout(LOG_INFO,"Home page is %s\n\n",PROJECTHOME);
-  return;
-}
-
-
-// prints help info for configuration file directives
-void Directives() {
-  printout(LOG_INFO,"Configuration file Directives (following device name):\n");
-  printout(LOG_INFO,"  -A     Device is an ATA device\n");
-  printout(LOG_INFO,"  -S     Device is a SCSI device\n");
-  printout(LOG_INFO,"  -C N   Check disks once every N seconds, where N>=10.\n");
-  printout(LOG_INFO,"  -P     Permissive, ignore apparent lack of SMART.\n");
-  printout(LOG_INFO,"  -c     Monitor SMART Health Status, report if failed\n");
-  printout(LOG_INFO,"  -l     Monitor SMART Error Log, report new errors\n");
-  printout(LOG_INFO,"  -L     Monitor SMART Self-Test Log, report new errors\n");
-  printout(LOG_INFO,"  -f     Monitor 'Usage' Attributes, report failures\n");
-  printout(LOG_INFO,"  -M ADD Send email warning to address ADD\n");
-  printout(LOG_INFO,"  -p     Report changes in 'Prefailure' Attributes\n");
-  printout(LOG_INFO,"  -u     Report changes in 'Usage' Attributes\n");
-  printout(LOG_INFO,"  -t     Equivalent to -p and -u Directives\n");
-  printout(LOG_INFO,"  -a     Equivalent to -c -l -L -f -t Directives\n");
-  printout(LOG_INFO,"  -i ID  Ignore Attribute ID for -f Directive\n");
-  printout(LOG_INFO,"  -I ID  Ignore Attribute ID for -p, -u or -t Directive\n");
-  printout(LOG_INFO,"   #     Comment: text after a hash sign is ignored\n");
-  printout(LOG_INFO,"   \\    Line continuation character\n");
-  printout(LOG_INFO,"Attribute ID is a decimal integer 1 <= ID <= 255\n");
-  printout(LOG_INFO,"For SCSI devices, only -S, -C, and -M Directives are supported\n");
-  printout(LOG_INFO,"Example: /dev/hda -a\n");
-return;
-}
-
-/* prints help information for command syntax */
-void Usage (void){
-  printout(LOG_INFO,"usage: smartd -[opts] \n\n");
-  printout(LOG_INFO,"Command Line Options:\n");
-  printout(LOG_INFO,"  %c  Start smartd in debug Mode\n",(int)DEBUGMODE);
-  printout(LOG_INFO,"  %c  Print License, Copyright, and version information\n\n",(int)PRINTCOPYLEFT);
-  printout(LOG_INFO,"Optional configuration file: %s\n",CONFIGFILE);
-  Directives();
-}
-
-// returns negative if problem, else fd>=0
-int opendevice(char *device){
-  int fd = open(device, O_RDONLY);
-  if (fd<0) {
-    if (errno<sys_nerr)
-      printout(LOG_INFO,"Device: %s, %s, open() failed\n",device, sys_errlist[errno]);
-    else
-      printout(LOG_INFO,"Device: %s, open() failed\n",device);
-    return -1;
-  }
-  // device opened sucessfully
-  return fd;
-}
-
-int closedevice(int fd, char *name){
-  if (close(fd)){
-    if (errno<sys_nerr)
-      printout(LOG_INFO,"Device: %s, %s, close(%d) failed\n", name, sys_errlist[errno], fd);
-    else
-      printout(LOG_INFO,"Device: %s, close(%d) failed\n",name, fd);
-    return 1;
-  }
-  // device sucessfully closed
-  return 0;
-}
-
-// returns <0 on failure
-int ataerrorcount(int fd, char *name){
-  struct ata_smart_errorlog log;
-  
-  if (-1==ataReadErrorLog(fd,&log)){
-    printout(LOG_INFO,"Device: %s, Read SMART Error Log Failed\n",name);
-    return -1;
-  }
-  
-  // return current number of ATA errors
-  return log.error_log_pointer?log.ata_error_count:0;
-}
-
-// returns <0 if problem
-int selftesterrorcount(int fd, char *name){
-  struct ata_smart_selftestlog log;
-
-  if (-1==ataReadSelfTestLog(fd,&log)){
-    printout(LOG_INFO,"Device: %s, Read SMART Self Test Log Failed\n",name);
-    return -1;
-  }
-  
-  // return current number of self-test errors
-  return ataPrintSmartSelfTestlog(&log,0);
-}
-
-
-
-// scan to see what ata devices there are, and if they support SMART
-int atadevicescan2(atadevices_t *devices, cfgfile *cfg){
-  int fd;
-  struct hd_driveid drive;
-  char *device=cfg->name;
-  
-  // should we try to register this as an ATA device?
-  if (!(cfg->tryata))
-    return 1;
-  
-  // open the device
-  if ((fd=opendevice(device))<0)
-    // device open failed
-    return 1;
-  printout(LOG_INFO,"Device: %s, opened\n", device);
-  
-  // Get drive identity structure
-  // May want to add options to enable autosave, automatic online testing
-  if (ataReadHDIdentity (fd,&drive)){
-    // Unable to read Identity structure
-    printout(LOG_INFO,"Device: %s, unable to read Device Identity Structure\n",device);
-    close(fd);
-    return 2; 
-  }
-  
-  if (!cfg->permissive && !ataSmartSupport(&drive)){
-    // SMART not supported
-    printout(LOG_INFO,"Device: %s, appears to lack SMART, use '-P' Directive to try anyway.\n",device);
-    close(fd);
-    return 2; 
-  }
-
- if (ataEnableSmart(fd)){
-    // Enable SMART command has failed
-    printout(LOG_INFO,"Device: %s, could not enable SMART capability\n",device);
-    close(fd);
-    return 2; 
-  }
-  
-  // capability check: SMART status
-  if (cfg->smartcheck && ataSmartStatus2(fd)==-1){
-    printout(LOG_INFO,"Device: %s, not capable of SMART Health Status check\n",device);
-    cfg->smartcheck=0;
-  }
-  
-  // capability check: Read smart values and thresholds
-  if (cfg->usagefailed || cfg->prefail || cfg->usage) {
-    devices->smartval=(struct ata_smart_values *)calloc(1,sizeof(struct ata_smart_values));
-    devices->smartthres=(struct ata_smart_thresholds *)calloc(1,sizeof(struct ata_smart_thresholds));
-    
-    if (!devices->smartval || !devices->smartthres){
-      printout(LOG_CRIT,"Not enough memory to obtain SMART data\n");
-      exit(1);
-    }
-    
-    if (ataReadSmartValues(fd,devices->smartval) ||
-	ataReadSmartThresholds (fd,devices->smartthres)){
-      printout(LOG_INFO,"Device: %s, Read SMART Values and/or Thresholds Failed\n",device);
-      free(devices->smartval);
-      free(devices->smartthres);
-
-      // make it easy to recognize that we've deallocated
-      devices->smartval=NULL;
-      devices->smartthres=NULL;
-      cfg->usagefailed=cfg->prefail=cfg->usage=0;
-    }
-  }
-  
-  // capability check: self-test-log
-  if (cfg->selftest){
-    int val=selftesterrorcount(fd, device);
-    if (val>=0)
-      cfg->selflogcount=val;
-    else
-      cfg->selftest=0;
-  }
-  
-  // capability check: ATA error log
-  if (cfg->errorlog){
-    int val=ataerrorcount(fd, device);
-    if (val>=0)
-      cfg->ataerrorcount=val;
-    else
-      cfg->errorlog=0;
-  }
-  
-  // If not tests available or selected, return
-  if (!(cfg->errorlog || cfg->selftest || cfg->smartcheck || 
-	cfg->usagefailed || cfg->prefail || cfg->usage)) {
-    close(fd);
-    return 3;
-  }
-  
-  // Do we still have entries available?
-  if (numatadevices>=MAXATADEVICES){
-    printout(LOG_CRIT,"smartd has found more than MAXATADEVICES=%d ATA devices.\n"
-	     "Recompile code from " PROJECTHOME " with larger MAXATADEVICES\n",(int)numatadevices);
-    exit(1);
-  }
-  
-  printout(LOG_INFO,"Device: %s, is SMART capable. Adding to \"monitor\" list.\n",device);
-  // no need to try sending SCSI commands to this device!
-  cfg->tryscsi=0;
-  
-  // we were called from a routine that has global storage for the name.  Keep pointer.
-  devices->devicename=device;
-  devices->cfg=cfg;
-  
-  
-  numatadevices++;
-  closedevice(fd, device);
-  return 0;
-}
-
-
-// This function is hard to read and ought to be rewritten. Why in the
-// world is the four-byte integer cast to a pointer to an eight-byte
-// object?? Can anyone explain this obscurity?
-int scsidevicescan(scsidevices_t *devices, cfgfile *cfg){
-  int i, fd, smartsupport;
-  char *device=cfg->name;
-  unsigned char  tBuf[4096];
-
-  // should we try to register this as a SCSI device?
-  if (!(cfg->tryscsi))
-    return 1;
-  
-  // open the device
-  if ((fd=opendevice(device))<0)
-    // device open failed
-    return 1;
-  printout(LOG_INFO,"Device: %s, opened\n", device);
-  
-  // check that it's ready for commands.  Is this really needed?  It's
-  // not part of smartctl at all.
-  if (testunitnotready(fd)){
-    printout(LOG_INFO,"Device: %s, Failed Test Unit Ready\n", device);
-    close(fd);
-    return 2;
-  }
-  
-  // make sure that we can read mode page
-  if (modesense(fd, 0x1c, (UINT8 *) &tBuf)){
-    printout(LOG_INFO,"Device: %s, Failed read of ModePage 0x1c\n", device);
-    close(fd);
-    return 3;
-  }
-  
-  // see if SMART is supported and enabled
-  if (scsiSmartSupport(fd, (UINT8 *) &smartsupport) ||
-      (smartsupport & DEXCPT_ENABLE)){
-    printout(LOG_INFO,"Device: %s, SMART not supported or not enabled\n", device);
-    close(fd);
-    return 4;
-  }
-
-  // Device exists, and does SMART.  Add to list
-  if (numscsidevices>=MAXSCSIDEVICES){
-    printout(LOG_CRIT,"smartd has found more than MAXSCSIDEVICES=%d SCSI devices.\n"
-	     "Recompile code from " PROJECTHOME " with larger MAXSCSIDEVICES\n",(int)numscsidevices);
-    exit(1);
-  }
-
-  // now we can proceed to register the device
-  printout(LOG_INFO, "Device: %s, is SMART capable. Adding to \"monitor\" list.\n",device);
-
-  // since device points to global memory, just keep that address
-  devices->devicename=device;
-  devices->cfg=cfg;
-
-  // register the supported functionality.  The smartd code does not
-  // seem to make any further use of this information.
-  if (logsense(fd, SUPPORT_LOG_PAGES, (UINT8 *) &tBuf) == 0){
-    for ( i = 4; i < tBuf[3] + LOGPAGEHDRSIZE ; i++){
-      switch ( tBuf[i]){ 
-      case TEMPERATURE_PAGE:
-	devices->TempPageSupported = 1;
-	break;
-      case SMART_PAGE:
-	devices->SmartPageSupported = 1;
-	break;
-      default:
-	break;
-      }
-    }	
-  }
-
-  // increment number of SCSI devices found
-  numscsidevices++;
-  closedevice(fd, device);
-  return 0;
-}
-
-// We compare old and new values of the n'th attribute.  Note that n
-// is NOT the attribute ID number.. If equal, return 0.  The thre
-// structure is used to verify that the attributes are valid ones.  If
-// the new value is lower than the old value, then we return both old
-// and new values. new value=>lowest byte, old value=>next-to-lowest
-// byte, id value=>next-to-next-to-lowest byte., and prefail flag x as
-// bottom bit of highest byte.  See below (lsb on right)
-
-//  [00000000x][attribute ID][old value][new value]
-int  ataCompareSmartValues2(struct ata_smart_values *new,
-			    struct ata_smart_values *old,
-			    struct ata_smart_thresholds *thresholds,
-			    int n, char *name){
-  struct ata_smart_attribute *now,*was;
-  struct ata_smart_threshold_entry *thre;
-  unsigned char oldval,newval;
-  int returnvalue;
-
-  // check that attribute number in range, and no null pointers
-  if (n<0 || n>=NUMBER_ATA_SMART_ATTRIBUTES || !new || !old || !thresholds)
-    return 0;
-  
-  // pointers to disk's values and vendor's thresholds
-  now=new->vendor_attributes+n;
-  was=old->vendor_attributes+n;
-  thre=thresholds->thres_entries+n;
-
-  // consider only valid attributes
-  if (!now->id || !was->id || !thre->id)
-    return 0;
-  
-  
-  // issue warning if they don't have the same ID in all structures:
-  if ( (now->id != was->id) || (now->id != thre->id) ){
-    printout(LOG_INFO,"Device: %s, same Attribute has different ID numbers: %d = %d = %d\n",
-	     name, (int)now->id, (int)was->id, (int)thre->id);
-    return 0;
-  }
-
-  // if values have not changed, return
-  newval=now->current;
-  oldval=was->current;
-
-  // if any values out of the allowed range, or the values haven't changed, return
-  if (!newval || !oldval || newval>0xfe || oldval>0xfe || oldval==newval)
-    return 0;
-  
-  // values have changed.  Construct output
-  returnvalue=0;
-  returnvalue |= newval;
-  returnvalue |= oldval<<8;
-  returnvalue |= now->id<<16;
-  returnvalue |= (now->status.flag.prefailure)<<24;
-
-  return returnvalue;
-}
-
-// This looks to see if the corresponding bit of the 32 bytes is set.
-// This wastes a few bytes of storage but eliminates all searching and
-// sorting functions! Entry is ZERO <==> the attribute ON. Calling
-// with set=0 tells you if the attribute is being tracked or not.
-// Calling with set=1 turns the attribute OFF.
-int isattoff(unsigned char attr,unsigned char *data, int set){
-  // locate correct attribute
-  int loc=attr>>3;
-  int bit=attr & 0x07;
-  unsigned char mask=0x01<<bit;
-
-  // attribute zero is always OFF
-  if (!attr)
-    return 1;
-
-  if (!set)
-    return (data[loc] & mask);
-  
-  data[loc]|=mask;
-  // return value when setting makes no sense!
-  return 0;
-}
-
-
-int ataCheckDevice(atadevices_t *drive){
-  int fd,i;
-  char *name=drive->devicename;
-  cfgfile *cfg=drive->cfg;
-  
-  // if we can't open device, fail gracefully rather than hard --
-  // perhaps the next time around we'll be able to open it
-  if ((fd=opendevice(name))<0)
-    return 1;
-  
-  // check smart status
-  if (cfg->smartcheck){
-    int status=ataSmartStatus2(fd);
-    if (status==-1)
-      printout(LOG_INFO,"Device: %s, not capable of SMART self-check\n",name);
-    else if (status==1){
-      printout(LOG_CRIT, "Device: %s, FAILED SMART self-check. BACK UP DATA NOW!\n", name);
-      printandmail(cfg->address, cfg->maildata , LOG_CRIT, "Device: %s, FAILED SMART self-check. BACK UP DATA NOW!\n", name);
-    }
-  }
-  
-  // Check everything that depends upon SMART Data (eg, Attribute values)
-  if (cfg->usagefailed || cfg->prefail || cfg->usage){
-    struct ata_smart_values     curval;
-    struct ata_smart_thresholds *thresh=drive->smartthres;
-    
-    // Read current attribute values. *drive contains old values and thresholds
-    if (ataReadSmartValues(fd,&curval))
-      printout(LOG_CRIT, "Device: %s, failed to read SMART Attribute Data\n", name);
-    else {  
-      // look for failed usage attributes, or track usage or prefail attributes
-      for (i=0; i<NUMBER_ATA_SMART_ATTRIBUTES; i++){
-	int att;
-	
-	// This block looks for usage attributes that have failed.
-	// Prefail attributes that have failed are returned with a
-	// positive sign. No failure returns 0. Usage attributes<0.
-	if (cfg->usagefailed && ((att=ataCheckAttribute(&curval, thresh, i))<0)){
-	  
-	  // are we tracking this attribute?
-	  att *= -1;
-	  if (!isattoff(att, cfg->failatt, 0)){
-	    char attname[64], *loc=attname;
-	    
-	    // get attribute name & skip white space
-	    ataPrintSmartAttribName(loc, att);
-	    while (*loc && *loc==' ') loc++;
-	    
-	    // warning message
-	    printout(LOG_CRIT, "Device: %s, Failed SMART usage Attribute: %s.\n", name, loc);
-	    printandmail(cfg->address, cfg->maildata+1, LOG_CRIT, "Device: %s, Failed SMART usage Attribute: %s.\n", name, loc);
-	  }
-	}
-	
-	// This block tracks usage or prefailure attributes to see if they are changing
-	if ((cfg->usage || cfg->prefail) && ((att=ataCompareSmartValues2(&curval, drive->smartval, thresh, i, name)))){
-
-	  // I should probably clean this up by defining a union to
-	  // with one int=four unsigned chars to do this.
-	  const int mask=0xff;
-	  int newval =(att>>0)  & mask;
-	  int oldval =(att>>8)  & mask;
-	  int id     =(att>>16) & mask;
-	  int prefail=(att>>24) & mask;
-
-	  // for printing attribute name
-	  char attname[64],*loc=attname;
-	  
-	  // are we tracking this attribute?
-	  if (!isattoff(id, cfg->trackatt, 0)){
-	    
-	    // get attribute name, skip spaces
-	    ataPrintSmartAttribName(loc, id);
-	    while (*loc && *loc==' ') loc++;
-	    
-	    // prefailure attribute
-	    if (cfg->prefail && prefail)
-	      printout(LOG_INFO, "Device: %s, SMART Prefailure Attribute: %s changed from %d to %d\n",
-		       name, loc, (int)oldval, (int)newval);
-
-	    // usage attribute
-	    if (cfg->usage && !prefail)
-	      printout(LOG_INFO, "Device: %s, SMART Usage Attribute: %s changed from %d to %d\n",
-		       name, loc, (int)oldval, (int)newval);
-	  }
-	} // endof block tracking usage or prefailure
-      } // end of loop over attributes
-     
-      // Save the new values into *drive for the next time around
-      *drive->smartval=curval;
-    } 
-  }
-  
-  // check if number of selftest errors has increased (note: may also DECREASE)
-  if (cfg->selftest){
-    unsigned char old=cfg->selflogcount;
-    int new=selftesterrorcount(fd, name);
-    if (new>old){
-      printout(LOG_CRIT, "Device: %s, Self-Test Log error count increased from %d to %d\n",
-	       name, (int)old, new);
-      printandmail(cfg->address, cfg->maildata+2, LOG_CRIT, "Device: %s, Self-Test Log error count increased from %d to %d\n",
-		   name, (int)old, new);
-    }
-    if (new>=0)
-      // Needed suince self-test error count may  DECREASE
-      cfg->selflogcount=new;
-  }
-
-  
-  // check if number of ATA errors has increased
-  if (cfg->errorlog){
-    int old=cfg->ataerrorcount;
-    int new=ataerrorcount(fd, name);
-    if (new>old){
-      printout(LOG_CRIT, "Device: %s, ATA error count increased from %d to %d\n",
-	       name, old, new);
-      printandmail(cfg->address, cfg->maildata+3, LOG_CRIT, "Device: %s, ATA error count increased from %d to %d\n",
-		   name, old, new);
-    }
-    // this last line is probably not needed, count always increases
-    if (new>=0)
-      cfg->ataerrorcount=new;
-  }
-  closedevice(fd, name);
-  return 0;
-}
-
-
-
-int scsiCheckDevice(scsidevices_t *drive){
-  UINT8 returnvalue;
-  UINT8 currenttemp;
-  UINT8 triptemp;
-  int fd;
-  cfgfile *cfg=drive->cfg;
-
-  // if we can't open device, fail gracefully rather than hard --
-  // perhaps the next time around we'll be able to open it
-  if ((fd=opendevice(drive->devicename))<0)
-    return 1;
-
-  currenttemp = triptemp = 0;
-  
-  if (scsiCheckSmart(fd, drive->SmartPageSupported, &returnvalue, &currenttemp, &triptemp))
-    printout(LOG_INFO, "Device: %s, failed to read SMART values\n", drive->devicename);
-  
-  if (returnvalue) {
-    printout(LOG_CRIT, "Device: %s, SMART Failure: (%d) %s\n", drive->devicename, 
-	     (int)returnvalue, scsiSmartGetSenseCode(returnvalue));
-    printandmail(cfg->address, cfg->maildata, LOG_CRIT, "Device: %s, SMART Failure: (%d) %s\n", drive->devicename, 
-		 (int)returnvalue, scsiSmartGetSenseCode(returnvalue));
-  }
-  else if (debugmode)
-    printout(LOG_INFO,"Device: %s, Acceptable Attribute: %d\n", drive->devicename, (int)returnvalue);  
-  
-  // Seems to completely ignore what capabilities were found on the
-  // device when scanned
-  if (currenttemp){
-    if ((currenttemp != drive->Temperature) && (drive->Temperature))
-      printout(LOG_INFO, "Device: %s, Temperature changed %d degrees to %d degrees since last reading\n", 
-	       drive->devicename, (int) (currenttemp - drive->Temperature), (int)currenttemp );
-    drive->Temperature = currenttemp;
-  }
-  closedevice(fd, drive->devicename);
-  return 0;
-}
-
-void CheckDevices(atadevices_t *atadevices, scsidevices_t *scsidevices){
-  int i;
-  
-  // If there are no devices to monitor, then exit
-  if (!numatadevices && !numscsidevices){
-    printout(LOG_INFO,"Unable to monitor any SMART enabled ATA or SCSI devices.\n");
-    return;
-  }
-
-  // Infinite loop, which checkes devices
-  printout(LOG_INFO,"Started monitoring %d ATA and %d SCSI devices\n",numatadevices,numscsidevices);
-  while (1){
-    for (i=0; i<numatadevices; i++) 
-      ataCheckDevice(atadevices+i);
-    
-    for (i=0; i<numscsidevices; i++)
-      scsiCheckDevice(scsidevices+i);
-    
-    sleep(checktime);
-  }
-}
-
-char copyleftstring[]=
-"smartd comes with ABSOLUTELY NO WARRANTY. This\n"
-"is free software, and you are welcome to redistribute it\n"
-"under the terms of the GNU General Public License Version 2.\n"
-"See http://www.gnu.org for further details.\n\n";
-
-cfgfile config[MAXENTRIES];
-
-
-int parsetoken(char *token,cfgfile *cfg){
-  char sym=token[1];
-  char *name=cfg->name;
-  int lineno=cfg->lineno;
-  char *delim=" \n\t";
-
-  // is the rest of the line a comment
-  if (*token=='#')
-    return 1;
-  
-  // is the token not recognized?
-  if (*token!='-' || strlen(token)!=2) {
-    printout(LOG_CRIT,"Drive: %s, unknown Directive: %s at line %d of file %s\n",
-	     name,token,lineno,CONFIGFILE);
-    Directives();
-    exit(1);
-  }
-  
-  // let's parse the token and swallow its argument
-  switch (sym) {
-    char *arg;
-    char *endptr;
-    int val;
-    
-  case 'P':
-    // Permissive mode; ignore errors from Mandatory SMART commands
-    cfg->permissive=1;
-    break;
-  case 'A':
-    // ATA device
-    cfg->tryata=1;
-    cfg->tryscsi=0;
-    break;
-  case 'S':
-    //SCSI device
-    cfg->tryscsi=1;
-    cfg->tryata=0;
-    break;
-  case 'c':
-    // check SMART status
-    cfg->smartcheck=1;
-    break;
-  case 'f':
-    // check for failure of usage attributes
-    cfg->usagefailed=1;
-    break;
-  case 't':
-    // track changes in all vendor attributes
-    cfg->prefail=1;
-    cfg->usage=1;
-    break;
-  case 'p':
-    // track changes in prefail vendor attributes
-    cfg->prefail=1;
-    break;
-  case 'u':
-    //  track changes in usage vendor attributes
-    cfg->usage=1;
-    break;
-  case 'L':
-    // track changes in self-test log
-    cfg->selftest=1;
-    break;
-  case 'l':
-    // track changes ATA error log
-    cfg->errorlog=1;
-    break;
-  case 'a':
-    // monitor everything
-    cfg->smartcheck=1;
-    cfg->prefail=1;
-    cfg->usagefailed=1;
-    cfg->usage=1;
-    cfg->selftest=1;
-    cfg->errorlog=1;
-    break;
-  case 'M':
-    // send email to address that follows
-    arg=strtok(NULL,delim);
-    if (!arg) {
-      printout(LOG_CRIT,"Drive %s Directive: %s at line %d of file %s needs email address.\n",
-	       name,token,lineno,CONFIGFILE);
-      Directives();
-      exit(1);
-    }
-    if (!(cfg->address=strdup(arg))){
-      printout(LOG_CRIT,"Drive %s Directive: %s at line %d of file %s: no free memory for address %s.\n",
-	       name,token,lineno,CONFIGFILE,arg);
-      Directives();
-      exit(1);
-    }
-    break;
-  case 'i': // ignore
-  case 'I': // ignore
-  case 'C': // period (time interval) for checking
-    // ignore a particular vendor attribute for tracking (i) or
-    // failure (I).  Or give a check interval for sleeping.
-    arg=strtok(NULL,delim);
-    // make sure argument is there
-    if (!arg) {
-      printout(LOG_CRIT,"Drive %s Directive: %s at line %d of file %s needs integer argument.\n",
-	       name,token,lineno,CONFIGFILE);
-      Directives();
-      exit(1);
-    }
-    // get argument value, check that it's properly-formed, an
-    // integer, and in-range
-    val=strtol(arg,&endptr,10);
-    switch (sym) {
-    case 'C':
-      if (*endptr!='\0' || val<10) {
-	printout(LOG_CRIT,"Drive %s Directive: %s, line %d, file %s, has argument: %s, mimimum is ten secoonds\n",
-		 name,token,lineno,CONFIGFILE,arg);
-	Directives();
-	exit(1);
-      }
-      checktime=val;
-      return 1;
-    case 'i':
-    case 'I':
-      if (*endptr!='\0' || val<=0 || val>255 )  {
-	printout(LOG_CRIT,"Drive %s Directive: %s, line %d, file %s, has argument: %s, needs 0 < n < 256\n",
-		 name,token,lineno,CONFIGFILE,arg);
-	Directives();
-	exit(1);
-      }
-      // put into correct list (bitmaps, access only with isattoff()
-      // function. Turns OFF corresponding attribute.
-      if (sym=='I')
-	isattoff(val,cfg->trackatt,1);
-      else
-	isattoff(val,cfg->failatt,1);
-      return 1;
-    }
-  default:
-    printout(LOG_CRIT,"Drive: %s, unknown Directive: %s at line %d of file %s\n",
-	     name,token,lineno,CONFIGFILE);
-    Directives();
-    exit(1);
-  }
-  return 1;
-}
-
-int parseconfigline(int entry, int lineno,char *line){
-  char *token,*copy;
-  char *delim=" \n\t";
-  char *name;
-  int len;
-  cfgfile *cfg;
-  static int numtokens=0;
-
-  if (!(copy=strdup(line))){
-    perror("no memory available to parse line");
-    exit(1);
-  }
-  
-  // get first token -- device name
-  if (!(name=strtok(copy,delim)) || *name=='#'){
-    free(copy);
-    return 0;
-  }
-
-  // Have we detected the DEVICESCAN directive?
-  if (!strcmp(SCANDIRECTIVE,name)){
-    if (numtokens) {
-      printout(LOG_INFO,"Scan Directive %s must be the first entry in %s\n",name,CONFIGFILE);
-      exit(1);
-    }
-    else
-      printout(LOG_INFO,"Scan Directive %s found in %s. Scanning for devices.\n",name,CONFIGFILE);
-    free(copy);
-    return -1;
-  }
-  numtokens++;
-
-  // Is there space for another entry?
-  if (entry>=MAXENTRIES){
-    printout(LOG_CRIT,"Error: configuration file %s can have no more than %d entries\n",
-	     CONFIGFILE,MAXENTRIES);
-    exit(1);
-  }
-
-  // We've got a legit entry, clear structure
-  cfg=config+entry;
-  memset(cfg,0,sizeof(*config));
-
-  // Save info to process memory for after forking 32 bytes contains 1
-  // bit per possible attribute ID.  See isattoff()
-  cfg->name=strdup(name);
-  cfg->failatt=(unsigned char *)calloc(32,1);
-  cfg->trackatt=(unsigned char *)calloc(32,1);
-  
-  if (!cfg->name || !cfg->failatt || !cfg->trackatt) {
-    perror("no memory available to save name");
-    exit(1);
-  }
-
-  cfg->lineno=lineno;
-  cfg->tryscsi=cfg->tryata=1;
-  
-  // Try and recognize if a IDE or SCSI device.  These can be
-  // overwritten by configuration file directives.
-  len=strlen(name);
-  if (len>5 && !strncmp("/dev/h",name, 6))
-    cfg->tryscsi=0;
-  
-  if (len>5 && !strncmp("/dev/s",name, 6))
-    cfg->tryata=0;
-
-  // parse tokens one at a time from the file
-  while ((token=strtok(NULL,delim)) && parsetoken(token,cfg)){
-#if 0
-  printout(LOG_INFO,"Parsed token %s\n",token);
-#endif
-  }
-
-  // basic sanity check -- are any directives enabled?
-  if (!(cfg->smartcheck || cfg->usagefailed || cfg->prefail || cfg->usage || 
-	cfg->selftest || cfg->errorlog || cfg->tryscsi)){
-    printout(LOG_CRIT,"Drive: %s, no monitoring Directives on line %d of file %s\n",
-	     cfg->name, cfg->lineno, CONFIGFILE);
-    Directives();
-    exit(1);
-  }
-  
-  entry++;
-  free(copy);
-  return 1;
-}
-
-// returns number of entries in config file, or 0 if no config file
-// exists.  A config file with zero entries will cause an error
-// message and an exit.
-int parseconfigfile(){
-  FILE *fp;
-  int entry=0,lineno=1,cont=0,contlineno=0;
-  char line[MAXLINELEN+2];
-  char fullline[MAXCONTLINE+1];
-
-  // Open config file, if it exists
-  fp=fopen(CONFIGFILE,"r");
-  if (fp==NULL && errno!=ENOENT){
-    // file exists but we can't read it
-    if (errno<sys_nerr)
-      printout(LOG_CRIT,"%s: Unable to open configuration file %s\n",
-	       sys_errlist[errno],CONFIGFILE);
-    else
-      printout(LOG_CRIT,"Unable to open configuration file %s\n",CONFIGFILE);
-    exit(1);
-  }
-  
-  // No config file
-  if (fp==NULL)
-    return 0;
-  
-  // configuration file exists
-  printout(LOG_INFO,"Using configuration file %s\n",CONFIGFILE);
-
-  // parse config file line by line
-  while (1) {
-    int len=0,scandevice;
-    char *lastslash;
-    char *comment;
-    char *code;
-
-    // make debugging simpler
-    memset(line,0,sizeof(line));
-
-    // get a line
-    code=fgets(line,MAXLINELEN+2,fp);
-    
-    // are we at the end of the file?
-    if (!code){
-      if (cont) {
-	scandevice=parseconfigline(entry,lineno,fullline);
-	// See if we found a SCANDEVICE directive
-	if (scandevice<0)
-	  return -1;
-	// the final line is part of a continuation line
-	cont=0;
-	entry+=scandevice;
-      }
-      break;
-    }
-
-    // input file line number
-    contlineno++;
-    
-    // See if line is too long
-    len=strlen(line);
-    if (len>MAXLINELEN){
-      char *warn;
-      if (line[len-1]=='\n')
-	warn="(including newline!) ";
-      else
-	warn="";
-      printout(LOG_CRIT,"Error: line %d of file %s %sis more than %d characters.\n",
-	       (int)contlineno,CONFIGFILE,warn,(int)MAXLINELEN);
-      exit(1); 
-    }
-
-    // Ignore anything after comment symbol
-    if ((comment=index(line,'#'))){
-      *comment='\0';
-      len=strlen(line);
-    }
-
-    // is the total line (made of all continuation lines) too long?
-    if (cont+len>MAXCONTLINE){
-      printout(LOG_CRIT,"Error: continued line %d (actual line %d) of file %s is more than %d characters.\n",
-	       lineno, (int)contlineno, CONFIGFILE, (int)MAXCONTLINE);
-      exit(1);
-    }
-    
-    // copy string so far into fullline, and increment length
-    strcpy(fullline+cont,line);
-    cont+=len;
-
-    // is this a continuation line.  If so, replace \ by space and look at next line
-    if ( (lastslash=rindex(line,'\\')) && !strtok(lastslash+1," \n\t")){
-      *(fullline+(cont-len)+(lastslash-line))=' ';
-      continue;
-    }
-
-    // Not a continuation line. Parse it
-    scandevice=parseconfigline(entry,lineno,fullline);
-
-    // did we find a scandevice directive?
-    if (scandevice<0)
-      return -1;
-
-    entry+=scandevice;
-    lineno++;
-    cont=0;
-  }
-  fclose(fp);
-  if (entry)
-    return entry;
-  
-  printout(LOG_CRIT,"Configuration file %s contains no devices (like /dev/hda)\n",CONFIGFILE);
-  exit(1);
-}
-
-const char opts[] = {DEBUGMODE, PRINTCOPYLEFT,'h','?','\0' };
-
-// Parses input line, prints usage message and
-// version/license/copyright messages
-void ParseOpts(int argc, char **argv){
-  extern char *optarg;
-  extern int  optopt, optind, opterr;
-  int optchar;
-
-  opterr=optopt=0;
-
-  // Parse input options:
-  while (-1 != (optchar = getopt(argc, argv, opts))){
-    switch(optchar) {
-    case PRINTCOPYLEFT:
-      printcopyleft=TRUE;
-      break;
-    case DEBUGMODE :
-      debugmode  = TRUE;
-      break;
-    case '?':
-    case 'h':
-    default:
-      debugmode=1;
-      if (optopt) {
-	printhead();
-	printout(LOG_CRIT,"=======> UNRECOGNIZED OPTION: %c <======= \n\n",optopt);
-	Usage();
-	exit(-1);
-      }
-      printhead();
-      Usage();
-      exit(0);
-    }
-  }
-  
-  // If needed print copyright, license and version information
-  if (printcopyleft){
-    char out[CVSMAXLEN];
-    debugmode=1;
-    printhead();
-    printout(LOG_INFO,copyleftstring);
-    printout(LOG_INFO,"CVS version IDs of files used to build this code are:\n");
-    printone(out,CVSid1);
-    printout(LOG_INFO,"%s",out);
-    printone(out,CVSid2);
-    printout(LOG_INFO,"%s",out);
-    printone(out,CVSid6);
-    printout(LOG_INFO,"%s",out);
-    exit(0);
-  }
-  
-  // print header
-  printhead();
-  return;
-}
-
-// Function we call if no configuration file was found.  It makes
-// entries for /dev/hd[a-l] and /dev/sd[a-z].
-int makeconfigentries(int num, char *name, int isata, int start){
-  int i;
-  
-  if (MAXENTRIES<(start+num)){
-    printout(LOG_CRIT,"Error: simulated config file can have no more than %d entries\n",(int)MAXENTRIES);
-    exit(1);
-  }
-  
-  for(i=0; i<num; i++){
-    cfgfile *cfg=config+start+i;
-    
-    // clear all fields of structure
-    memset(cfg,0,sizeof(*cfg));
-    
-    // select if it's a SCSI or ATA device
-    cfg->tryata=isata;
-    cfg->tryscsi=!isata;
-    
-    // enable all possible tests
-    cfg->smartcheck=1;
-    cfg->prefail=1;
-    cfg->usagefailed=1;
-    cfg->usage=1;
-    cfg->selftest=1;
-    cfg->errorlog=1;
-    
-    // lineno==0 is our clue that the device was not found in a
-    // config file!
-    cfg->lineno=0;
-    
-    // put in the device name
-    cfg->name=strdup(name);
-    cfg->failatt=(unsigned char *)calloc(32,1);
-    cfg->trackatt=(unsigned char *)calloc(32,1);
-    if (!cfg->name || !cfg->failatt || !cfg->trackatt) {
-      perror("no memory available to save name");
-      exit(1);
-    }
-    // increment final character of the name
-    cfg->name[strlen(name)-1]+=i;
-  }
-  return i;
-}
-
-
-void cantregister(char *name, char *type, int line){
-  if (line)
-    printout(LOG_CRIT,"Unable to register %s device %s at line %d of file %s\n",
-	     type, name, line, CONFIGFILE);
-  else
-    printout(LOG_INFO,"Unable to register %s device %s\n",
-	     type, name);
-  return;
-}
-
-
-/* Main Program */
-int main (int argc, char **argv){
-  atadevices_t atadevices[MAXATADEVICES], *atadevicesptr=atadevices;
-  scsidevices_t scsidevices[MAXSCSIDEVICES], *scsidevicesptr=scsidevices;
-  int i,entries;
-  atamainctrl control;
-  
-  // initialize global communications variables
-  con=&control;
-  memset(con,0,sizeof(control));
-  
-  // Parse input and print header and usage info if needed
-  ParseOpts(argc,argv);
-  
-  // Do we mute printing from ataprint commands?
-  con->quietmode=0;
-  con->veryquietmode=debugmode?0:1;
-  con->checksumfail=0;
-
-  // look in configuration file CONFIGFILE (normally /etc/smartd.conf)
-  entries=parseconfigfile();
-
-  // If in background as a daemon, fork and close file descriptors
-  if (!debugmode){
-    daemon_init();
-  }
-
-  // setup signal handler for shutdown
-  if (signal(SIGINT, sighandler)==SIG_IGN)
-    signal(SIGINT, SIG_IGN);
-  if (signal(SIGTERM, sighandler)==SIG_IGN)
-    signal(SIGTERM, SIG_IGN);
-  if (signal(SIGQUIT, sighandler)==SIG_IGN)
-    signal(SIGQUIT, SIG_IGN);
-  if (signal(SIGHUP, huphandler)==SIG_IGN)
-    signal(SIGHUP, SIG_IGN);
-
-  
-  // install goobye message
-  atexit(goobye);
-  
-  // if there was no config file, create needed entries
-  if (entries<=0){
-    if (entries)
-      printout(LOG_INFO,"smartd: Scanning for devices.\n");
-    else
-      printout(LOG_INFO,"smartd: file %s not found. Searching for devices.\n",CONFIGFILE);
-    entries=0;
-    entries+=makeconfigentries(MAXATADEVICES,"/dev/hda",1,entries);
-    entries+=makeconfigentries(MAXSCSIDEVICES,"/dev/sda",0,entries);
-  }
-  
-
-  // Register entries
-  for (i=0;i<entries;i++){
-    // register ATA devices
-    if (config[i].tryata && atadevicescan2(atadevicesptr+numatadevices, config+i))
-      cantregister(config[i].name, "ATA", config[i].lineno);
-    
-    // then register SCSI devices
-    if (config[i].tryscsi && scsidevicescan(scsidevicesptr+numscsidevices, config+i))
-      cantregister(config[i].name, "SCSI", config[i].lineno);
-  }
-  
-  
-  // Now start an infinite loop that checks all devices
-  CheckDevices(atadevicesptr, scsidevicesptr); 
-  return 0;
-}
-
diff --git a/www/cvs-script b/www/cvs-script
deleted file mode 100755
index 6974e72e239dd9bb9e8220f35c9237c7252d1f34..0000000000000000000000000000000000000000
--- a/www/cvs-script
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-# execute this script in the current shell, using for example
-# . cvs_script
-unset CVS_SERVER
-export CVS_RSH=ssh
-export CVSROOT=:ext:ballen4705@cvs.smartmontools.sourceforge.net:/cvsroot/smartmontools
diff --git a/www/examples/HITACHI_DK23BA-20-0.txt b/www/examples/HITACHI_DK23BA-20-0.txt
deleted file mode 100644
index 13e9cb0122e0c6e4e072ddfc91efba9d9a4a3d19..0000000000000000000000000000000000000000
--- a/www/examples/HITACHI_DK23BA-20-0.txt
+++ /dev/null
@@ -1,163 +0,0 @@
-[root@ballen www]# /usr/sbin/smartctl -am /dev/hda
-
-smartctl version 5.0-25 Copyright (C) 2002 Bruce Allen
-Home page is http://smartmontools.sourceforge.net/
-
-=== START OF INFORMATION SECTION ===
-Device Model:     HITACHI_DK23BA-20                       
-Serial Number:    12H7M8
-Firmware Version: 00E0A0D2
-ATA Version is:   5
-ATA Standard is:  ATA/ATAPI-5 T13 1321D revision 1
-SMART support is: Available - device has SMART capability.
-SMART support is: Enabled
-
-=== START OF READ SMART DATA SECTION ===
-SMART overall-health self-assessment test result: PASSED
-See vendor-specific Attribute list for marginal Attributes.
-
-General SMART Values:
-Off-line data collection status: (0x00)	Offline data collection activity was
-					never started.
-Self-test execution status:      (   0)	The previous self-test routine completed
-					without error or no self-test has ever 
-					been run.
-Total time to complete off-line 
-data collection: 		 (1530) seconds.
-Offline data collection
-capabilities: 			 (0x1b) SMART execute Offline immediate.
-					Automatic timer ON/OFF support.
-					Suspend Offline collection upon new
-					command.
-					Offline surface scan supported.
-					Self-test supported.
-SMART capabilities:            (0x0003)	Saves SMART data before entering
-					power-saving mode.
-					Supports SMART auto save timer.
-Error logging capability:        (0x01)	Error logging supported.
-Short self-test routine 
-recommended polling time: 	 (   2) minutes.
-Extended self-test routine 
-recommended polling time: 	 (  26) minutes.
-
-SMART Attributes Data Structure revision number: 16
-Vendor Specific SMART Attributes with Thresholds:
-ID# ATTRIBUTE_NAME          FLAG     VALUE WORST THRESH TYPE     WHEN_FAILED RAW_VALUE
-  1 Raw_Read_Error_Rate     0x000d   100   083   050    Pre-fail     -       677
-  3 Spin_Up_Time            0x0007   100   100   050    Pre-fail     -       0
-  4 Start_Stop_Count        0x0032   100   100   050    Old_age      -       249
-  5 Reallocated_Sector_Ct   0x0033   099   099   010    Pre-fail     -       30
-  7 Seek_Error_Rate         0x000f   100   100   050    Pre-fail     -       319
-  9 Power_On_Hours          0x0032   099   099   060    Old_age      -       701 h + 42 m
- 10 Spin_Retry_Count        0x0013   100   100   050    Pre-fail     -       0
- 12 Power_Cycle_Count       0x0032   100   100   050    Old_age      -       249
-192 Power-Off_Retract_Count 0x0032   100   100   050    Old_age      -       15
-195 Hardware_ECC_Recovered  0x001a   100   001   050    Old_age  In_the_past 559
-196 Reallocated_Event_Count 0x0032   097   097   001    Old_age      -       30
-197 Current_Pending_Sector  0x0032   095   095   001    Old_age      -       5
-198 Offline_Uncorrectable   0x0010   095   095   001    Old_age      -       31
-199 UDMA_CRC_Error_Count    0x003e   200   200   000    Old_age      -       0
-221 G-Sense_Error_Rate      0x000a   100   100   050    Old_age      -       0
-223 Load_Retry_Count        0x0012   100   100   050    Old_age      -       0
-225 Load_Cycle_Count        0x0032   095   095   050    Old_age      -       18446744072753281791
-230 Unknown_Attribute       0x0032   100   100   060    Old_age      -       18484
-250 Unknown_Attribute       0x000a   100   070   050    Old_age      -       601
-
-SMART Error Log Version: 1
-ATA Error Count: 9 (device log contains only the most recent five errors)
-	DCR = Device Control Register
-	FR  = Features Register
-	SC  = Sector Count Register
-	SN  = Sector Number Register
-	CL  = Cylinder Low Register
-	CH  = Cylinder High Register
-	D/H = Device/Head Register
-	CR  = Content written to Command Register
-	ER  = Error register
-	STA = Status register
-Timestamp is seconds since the previous disk power-on.
-Note: timestamp "wraps" after 2^32 msec = 49.710 days.
-
-Error 1 occurred at disk power-on lifetime: 458 hours
-When the command that caused the error occurred, the device was active or idle.
-After command completion occurred, registers were:
-ER:40 SC:01 SN:15 CL:be CH:2e D/H:e0 ST:51
-Sequence of commands leading to the command that caused the error were:
-DCR   FR   SC   SN   CL   CH   D/H   CR   Timestamp
- 00   00   01   15   be   2e    e0   c8     831.599
- 00   00   01   14   be   2e    e0   c8     831.594
- 00   00   01   13   be   2e    e0   c8     831.594
- 00   00   01   12   be   2e    e0   c8     831.594
- 00   00   01   11   be   2e    e0   c8     831.594
-
-Error 2 occurred at disk power-on lifetime: 458 hours
-When the command that caused the error occurred, the device was active or idle.
-After command completion occurred, registers were:
-ER:40 SC:45 SN:15 CL:be CH:2e D/H:e0 ST:51
-Sequence of commands leading to the command that caused the error were:
-DCR   FR   SC   SN   CL   CH   D/H   CR   Timestamp
- 00   00   80   da   bd   2e    e0   c8     829.680
- 00   00   80   5a   bd   2e    e0   c8     829.677
- 00   00   80   da   bc   2e    e0   c8     829.673
- 00   00   80   5a   bc   2e    e0   c8     829.671
- 00   00   01   58   bc   2e    e0   c8     829.671
-
-Error 3 occurred at disk power-on lifetime: 458 hours
-When the command that caused the error occurred, the device was active or idle.
-After command completion occurred, registers were:
-ER:40 SC:01 SN:47 CL:bc CH:2e D/H:e0 ST:51
-Sequence of commands leading to the command that caused the error were:
-DCR   FR   SC   SN   CL   CH   D/H   CR   Timestamp
- 00   00   01   47   bc   2e    e0   c8     826.962
- 00   00   01   46   bc   2e    e0   c8     826.961
- 00   00   01   45   bc   2e    e0   c8     826.961
- 00   00   01   44   bc   2e    e0   c8     826.961
- 00   00   01   43   bc   2e    e0   c8     826.961
-
-Error 4 occurred at disk power-on lifetime: 458 hours
-When the command that caused the error occurred, the device was active or idle.
-After command completion occurred, registers were:
-ER:40 SC:13 SN:47 CL:bc CH:2e D/H:e0 ST:51
-Sequence of commands leading to the command that caused the error were:
-DCR   FR   SC   SN   CL   CH   D/H   CR   Timestamp
- 00   00   80   da   bb   2e    e0   c8     825.038
- 00   00   80   5a   bb   2e    e0   c8     825.033
- 00   00   80   da   ba   2e    e0   c8     825.030
- 00   00   80   5a   ba   2e    e0   c8     824.940
- 00   00   80   da   b9   2e    e0   c8     824.937
-
-Error 5 occurred at disk power-on lifetime: 458 hours
-When the command that caused the error occurred, the device was active or idle.
-After command completion occurred, registers were:
-ER:40 SC:01 SN:85 CL:19 CH:2c D/H:e0 ST:51
-Sequence of commands leading to the command that caused the error were:
-DCR   FR   SC   SN   CL   CH   D/H   CR   Timestamp
- 00   00   01   85   19   2c    e0   c8     816.487
- 00   00   01   84   19   2c    e0   c8     816.487
- 00   00   01   83   19   2c    e0   c8     816.486
- 00   00   01   82   19   2c    e0   c8     816.486
- 00   00   01   81   19   2c    e0   c8     816.486
-
-SMART Self-test log, version number 1
-Num  Test_Description    Status                  Remaining  LifeTime(hours)  LBA_of_first_error
-# 1  Short off-line      Completed                     00%       691         
-# 2  Extended off-line   Completed: read failure       40%       661         0x002c1985
-# 3  Extended off-line   Completed: read failure       40%       661         0x002c1985
-# 4  Short off-line      Completed                     00%       660         
-# 5  Extended off-line   Completed: read failure       40%       658         0x002c1985
-# 6  Short off-line      Completed                     00%       658         
-# 7  Short off-line      Completed                     00%       658         
-# 8  Extended off-line   Completed: read failure       40%       658         0x002c1985
-# 9  Extended off-line   Completed: read failure       40%       657         0x002c1985
-#10  Short off-line      Completed                     00%       647         
-#11  Short off-line      Completed                     00%       587         
-#12  Short off-line      Completed                     00%       583         
-#13  Short off-line      Completed                     00%       551         
-#14  Short captive       Interrupted (host reset)      40%       551         
-#15  Short off-line      Completed                     00%       551         
-#16  Extended off-line   Completed: read failure       40%       550         0x002c1985
-#17  Extended off-line   Aborted by host               50%       550         
-#18  Short off-line      Completed                     00%       550         
-#19  Short off-line      Completed                     00%       537         
-#20  Extended off-line   Completed: read failure       40%       536         0x002c1985
-#21  Short off-line      Completed                     00%       536         
diff --git a/www/examples/IC35L120AVVA07-0-0.txt b/www/examples/IC35L120AVVA07-0-0.txt
deleted file mode 100644
index 57926ccfba480e32daeec54bd0011e23ffdfc5e3..0000000000000000000000000000000000000000
--- a/www/examples/IC35L120AVVA07-0-0.txt
+++ /dev/null
@@ -1,69 +0,0 @@
-smartctl version 5.0-24 Copyright (C) 2002 Bruce Allen
-Home page is http://smartmontools.sourceforge.net/
-
-=== START OF INFORMATION SECTION ===
-Device Model:     IC35L120AVVA07-0                        
-Serial Number:    VNC605A6GG8W8A
-Firmware Version: VA6OA52A
-ATA Version is:   5
-ATA Standard is:  ATA/ATAPI-5 T13 1321D revision 1
-SMART support is: Available - device has SMART capability.
-SMART support is: Enabled
-
-=== START OF READ SMART DATA SECTION ===
-SMART overall-health self-assessment test result: PASSED
-
-General SMART Values:
-Off-line data collection status: (0x00)	Offline data collection activity was
-					never started.
-Self-test execution status:      (   0)	The previous self-test routine completed
-					without error or no self-test has ever 
-					been run.
-Total time to complete off-line 
-data collection: 		 (3399) seconds.
-Offline data collection
-capabilities: 			 (0x1b) SMART execute Offline immediate.
-					Automatic timer ON/OFF support.
-					Suspend Offline collection upon new
-					command.
-					Offline surface scan supported.
-					Self-test supported.
-SMART capabilities:            (0x0003)	Saves SMART data before entering
-					power-saving mode.
-					Supports SMART auto save timer.
-Error logging capability:        (0x01)	Error logging supported.
-Short self-test routine 
-recommended polling time: 	 (   1) minutes.
-Extended self-test routine 
-recommended polling time: 	 (  57) minutes.
-
-SMART Attributes Data Structure revision number: 16
-Vendor Specific SMART Attributes with Thresholds:
-ID# ATTRIBUTE_NAME          FLAG     VALUE WORST THRESH TYPE     WHEN_FAILED RAW_VALUE
-  1 Raw_Read_Error_Rate     0x000b   100   100   060    Pre-fail     -       0
-  2 Throughput_Performance  0x0005   147   147   050    Pre-fail     -       266
-  3 Spin_Up_Time            0x0007   093   093   024    Pre-fail     -       23593335
-  4 Start_Stop_Count        0x0012   100   100   000    Old_age      -       13
-  5 Reallocated_Sector_Ct   0x0033   100   100   005    Pre-fail     -       0
-  7 Seek_Error_Rate         0x000b   100   100   067    Pre-fail     -       0
-  8 Seek_Time_Performance   0x0005   138   138   020    Pre-fail     -       30
-  9 Power_On_Hours          0x0012   100   100   000    Old_age      -       554
- 10 Spin_Retry_Count        0x0013   100   100   060    Pre-fail     -       0
- 12 Power_Cycle_Count       0x0032   100   100   000    Old_age      -       13
-192 Power-Off_Retract_Count 0x0032   100   100   050    Old_age      -       36
-193 Load_Cycle_Count        0x0012   100   100   050    Old_age      -       36
-194 Temperature_Centigrade  0x0002   183   183   000    Old_age      -       30 (Lifetime Min/Max 23/39)
-196 Reallocated_Event_Count 0x0032   100   100   000    Old_age      -       0
-197 Current_Pending_Sector  0x0022   100   100   000    Old_age      -       0
-198 Offline_Uncorrectable   0x0008   100   100   000    Old_age      -       0
-199 UDMA_CRC_Error_Count    0x000a   200   200   000    Old_age      -       0
-
-SMART Error Log Version: 1
-No Errors Logged
-
-SMART Self-test log, version number 1
-Num  Test_Description    Status                  Remaining  LifeTime(hours)  LBA_of_first_error
-# 1  Extended off-line   Completed                     00%       492         
-# 2  Short off-line      Completed                     00%       296         
-# 3  Extended off-line   Completed                     00%       169         
-# 4  Short off-line      Completed                     00%       168         
diff --git a/www/examples/IC35L120AVVA07-0-1.txt b/www/examples/IC35L120AVVA07-0-1.txt
deleted file mode 100644
index 992a620cec64e49651e672bbf8da46d9f6a57e77..0000000000000000000000000000000000000000
--- a/www/examples/IC35L120AVVA07-0-1.txt
+++ /dev/null
@@ -1,67 +0,0 @@
-smartctl version 5.0-24 Copyright (C) 2002 Bruce Allen
-Home page is http://smartmontools.sourceforge.net/
-
-=== START OF INFORMATION SECTION ===
-Device Model:     IC35L120AVVA07-0                        
-Serial Number:    VNC605A6GEWZDA
-Firmware Version: VA6OA52A
-ATA Version is:   5
-ATA Standard is:  ATA/ATAPI-5 T13 1321D revision 1
-SMART support is: Available - device has SMART capability.
-SMART support is: Enabled
-
-=== START OF READ SMART DATA SECTION ===
-SMART overall-health self-assessment test result: PASSED
-
-General SMART Values:
-Off-line data collection status: (0x00)	Offline data collection activity was
-					never started.
-Self-test execution status:      (   0)	The previous self-test routine completed
-					without error or no self-test has ever 
-					been run.
-Total time to complete off-line 
-data collection: 		 (3399) seconds.
-Offline data collection
-capabilities: 			 (0x1b) SMART execute Offline immediate.
-					Automatic timer ON/OFF support.
-					Suspend Offline collection upon new
-					command.
-					Offline surface scan supported.
-					Self-test supported.
-SMART capabilities:            (0x0003)	Saves SMART data before entering
-					power-saving mode.
-					Supports SMART auto save timer.
-Error logging capability:        (0x01)	Error logging supported.
-Short self-test routine 
-recommended polling time: 	 (   1) minutes.
-Extended self-test routine 
-recommended polling time: 	 (  57) minutes.
-
-SMART Attributes Data Structure revision number: 16
-Vendor Specific SMART Attributes with Thresholds:
-ID# ATTRIBUTE_NAME          FLAG     VALUE WORST THRESH TYPE     WHEN_FAILED RAW_VALUE
-  1 Raw_Read_Error_Rate     0x000b   100   100   060    Pre-fail     -       0
-  2 Throughput_Performance  0x0005   100   100   050    Pre-fail     -       0
-  3 Spin_Up_Time            0x0007   098   098   024    Pre-fail     -       22348126
-  4 Start_Stop_Count        0x0012   100   100   000    Old_age      -       13
-  5 Reallocated_Sector_Ct   0x0033   100   100   005    Pre-fail     -       0
-  7 Seek_Error_Rate         0x000b   100   100   067    Pre-fail     -       0
-  8 Seek_Time_Performance   0x0005   100   100   020    Pre-fail     -       0
-  9 Power_On_Hours          0x0012   100   100   000    Old_age      -       554
- 10 Spin_Retry_Count        0x0013   100   100   060    Pre-fail     -       0
- 12 Power_Cycle_Count       0x0032   100   100   000    Old_age      -       13
-192 Power-Off_Retract_Count 0x0032   100   100   050    Old_age      -       36
-193 Load_Cycle_Count        0x0012   100   100   050    Old_age      -       36
-194 Temperature_Centigrade  0x0002   189   189   000    Old_age      -       29 (Lifetime Min/Max 23/36)
-196 Reallocated_Event_Count 0x0032   100   100   000    Old_age      -       0
-197 Current_Pending_Sector  0x0022   100   100   000    Old_age      -       0
-198 Offline_Uncorrectable   0x0008   100   100   000    Old_age      -       0
-199 UDMA_CRC_Error_Count    0x000a   200   200   000    Old_age      -       0
-
-SMART Error Log Version: 1
-No Errors Logged
-
-SMART Self-test log, version number 1
-Num  Test_Description    Status                  Remaining  LifeTime(hours)  LBA_of_first_error
-# 1  Extended off-line   Completed                     00%       492         
-# 2  Extended off-line   Completed                     00%       169         
diff --git a/www/examples/MAXTOR-0.txt b/www/examples/MAXTOR-0.txt
deleted file mode 100644
index 13e0eb28e95d5c7d703ac975814277c44d1c525c..0000000000000000000000000000000000000000
--- a/www/examples/MAXTOR-0.txt
+++ /dev/null
@@ -1,139 +0,0 @@
-smartctl version 5.0-24 Copyright (C) 2002 Bruce Allen
-Home page is http://smartmontools.sourceforge.net/
-
-=== START OF INFORMATION SECTION ===
-Device Model:     MAXTOR 4K080H4                          
-Serial Number:    674205306226        
-Firmware Version: A08.1500
-ATA Version is:   5
-ATA Standard is:  ATA/ATAPI-5 T13 1321D revision 1
-SMART support is: Available - device has SMART capability.
-SMART support is: Enabled
-
-=== START OF READ SMART DATA SECTION ===
-SMART overall-health self-assessment test result: PASSED
-
-General SMART Values:
-Off-line data collection status: (0x02)	Offline data collection activity 
-					completed without error.
-Self-test execution status:      ( 112)	The previous self-test completed having
-					the read element of the test failed.
-Total time to complete off-line 
-data collection: 		 (  44) seconds.
-Offline data collection
-capabilities: 			 (0x1b) SMART execute Offline immediate.
-					Automatic timer ON/OFF support.
-					Suspend Offline collection upon new
-					command.
-					Offline surface scan supported.
-					Self-test supported.
-SMART capabilities:            (0x0003)	Saves SMART data before entering
-					power-saving mode.
-					Supports SMART auto save timer.
-Error logging capability:        (0x01)	Error logging supported.
-Short self-test routine 
-recommended polling time: 	 (   2) minutes.
-Extended self-test routine 
-recommended polling time: 	 (  50) minutes.
-
-SMART Attributes Data Structure revision number: 11
-Vendor Specific SMART Attributes with Thresholds:
-ID# ATTRIBUTE_NAME          FLAG     VALUE WORST THRESH TYPE     WHEN_FAILED RAW_VALUE
-  1 Raw_Read_Error_Rate     0x0029   100   253   020    Pre-fail     -       0
-  3 Spin_Up_Time            0x0027   077   077   020    Pre-fail     -       2909
-  4 Start_Stop_Count        0x0032   100   100   008    Old_age      -       29
-  5 Reallocated_Sector_Ct   0x0033   100   100   020    Pre-fail     -       1
-  7 Seek_Error_Rate         0x000b   100   100   023    Pre-fail     -       0
-  9 Power_On_Hours          0x0012   097   097   001    Old_age      -       1992
- 10 Spin_Retry_Count        0x0026   100   100   000    Old_age      -       0
- 11 Calibration_Retry_Count 0x0013   100   100   020    Pre-fail     -       0
- 12 Power_Cycle_Count       0x0032   100   100   008    Old_age      -       29
- 13 Read_Soft_Error_Rate    0x000b   100   100   023    Pre-fail     -       0
-194 Temperature_Centigrade  0x0022   093   090   042    Old_age      -       19
-195 Hardware_ECC_Recovered  0x001a   100   006   000    Old_age      -       7683906
-196 Reallocated_Event_Count 0x0010   099   099   020    Old_age      -       1
-197 Current_Pending_Sector  0x0032   100   100   020    Old_age      -       1
-198 Offline_Uncorrectable   0x0010   100   100   000    Old_age      -       0
-199 UDMA_CRC_Error_Count    0x001a   198   198   000    Old_age      -       2
-
-SMART Error Log Version: 1
-ATA Error Count: 11 (device log contains only the most recent five errors)
-	DCR = Device Control Register
-	FR  = Features Register
-	SC  = Sector Count Register
-	SN  = Sector Number Register
-	CL  = Cylinder Low Register
-	CH  = Cylinder High Register
-	D/H = Device/Head Register
-	CR  = Content written to Command Register
-	ER  = Error register
-	STA = Status register
-Timestamp is seconds since the previous disk power-on.
-Note: timestamp "wraps" after 2^32 msec = 49.710 days.
-
-Error 1 occurred at disk power-on lifetime: 1029 hours
-When the command that caused the error occurred, the device was in an unknown state.
-After command completion occurred, registers were:
-ER:40 SC:02 SN:41 CL:2d CH:70 D/H:e8 ST:d1
-Sequence of commands leading to the command that caused the error were:
-DCR   FR   SC   SN   CL   CH   D/H   CR   Timestamp
- 70   08   02   41   2d   70    e8   c4     90.713
- 70   08   04   3f   2d   70    e8   c4     86.648
- 70   08   06   3d   2d   70    e8   c4     82.584
- 70   08   08   3b   2d   70    e8   c4     78.342
- 28   08   04   8b   2c   28    e8   c5     78.341
-
-Error 2 occurred at disk power-on lifetime: 1029 hours
-When the command that caused the error occurred, the device was in an unknown state.
-After command completion occurred, registers were:
-ER:40 SC:04 SN:3f CL:2d CH:70 D/H:e8 ST:d1
-Sequence of commands leading to the command that caused the error were:
-DCR   FR   SC   SN   CL   CH   D/H   CR   Timestamp
- 70   08   04   3f   2d   70    e8   c4     86.648
- 70   08   06   3d   2d   70    e8   c4     82.584
- 70   08   08   3b   2d   70    e8   c4     78.342
- 28   08   04   8b   2c   28    e8   c5     78.341
- 28   08   08   4b   2c   28    e8   c5     78.339
-
-Error 3 occurred at disk power-on lifetime: 1029 hours
-When the command that caused the error occurred, the device was in an unknown state.
-After command completion occurred, registers were:
-ER:40 SC:06 SN:3d CL:2d CH:70 D/H:e8 ST:d1
-Sequence of commands leading to the command that caused the error were:
-DCR   FR   SC   SN   CL   CH   D/H   CR   Timestamp
- 70   08   06   3d   2d   70    e8   c4     82.584
- 70   08   08   3b   2d   70    e8   c4     78.342
- 28   08   04   8b   2c   28    e8   c5     78.341
- 28   08   08   4b   2c   28    e8   c5     78.339
- 28   08   08   0b   2c   28    e8   c5     78.338
-
-Error 4 occurred at disk power-on lifetime: 1029 hours
-When the command that caused the error occurred, the device was in an unknown state.
-After command completion occurred, registers were:
-ER:40 SC:08 SN:3b CL:2d CH:70 D/H:e8 ST:d1
-Sequence of commands leading to the command that caused the error were:
-DCR   FR   SC   SN   CL   CH   D/H   CR   Timestamp
- 70   08   08   3b   2d   70    e8   c4     78.342
- 28   08   04   8b   2c   28    e8   c5     78.341
- 28   08   08   4b   2c   28    e8   c5     78.339
- 28   08   08   0b   2c   28    e8   c5     78.338
- 28   08   08   cb   2b   28    e8   c5     78.337
-
-Error 5 occurred at disk power-on lifetime: 1029 hours
-When the command that caused the error occurred, the device was in an unknown state.
-After command completion occurred, registers were:
-ER:40 SC:66 SN:41 CL:2d CH:70 D/H:e8 ST:d1
-Sequence of commands leading to the command that caused the error were:
-DCR   FR   SC   SN   CL   CH   D/H   CR   Timestamp
- 70   08   66   41   2d   70    e8   c4     69.020
- 70   08   68   3f   2d   70    e8   c4     64.956
- 70   08   6a   3d   2d   70    e8   c4     60.891
- 70   08   6c   3b   2d   70    e8   c4     56.826
- 70   08   fe   a9   2c   70    e8   c4     52.713
-
-SMART Self-test log, version number 1
-Num  Test_Description    Status                  Remaining  LifeTime(hours)  LBA_of_first_error
-# 1  Extended off-line   Completed: read failure       90%      1965         0x08702f11
-# 2  Short off-line      Completed                     00%      1800         
-# 3  Short off-line      Completed                     00%      1778         
-# 4  Short off-line      Completed                     00%      1777         
diff --git a/www/examples/MAXTOR-1.txt b/www/examples/MAXTOR-1.txt
deleted file mode 100644
index b1ed8ace35f6f00813087682bb8b1d9177b3ad2f..0000000000000000000000000000000000000000
--- a/www/examples/MAXTOR-1.txt
+++ /dev/null
@@ -1,143 +0,0 @@
-smartctl version 5.0-24 Copyright (C) 2002 Bruce Allen
-Home page is http://smartmontools.sourceforge.net/
-
-=== START OF INFORMATION SECTION ===
-Device Model:     MAXTOR 4K080H4                          
-Serial Number:    674119123435        
-Firmware Version: A08.1500
-ATA Version is:   5
-ATA Standard is:  ATA/ATAPI-5 T13 1321D revision 1
-SMART support is: Available - device has SMART capability.
-SMART support is: Enabled
-
-=== START OF READ SMART DATA SECTION ===
-SMART overall-health self-assessment test result: FAILED!
-Drive failure expected in less than 24 hours. SAVE ALL DATA.
-See vendor-specific Attribute list for failed Attributes.
-
-General SMART Values:
-Off-line data collection status: (0x04)	Offline data collection activity was 
-					suspended by an interrupting command from host.
-Self-test execution status:      (  89)	The previous self-test completed having
-					the electrical element of the test
-					failed.
-Total time to complete off-line 
-data collection: 		 (2536) seconds.
-Offline data collection
-capabilities: 			 (0x1b) SMART execute Offline immediate.
-					Automatic timer ON/OFF support.
-					Suspend Offline collection upon new
-					command.
-					Offline surface scan supported.
-					Self-test supported.
-SMART capabilities:            (0x0003)	Saves SMART data before entering
-					power-saving mode.
-					Supports SMART auto save timer.
-Error logging capability:        (0x01)	Error logging supported.
-Short self-test routine 
-recommended polling time: 	 (   2) minutes.
-Extended self-test routine 
-recommended polling time: 	 (  50) minutes.
-
-SMART Attributes Data Structure revision number: 11
-Vendor Specific SMART Attributes with Thresholds:
-ID# ATTRIBUTE_NAME          FLAG     VALUE WORST THRESH TYPE     WHEN_FAILED RAW_VALUE
-  1 Raw_Read_Error_Rate     0x0029   100   253   020    Pre-fail     -       0
-  3 Spin_Up_Time            0x0027   074   074   020    Pre-fail     -       3294
-  4 Start_Stop_Count        0x0032   100   100   008    Old_age      -       32
-  5 Reallocated_Sector_Ct   0x0033   001   001   020    Pre-fail FAILING_NOW 499
-  7 Seek_Error_Rate         0x000b   100   001   023    Pre-fail In_the_past 0
-  9 Power_On_Hours          0x0012   086   086   001    Old_age      -       9812
- 10 Spin_Retry_Count        0x0026   100   100   000    Old_age      -       0
- 11 Calibration_Retry_Count 0x0013   100   100   020    Pre-fail     -       0
- 12 Power_Cycle_Count       0x0032   100   100   008    Old_age      -       32
- 13 Read_Soft_Error_Rate    0x000b   100   001   023    Pre-fail In_the_past 0
-194 Temperature_Centigrade  0x0022   091   086   042    Old_age      -       24
-195 Hardware_ECC_Recovered  0x001a   006   004   000    Old_age      -       417912090
-196 Reallocated_Event_Count 0x0010   100   100   020    Old_age      -       0
-197 Current_Pending_Sector  0x0032   033   032   020    Old_age      -       338
-198 Offline_Uncorrectable   0x0010   100   100   000    Old_age      -       0
-199 UDMA_CRC_Error_Count    0x001a   200   200   000    Old_age      -       0
-
-SMART Error Log Version: 1
-ATA Error Count: 20255 (device log contains only the most recent five errors)
-	DCR = Device Control Register
-	FR  = Features Register
-	SC  = Sector Count Register
-	SN  = Sector Number Register
-	CL  = Cylinder Low Register
-	CH  = Cylinder High Register
-	D/H = Device/Head Register
-	CR  = Content written to Command Register
-	ER  = Error register
-	STA = Status register
-Timestamp is seconds since the previous disk power-on.
-Note: timestamp "wraps" after 2^32 msec = 49.710 days.
-
-Error 1 occurred at disk power-on lifetime: 9574 hours
-When the command that caused the error occurred, the device was in a vendor specific or reserved state.
-After command completion occurred, registers were:
-ER:40 SC:60 SN:b8 CL:c6 CH:02 D/H:e5 ST:d1
-Sequence of commands leading to the command that caused the error were:
-DCR   FR   SC   SN   CL   CH   D/H   CR   Timestamp
- 02   05   60   b8   c6   02    e5   c4     474.857
- 02   05   f8   20   c6   02    e5   c4     470.748
- 02   05   08   18   c6   02    e5   c4     470.746
- 00   00   f8   20   c5   02    e5   c4     470.732
- 00   00   08   18   c5   02    e5   c4     470.730
-
-Error 2 occurred at disk power-on lifetime: 9574 hours
-When the command that caused the error occurred, the device was in a vendor specific or reserved state.
-After command completion occurred, registers were:
-ER:40 SC:68 SN:b0 CL:c6 CH:02 D/H:e5 ST:d1
-Sequence of commands leading to the command that caused the error were:
-DCR   FR   SC   SN   CL   CH   D/H   CR   Timestamp
- 02   05   f8   20   c6   02    e5   c4     470.748
- 02   05   08   18   c6   02    e5   c4     470.746
- 00   00   f8   20   c5   02    e5   c4     470.732
- 00   00   08   18   c5   02    e5   c4     470.730
- 02   05   f8   20   c4   02    e5   c4     470.717
-
-Error 3 occurred at disk power-on lifetime: 9574 hours
-When the command that caused the error occurred, the device was in a vendor specific or reserved state.
-After command completion occurred, registers were:
-ER:40 SC:08 SN:c0 CL:3e CH:0e D/H:e5 ST:d1
-Sequence of commands leading to the command that caused the error were:
-DCR   FR   SC   SN   CL   CH   D/H   CR   Timestamp
- 0e   05   08   c0   3e   0e    e5   c4     181.677
- d0   04   08   b0   67   d0    e4   c5     181.651
- 0e   05   08   a0   45   0e    e5   c4     181.646
- 0e   05   80   20   43   0e    e5   c4     181.635
- 0e   05   80   20   41   0e    e5   c4     181.622
-
-Error 4 occurred at disk power-on lifetime: 9574 hours
-When the command that caused the error occurred, the device was in a vendor specific or reserved state.
-After command completion occurred, registers were:
-ER:40 SC:60 SN:c0 CL:3e CH:0e D/H:e5 ST:d1
-Sequence of commands leading to the command that caused the error were:
-DCR   FR   SC   SN   CL   CH   D/H   CR   Timestamp
- 0e   05   80   a0   3e   0e    e5   c4     172.530
- 0e   05   80   20   3d   0e    e5   c4     172.335
- 0e   05   80   20   3c   0e    e5   c4     164.744
- 0e   05   10   10   3b   0e    e5   c4     164.736
- 0e   05   f8   18   3a   0e    e5   c4     157.202
-
-Error 5 occurred at disk power-on lifetime: 9574 hours
-When the command that caused the error occurred, the device was in a vendor specific or reserved state.
-After command completion occurred, registers were:
-ER:40 SC:c0 SN:18 CL:04 CH:d3 D/H:e4 ST:d1
-Sequence of commands leading to the command that caused the error were:
-DCR   FR   SC   SN   CL   CH   D/H   CR   Timestamp
- d3   04   c0   18   04   d3    e4   c4     502.837
- d3   04   f8   e0   03   d3    e4   c4     498.739
- d3   04   f8   e8   02   d3    e4   c4     498.716
- 55   01   c8   90   70   55    e1   c4     498.705
- 55   01   38   48   70   55    e1   c4     498.680
-
-SMART Self-test log, version number 1
-Num  Test_Description    Status                  Remaining  LifeTime(hours)  LBA_of_first_error
-# 1  Short off-line      Completed: electrical failure 90%      9786         
-# 2  Extended captive    Completed: servo/seek failure 90%      9676         0x04b7ed3d
-# 3  Extended captive    Completed                     00%      9575         
-# 4  Extended off-line   Completed                     00%      9432         
-# 5  Extended off-line   Completed                     00%      9415         
diff --git a/www/examples/MAXTOR-2.txt b/www/examples/MAXTOR-2.txt
deleted file mode 100644
index 9ff60ffcb3927d55bfa1c40ff5b803b9cc9ced87..0000000000000000000000000000000000000000
--- a/www/examples/MAXTOR-2.txt
+++ /dev/null
@@ -1,79 +0,0 @@
-smartctl version 5.0-24 Copyright (C) 2002 Bruce Allen
-Home page is http://smartmontools.sourceforge.net/
-
-=== START OF INFORMATION SECTION ===
-Device Model:     MAXTOR 4K080H4                          
-Serial Number:    674119113862        
-Firmware Version: A08.1500
-ATA Version is:   5
-ATA Standard is:  ATA/ATAPI-5 T13 1321D revision 1
-SMART support is: Available - device has SMART capability.
-SMART support is: Enabled
-
-=== START OF READ SMART DATA SECTION ===
-SMART overall-health self-assessment test result: PASSED
-See vendor-specific Attribute list for marginal Attributes.
-
-General SMART Values:
-Off-line data collection status: (0x05)	Offline data collection activity was 
-					aborted by an interrupting command from host.
-Self-test execution status:      (   0)	The previous self-test routine completed
-					without error or no self-test has ever 
-					been run.
-Total time to complete off-line 
-data collection: 		 (  44) seconds.
-Offline data collection
-capabilities: 			 (0x1b) SMART execute Offline immediate.
-					Automatic timer ON/OFF support.
-					Suspend Offline collection upon new
-					command.
-					Offline surface scan supported.
-					Self-test supported.
-SMART capabilities:            (0x0003)	Saves SMART data before entering
-					power-saving mode.
-					Supports SMART auto save timer.
-Error logging capability:        (0x01)	Error logging supported.
-Short self-test routine 
-recommended polling time: 	 (   2) minutes.
-Extended self-test routine 
-recommended polling time: 	 (  50) minutes.
-
-SMART Attributes Data Structure revision number: 11
-Vendor Specific SMART Attributes with Thresholds:
-ID# ATTRIBUTE_NAME          FLAG     VALUE WORST THRESH TYPE     WHEN_FAILED RAW_VALUE
-  1 Raw_Read_Error_Rate     0x0029   100   253   020    Pre-fail     -       0
-  3 Spin_Up_Time            0x0027   075   075   020    Pre-fail     -       3249
-  4 Start_Stop_Count        0x0032   100   100   008    Old_age      -       31
-  5 Reallocated_Sector_Ct   0x0033   100   100   020    Pre-fail     -       0
-  7 Seek_Error_Rate         0x000b   100   001   023    Pre-fail In_the_past 0
-  9 Power_On_Hours          0x0012   086   086   001    Old_age      -       9754
- 10 Spin_Retry_Count        0x0026   100   100   000    Old_age      -       0
- 11 Calibration_Retry_Count 0x0013   100   100   020    Pre-fail     -       0
- 12 Power_Cycle_Count       0x0032   100   100   008    Old_age      -       31
- 13 Read_Soft_Error_Rate    0x000b   100   100   023    Pre-fail     -       0
-194 Temperature_Centigrade  0x0022   035   032   042    Old_age  FAILING_NOW 168
-195 Hardware_ECC_Recovered  0x001a   100   002   000    Old_age      -       880099716
-196 Reallocated_Event_Count 0x0010   100   100   020    Old_age      -       0
-197 Current_Pending_Sector  0x0032   100   100   020    Old_age      -       0
-198 Offline_Uncorrectable   0x0010   100   253   000    Old_age      -       0
-199 UDMA_CRC_Error_Count    0x001a   200   200   000    Old_age      -       0
-
-SMART Error Log Version: 1
-No Errors Logged
-
-SMART Self-test log, version number 1
-Num  Test_Description    Status                  Remaining  LifeTime(hours)  LBA_of_first_error
-# 1  Short off-line      Completed                     00%      9691         
-# 2  Short captive       Completed                     00%      9691         
-# 3  Extended captive    Completed                     00%      9618         
-# 4  Extended captive    Interrupted (host reset)      90%      9563         
-# 5  Short captive       Completed                     00%      9563         
-# 6  Short off-line      Completed                     00%      9563         
-# 7  Short captive       Completed                     00%      9545         
-# 8  Extended off-line   Completed                     00%      9541         
-# 9  Short captive       Completed                     00%      9541         
-#10  Extended off-line   Completed                     00%      9537         
-#11  Extended off-line   Completed                     00%      9536         
-#12  Extended off-line   Interrupted (host reset)      90%      9534         
-#13  Extended off-line   Completed                     00%      9517         
-#14  Extended off-line   Completed                     00%      9484         
diff --git a/www/examples/MAXTOR-3.txt b/www/examples/MAXTOR-3.txt
deleted file mode 100644
index 26df69e5977a8b4e46958290ac79b663d7246e4e..0000000000000000000000000000000000000000
--- a/www/examples/MAXTOR-3.txt
+++ /dev/null
@@ -1,67 +0,0 @@
-smartctl version 5.0-24 Copyright (C) 2002 Bruce Allen
-Home page is http://smartmontools.sourceforge.net/
-
-=== START OF INFORMATION SECTION ===
-Device Model:     MAXTOR 6L080J4                          
-Serial Number:    664201100034        
-Firmware Version: A93.0500
-ATA Version is:   5
-ATA Standard is:  ATA/ATAPI-5 T13 1321D revision 1
-SMART support is: Available - device has SMART capability.
-SMART support is: Enabled
-
-=== START OF READ SMART DATA SECTION ===
-SMART overall-health self-assessment test result: PASSED
-
-General SMART Values:
-Off-line data collection status: (0x00)	Offline data collection activity was
-					never started.
-Self-test execution status:      (   0)	The previous self-test routine completed
-					without error or no self-test has ever 
-					been run.
-Total time to complete off-line 
-data collection: 		 (  35) seconds.
-Offline data collection
-capabilities: 			 (0x1b) SMART execute Offline immediate.
-					Automatic timer ON/OFF support.
-					Suspend Offline collection upon new
-					command.
-					Offline surface scan supported.
-					Self-test supported.
-SMART capabilities:            (0x0003)	Saves SMART data before entering
-					power-saving mode.
-					Supports SMART auto save timer.
-Error logging capability:        (0x01)	Error logging supported.
-Short self-test routine 
-recommended polling time: 	 (   2) minutes.
-Extended self-test routine 
-recommended polling time: 	 (  40) minutes.
-
-SMART Attributes Data Structure revision number: 11
-Vendor Specific SMART Attributes with Thresholds:
-ID# ATTRIBUTE_NAME          FLAG     VALUE WORST THRESH TYPE     WHEN_FAILED RAW_VALUE
-  1 Raw_Read_Error_Rate     0x0029   100   253   020    Pre-fail     -       0
-  3 Spin_Up_Time            0x0027   069   066   020    Pre-fail     -       3984
-  4 Start_Stop_Count        0x0032   100   100   008    Old_age      -       110
-  5 Reallocated_Sector_Ct   0x0033   100   100   020    Pre-fail     -       0
-  7 Seek_Error_Rate         0x000b   100   100   023    Pre-fail     -       0
-  9 Power_On_Hours          0x0012   099   099   001    Old_age      -       1294
- 10 Spin_Retry_Count        0x0026   100   100   000    Old_age      -       0
- 11 Calibration_Retry_Count 0x0013   100   100   020    Pre-fail     -       0
- 12 Power_Cycle_Count       0x0032   100   100   008    Old_age      -       110
- 13 Read_Soft_Error_Rate    0x000b   100   100   023    Pre-fail     -       0
-194 Temperature_Centigrade  0x0022   092   087   042    Old_age      -       22
-195 Hardware_ECC_Recovered  0x001a   100   100   000    Old_age      -       1163
-196 Reallocated_Event_Count 0x0010   100   100   020    Old_age      -       0
-197 Current_Pending_Sector  0x0032   100   100   020    Old_age      -       0
-198 Offline_Uncorrectable   0x0010   100   253   000    Old_age      -       0
-199 UDMA_CRC_Error_Count    0x001a   200   200   000    Old_age      -       0
-
-SMART Error Log Version: 1
-No Errors Logged
-
-SMART Self-test log, version number 1
-Num  Test_Description    Status                  Remaining  LifeTime(hours)  LBA_of_first_error
-# 1  Extended off-line   Completed                     00%      1038         
-# 2  Extended off-line   Aborted by host               00%       786         
-# 3  Extended off-line   Aborted by host               00%       786         
diff --git a/www/examples/MAXTOR-4.txt b/www/examples/MAXTOR-4.txt
deleted file mode 100644
index 65ae2850d953448898079f827870b697f26dc07d..0000000000000000000000000000000000000000
--- a/www/examples/MAXTOR-4.txt
+++ /dev/null
@@ -1,65 +0,0 @@
-smartctl version 5.0-24 Copyright (C) 2002 Bruce Allen
-Home page is http://smartmontools.sourceforge.net/
-
-=== START OF INFORMATION SECTION ===
-Device Model:     MAXTOR 6L080J4                          
-Serial Number:    664205757172        
-Firmware Version: A93.0500
-ATA Version is:   5
-ATA Standard is:  ATA/ATAPI-5 T13 1321D revision 1
-SMART support is: Available - device has SMART capability.
-SMART support is: Enabled
-
-=== START OF READ SMART DATA SECTION ===
-SMART overall-health self-assessment test result: PASSED
-
-General SMART Values:
-Off-line data collection status: (0x04)	Offline data collection activity was 
-					suspended by an interrupting command from host.
-Self-test execution status:      (   0)	The previous self-test routine completed
-					without error or no self-test has ever 
-					been run.
-Total time to complete off-line 
-data collection: 		 (  35) seconds.
-Offline data collection
-capabilities: 			 (0x1b) SMART execute Offline immediate.
-					Automatic timer ON/OFF support.
-					Suspend Offline collection upon new
-					command.
-					Offline surface scan supported.
-					Self-test supported.
-SMART capabilities:            (0x0003)	Saves SMART data before entering
-					power-saving mode.
-					Supports SMART auto save timer.
-Error logging capability:        (0x01)	Error logging supported.
-Short self-test routine 
-recommended polling time: 	 (   2) minutes.
-Extended self-test routine 
-recommended polling time: 	 (  40) minutes.
-
-SMART Attributes Data Structure revision number: 11
-Vendor Specific SMART Attributes with Thresholds:
-ID# ATTRIBUTE_NAME          FLAG     VALUE WORST THRESH TYPE     WHEN_FAILED RAW_VALUE
-  1 Raw_Read_Error_Rate     0x0029   100   253   020    Pre-fail     -       0
-  3 Spin_Up_Time            0x0027   065   064   020    Pre-fail     -       4481
-  4 Start_Stop_Count        0x0032   100   100   008    Old_age      -       81
-  5 Reallocated_Sector_Ct   0x0033   100   100   020    Pre-fail     -       0
-  7 Seek_Error_Rate         0x000b   100   100   023    Pre-fail     -       0
-  9 Power_On_Hours          0x0012   098   098   001    Old_age      -       1767
- 10 Spin_Retry_Count        0x0026   100   100   000    Old_age      -       0
- 11 Calibration_Retry_Count 0x0013   100   100   020    Pre-fail     -       0
- 12 Power_Cycle_Count       0x0032   100   100   008    Old_age      -       81
- 13 Read_Soft_Error_Rate    0x000b   100   100   023    Pre-fail     -       0
-194 Temperature_Centigrade  0x0022   091   084   042    Old_age      -       24
-195 Hardware_ECC_Recovered  0x001a   100   100   000    Old_age      -       52795
-196 Reallocated_Event_Count 0x0010   100   100   020    Old_age      -       0
-197 Current_Pending_Sector  0x0032   100   100   020    Old_age      -       0
-198 Offline_Uncorrectable   0x0010   100   253   000    Old_age      -       0
-199 UDMA_CRC_Error_Count    0x001a   200   200   000    Old_age      -       0
-
-SMART Error Log Version: 1
-No Errors Logged
-
-SMART Self-test log, version number 1
-Num  Test_Description    Status                  Remaining  LifeTime(hours)  LBA_of_first_error
-# 1  Extended off-line   Completed                     00%      1283         
diff --git a/www/examples/Maxtor-5.txt b/www/examples/Maxtor-5.txt
deleted file mode 100644
index 3bb171eb6fd032d5ad56dea9925c85bec295c545..0000000000000000000000000000000000000000
--- a/www/examples/Maxtor-5.txt
+++ /dev/null
@@ -1,127 +0,0 @@
-smartctl version 5.0-36 Copyright (C) 2002 Bruce Allen
-Home page is http://smartmontools.sourceforge.net/
-
-=== START OF INFORMATION SECTION ===
-Device Model:     Maxtor 98196H8                          
-Serial Number:    V80HV6NC            
-Firmware Version: ZAH814Y0
-ATA Version is:   6
-ATA Standard is:  ATA/ATAPI-6 T13 1410D revision 0
-SMART support is: Available - device has SMART capability.
-SMART support is: Enabled
-
-=== START OF READ SMART DATA SECTION ===
-SMART overall-health self-assessment test result: PASSED
-
-General SMART Values:
-Off-line data collection status: (0x00)	Offline data collection activity was
-					never started.
-Self-test execution status:      (   0)	The previous self-test routine completed
-					without error or no self-test has ever 
-					been run.
-Total time to complete off-line 
-data collection: 		 (  30) seconds.
-Offline data collection
-capabilities: 			 (0x1b) SMART execute Offline immediate.
-					Automatic timer ON/OFF support.
-					Suspend Offline collection upon new
-					command.
-					Offline surface scan supported.
-					Self-test supported.
-SMART capabilities:            (0x0003)	Saves SMART data before entering
-					power-saving mode.
-					Supports SMART auto save timer.
-Error logging capability:        (0x01)	Error logging supported.
-Short self-test routine 
-recommended polling time: 	 (   2) minutes.
-Extended self-test routine 
-recommended polling time: 	 (  60) minutes.
-
-SMART Attributes Data Structure revision number: 16
-Vendor Specific SMART Attributes with Thresholds:
-ID# ATTRIBUTE_NAME          FLAG     VALUE WORST THRESH TYPE     WHEN_FAILED RAW_VALUE
-  1 Raw_Read_Error_Rate     0x000a   253   252   000    Old_age      -       26
-  3 Spin_Up_Time            0x0027   208   206   063    Pre-fail     -       11285
-  4 Start_Stop_Count        0x0032   253   253   000    Old_age      -       62
-  5 Reallocated_Sector_Ct   0x0033   253   253   063    Pre-fail     -       0
-  6 Read_Channel_Margin     0x0001   253   253   100    Pre-fail     -       0
-  7 Seek_Error_Rate         0x000a   253   252   000    Old_age      -       0
-  8 Seek_Time_Performance   0x0027   249   244   187    Pre-fail     -       50271
-  9 Power_On_Hours          0x0032   236   236   000    Old_age      -       32671
- 10 Spin_Retry_Count        0x002b   253   252   223    Pre-fail     -       0
- 11 Calibration_Retry_Count 0x002b   253   252   223    Pre-fail     -       0
- 12 Power_Cycle_Count       0x0032   253   253   000    Old_age      -       67
-196 Reallocated_Event_Count 0x0008   253   253   000    Old_age      -       0
-197 Current_Pending_Sector  0x0008   253   253   000    Old_age      -       0
-198 Offline_Uncorrectable   0x0008   253   253   000    Old_age      -       0
-199 UDMA_CRC_Error_Count    0x0008   199   199   000    Old_age      -       0
-200 Unknown_Attribute       0x000a   253   252   000    Old_age      -       0
-201 Unknown_Attribute       0x000a   253   252   000    Old_age      -       1
-202 Unknown_Attribute       0x000a   253   252   000    Old_age      -       0
-203 Unknown_Attribute       0x000b   253   252   180    Pre-fail     -       2
-204 Unknown_Attribute       0x000a   253   252   000    Old_age      -       0
-205 Unknown_Attribute       0x000a   253   252   000    Old_age      -       0
-207 Unknown_Attribute       0x002a   253   252   000    Old_age      -       0
-208 Unknown_Attribute       0x002a   253   252   000    Old_age      -       0
-209 Unknown_Attribute       0x0024   253   253   000    Old_age      -       0
- 96 Unknown_Attribute       0x0004   253   253   000    Old_age      -       0
- 97 Unknown_Attribute       0x0004   253   253   000    Old_age      -       0
- 98 Unknown_Attribute       0x0004   253   253   000    Old_age      -       0
- 99 Unknown_Attribute       0x0004   253   253   000    Old_age      -       0
-100 Unknown_Attribute       0x0004   253   253   000    Old_age      -       0
-101 Unknown_Attribute       0x0004   253   253   000    Old_age      -       0
-
-SMART Error Log Version: 1
-ATA Error Count: 3
-	DCR = Device Control Register
-	FR  = Features Register
-	SC  = Sector Count Register
-	SN  = Sector Number Register
-	CL  = Cylinder Low Register
-	CH  = Cylinder High Register
-	D/H = Device/Head Register
-	CR  = Content written to Command Register
-	ER  = Error register
-	STA = Status register
-Timestamp is seconds since the previous disk power-on.
-Note: timestamp "wraps" after 2^32 msec = 49.710 days.
-
-Error 1 occurred at disk power-on lifetime: 0 hours
-When the command that caused the error occurred, the device was in an unknown state.
-After command completion occurred, registers were:
-ER:04 SC:40 SN:42 CL:97 CH:23 D/H:00 ST:51
-Sequence of commands leading to the command that caused the error were:
-DCR   FR   SC   SN   CL   CH   D/H   CR   Timestamp
- 00   fe   00   00   00   00    00   ef     137.440
- 00   d9   00   00   4f   c2    00   b0     137.328
- 00   da   00   00   4f   c2    00   b0     137.232
- 00   d8   00   00   4f   c2    00   b0     137.152
- 00   db   00   00   4f   c2    00   b0     136.976
-
-Error 2 occurred at disk power-on lifetime: 0 hours
-When the command that caused the error occurred, the device was in an unknown state.
-After command completion occurred, registers were:
-ER:04 SC:40 SN:40 CL:97 CH:23 D/H:00 ST:51
-Sequence of commands leading to the command that caused the error were:
-DCR   FR   SC   SN   CL   CH   D/H   CR   Timestamp
- 00   fe   00   00   00   00    00   ef     342.432
- 00   e4   00   00   00   00    00   c3     342.368
- 00   d0   00   00   0a   00    00   c3     342.368
- 00   fe   00   00   00   00    00   ef     342.304
- 00   3d   00   00   00   00    00   c3     342.256
-
-Error 3 occurred at disk power-on lifetime: 0 hours
-When the command that caused the error occurred, the device was in an unknown state.
-After command completion occurred, registers were:
-ER:04 SC:40 SN:40 CL:97 CH:03 D/H:00 ST:51
-Sequence of commands leading to the command that caused the error were:
-DCR   FR   SC   SN   CL   CH   D/H   CR   Timestamp
- 00   fe   00   00   00   00    00   ef     342.304
- 00   3d   00   00   00   00    00   c3     342.256
- 00   e4   00   00   00   00    00   c3     342.192
- 00   3d   00   00   00   00    00   c3     342.192
- 00   00   01   01   00   00    00   ec     342.144
-
-SMART Self-test log, version number 1
-Num  Test_Description    Status                  Remaining  LifeTime(hours)  LBA_of_first_error
-# 1  Short off-line      Completed                     00%      5255         
diff --git a/www/examples/TOSHIBA-0.txt b/www/examples/TOSHIBA-0.txt
deleted file mode 100644
index 965e55d99af8af42a5d6592c3159dd9fbb70312a..0000000000000000000000000000000000000000
--- a/www/examples/TOSHIBA-0.txt
+++ /dev/null
@@ -1,73 +0,0 @@
-smartctl version 5.0-31 Copyright (C) 2002 Bruce Allen
-Home page is http://smartmontools.sourceforge.net/
-
-=== START OF INFORMATION SECTION ===
-Device Model:     TOSHIBA MK2018GAS                       
-Serial Number:    X22F7553T           
-Firmware Version: Q2.03 D 
-ATA Version is:   5
-ATA Standard is:  Unrecognized. Minor revision code: 0x00
-SMART support is: Available - device has SMART capability.
-SMART support is: Enabled
-
-=== START OF READ SMART DATA SECTION ===
-SMART overall-health self-assessment test result: PASSED
-
-General SMART Values:
-Off-line data collection status: (0x00)	Offline data collection activity was
-					never started.
-Self-test execution status:      (   0)	The previous self-test routine completed
-					without error or no self-test has ever 
-					been run.
-Total time to complete off-line 
-data collection: 		 ( 212) seconds.
-Offline data collection
-capabilities: 			 (0x1b) SMART execute Offline immediate.
-					Automatic timer ON/OFF support.
-					Suspend Offline collection upon new
-					command.
-					Offline surface scan supported.
-					Self-test supported.
-SMART capabilities:            (0x0003)	Saves SMART data before entering
-					power-saving mode.
-					Supports SMART auto save timer.
-Error logging capability:        (0x01)	Error logging supported.
-Short self-test routine 
-recommended polling time: 	 (   2) minutes.
-Extended self-test routine 
-recommended polling time: 	 (  23) minutes.
-
-SMART Attributes Data Structure revision number: 16
-Vendor Specific SMART Attributes with Thresholds:
-ID# ATTRIBUTE_NAME          FLAG     VALUE WORST THRESH TYPE     WHEN_FAILED RAW_VALUE
-  1 Raw_Read_Error_Rate     0x000b   100   100   050    Pre-fail     -       0
-  2 Throughput_Performance  0x0005   100   100   050    Pre-fail     -       0
-  3 Spin_Up_Time            0x0027   100   100   001    Pre-fail     -       910
-  4 Start_Stop_Count        0x0032   100   100   000    Old_age      -       18
-  5 Reallocated_Sector_Ct   0x0033   100   100   050    Pre-fail     -       0
-  7 Seek_Error_Rate         0x000b   100   100   050    Pre-fail     -       0
-  8 Seek_Time_Performance   0x0005   100   100   050    Pre-fail     -       0
-  9 Power_On_Hours          0x0032   100   100   000    Old_age      -       9
- 10 Spin_Retry_Count        0x0033   100   100   030    Pre-fail     -       0
- 12 Power_Cycle_Count       0x0032   100   100   000    Old_age      -       18
-192 Power-Off_Retract_Count 0x0032   100   100   000    Old_age      -       6
-193 Load_Cycle_Count        0x0032   100   100   000    Old_age      -       437
-196 Reallocated_Event_Count 0x0032   100   100   000    Old_age      -       0
-197 Current_Pending_Sector  0x0032   100   100   000    Old_age      -       0
-198 Offline_Uncorrectable   0x0030   100   100   000    Old_age      -       0
-199 UDMA_CRC_Error_Count    0x0032   200   200   000    Old_age      -       0
-220 Disk_Shift              0x0002   100   100   000    Old_age      -       4250
-222 Loaded_Hours            0x0032   100   100   000    Old_age      -       4
-223 Load_Retry_Count        0x0032   100   100   000    Old_age      -       0
-224 Load_Friction           0x0022   100   100   000    Old_age      -       0
-226 Load-in_Time            0x0026   100   100   000    Old_age      -       590
-240 Unknown_Attribute       0x0001   100   100   001    Pre-fail     -       0
-
-SMART Error Log Version: 1
-No Errors Logged
-
-SMART Self-test log, version number 1
-Num  Test_Description    Status                  Remaining  LifeTime(hours)  LBA_of_first_error
-# 1  Extended off-line   Completed                     00%         4         
-# 2  Short captive       Completed                     00%         0         
-# 3  Short off-line      Completed                     00%         0         
diff --git a/www/index.html b/www/index.html
deleted file mode 100644
index 0e4418e1b96198e6dcc923a3ac70ab804d568932..0000000000000000000000000000000000000000
--- a/www/index.html
+++ /dev/null
@@ -1,367 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-<head>
- <title>smartmontools Home Page</title>
- <link rev="made" href="mailto:smartmontools-support @ sourceforge.net" />
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta name="description" content="smartmontools Home Page" />
- <meta name="keywords" content="SMART, S.M.A.R.T., Linux, disk monitoring" />
-</head>
-<body>
-
-<div align="center"><h1><font color="#3333ff">smartmontools Home Page</font></h1></div>
-
-<p>This is the home page for smartmontools.&#160; The smartmontools
-package contains two utility programs
-(<font color="#3333ff"><b>smartctl</b></font> and
-<font color="#3333ff"><b>smartd</b></font>) to control and monitor storage
-systems using the Self-Monitoring, Analysis and Reporting Technology
-System (S.M.A.R.T.) built into most modern ATA and SCSI hard
-disks.&#160; It is derived from the smartsuite package, and includes
-support for ATA/ATAPI-5 disks.&#160; It should run on any modern Linux
-system.</p>
-
-<p>For printing convenience, everything except for the <a href="#sampleoutput">example output</a> is on a single page.</p>
-
-<hr size="2" />
-
-<ul>
-<li><a href="#howtodownload">How to download and install
-smartmontools</a></li>
-<li><a href="#PROBLEMS">Serious Problem Reports (system lockup, etc.)</a></li>
-<li><a href="#FAQ">Frequently Asked Questions</a></li>
-<li><a href="#testinghelp">The code needs to be tested on SCSI,
-FireWire, USB, and SATA disks/tapes</a></li>
-<li><a href="#differfromsmartsuite">How does smartmontools differ from
-smartsuite?</a></li>
-<li><a href="#references">Useful references on S.M.A.R.T. and
-ATA/ATAPI-5, -6, and -7</a></li>
-<li><a href="#sampleoutput">Example output from smartmontools</a>
-<b>smartctl</b> utility</li>
-<li><a href="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/smartmontools/">CVS
-repository</a> and <a href="http://sourceforge.net/projects/smartmontools/">SourceForge's
-Project Page</a></li>
-<li>Mailing List <a href="http://lists.sourceforge.net/lists/listinfo/smartmontools-support">Information</a>
-and <a href="http://sourceforge.net/mailarchive/forum.php?forum=smartmontools-support">Archives</a></li>
-</ul>
-
-<hr size="2" />
-
-<b><a name="howtodownload"></a>How to download and install
-smartmontools</b>
-
-<p>There are three different ways to get and install smartmontools.&#160; 
-You can use any one of these three procedures.&#160; Just after "Method
-3" below are some instructions for trying out smartmontools once you
-have completed the installation.</p>
-
-<b>First Method - Install from the RPM file</b>
-<ul>
-<li>Download the latest binary RPM file (<tt>*.rpm</tt>) from <a href="http://sourceforge.net/project/showfiles.php?group_id=64297">here</a>.&#160;
-Don't get the SRPM file (<tt>*.src.rpm</tt>).</li>
-<li>Install it using RPM.&#160; <i>You must be root to do this</i>:
-<pre>su root (enter root password)
-rpm -ivh smartmontools-5.0-1.i386.rpm</pre>
-For most users, this is all that is needed.</li>
-<li>If you receive an error message, you have probably previously
-installed the <tt>smartsuite</tt> package, or RedHat's
-<tt>kernel-utils</tt> package, which provide older versions of the
-<tt>smartd</tt> and <tt>smartctl</tt> utilities.&#160; In this case you
-should use the <tt>--nodeps</tt> or <tt>--force</tt> arguments of rpm to
-replace these two utilities:
-<pre>rpm -ivh --nodeps --force smartmontools-5.0-1.i386.rpm</pre></li>
-<li>If you want to remove the package (<tt>rpm -e smartmontools</tt>)
-and your system does not have <tt>chkconfig</tt> installed, you may need
-to use:
-<pre>rpm -e --noscripts smartmontools</pre></li>
-</ul>
-
-<b>Second Method - Install from the source tarball</b>
-<ul>
-<li>Download the latest source tarball from <a href="http://sourceforge.net/project/showfiles.php?group_id=64297">here</a>.
-Note: you probably want the most recent release.</li>
-<li>Uncompress the tarball:
-<pre>tar zxvf smartmontools-5.0-1.tar.gz</pre></li>
-<li>The previous step created a directory called smartmontools-5.0-1
-containing the code.&#160; Go to that directory, build, and install:
-<pre>cd smartmontools-5.0-1
-make
-make install (only root can do this)</pre></li>
-</ul>
-
-<b>Third Method - Install from the CVS repository</b>
-<ul>
-<li><p>One of the really cool things about CVS is that you can get
-<i>any</i> version of the code you want, from the first release up the
-the most current development version.&#160; And it's trivial, because
-each release is <u>tagged</u> with a name like
-<tt>RELEASE_5_0_26</tt>.&#160; You can see what the different names are
-by looking at the <a href="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/smartmontools/sm5/">
-CVS repository</a>.&#160; You'll see the tag names in the little scroll
-window where it says "Show only files with tag".&#160; All you need to
-do to get the latest development code is:</p>
-
-<pre>cvs -d: pserver:anonymous@cvs.smartmontools.sourceforge.net:/cvsroot/smartmontools login (when prompted for a password, just press Enter)
-cvs -d: pserver:anonymous@cvs.smartmontools.sourceforge.net:/cvsroot/smartmontools co sm5</pre></li>
-
-<li>To instead get the 5.0-26 release:
-
-<pre>cvs -d :pserver:anonymous@cvs.smartmontools.sourceforge.net:/cvsroot/smartmontools co -r RELEASE_5_0_26 sm5</pre></li>
-
-<li><p>This will create a subdirectory called <tt>sm5/</tt> containing the
-code.&#160; Go to that directory, build, and install:</p>
-
-<pre>cd sm5
-make
-make install (only root can do this)</pre></li>
-
-<li>To update your sources to the 5.0-30 release:
-
-<pre>cd sm5
-cvs up -r RELEASE_5_0_30</pre></li>
-
-<li>To update any tagged release to the latest development code:
-
-<pre>cd sm5
-cvs up -A</pre></li>
-</ul>
-
-<b>After installing using Method 1, 2 or 3 above, you can read the man
-pages, and try out the commands:</b>
-
-<pre>man 8 smartctl
-man 8 smartd
-/usr/sbin/smartctl -etf /dev/hda (only root can do this)
-/usr/sbin/smartctl -a /dev/hda (only root can do this)</pre>
-
-<p>Note that the default location for the manual pages are in
-<tt>/usr/share/man/man8</tt>.&#160; If "<tt>man</tt>" does not find the
-manual pages, then you may need to add <tt>/usr/share/man</tt> to your
-<tt>MANPATH</tt> environment variable.</p>
-
-<hr size="2" />
-
-<a name="PROBLEMS"></a><b>Serious Problem Reports</b>
-<p>If a serious problem gets reported to us, it gets added to the <a
-href="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/smartmontools/sm5/WARNINGS?rev=HEAD&amp;content-type=text/vnd.viewcvs-markup">
-WARNINGS</a> file in smartmontools. So far the only problem report is
-about a SCSI RAID controller.</p>
-
-<a name="FAQ"></a><b>Frequently Asked Questions</b>
-
-<p>If your question is not here, please <a href="mailto:smartmontools-support @ lists.sourceforge.net">email
-me</a>.</p>
-
-<ul>
-<li><b>What do I do if I have problems, or need support?&#160; Suppose
-I want to become a developer, or suggest some new extensions?</b>
-
-<p>Please send an email to the <a href="http://lists.sourceforge.net/mailman/listinfo/smartmontools-support">smartmontools-support
-mailing list</a>.&#160; Please take a look through the archives to see
-if your question has been answered.</p></li>
-
-<li><b>What are the future plans for smartmontools?</b>
-
-<p>My plan is that smartmontools-5.x will support ATA/ATAPI-5
-disks.&#160; Eventually, we'll do smartmontools-6.x to support
-ATA/ATAPI-6 disks, smartmontools-7.x for the ATA/ATAPI-7 standard, and
-so on.&#160; The "x" will denote revision level, as bugs get found and
-fixed, and as enhancements get added.&#160; If it's possible to maintain
-backwards compatibility, that would be nice, but I don't know if it will
-be possible or practical.</p></li>
-
-<li><b>Why are you doing this?</b>
-
-<p>My research group runs a beowulf cluster with 300 ATA-5 disks.&#160; We
-have more than 20 TB of data stored on the system.&#160; It's nice to
-have advanced warning when a disk is going to fail.</p></li>
-
-<li><b>I see some strange output from smartctl.  What does it mean?</b>
-
-<p>The raw S.M.A.R.T. attributes (temperature, power-on lifetime, and so
-on) are stored in vendor-specific structures.&#160; Sometime these are
-strange.&#160; Hitachi disks (at least some of them) store power-on
-lifetime in minutes, rather than hours.&#160; IBM disks (at least some
-of them) have three temperatures stored in the raw structure, not just
-one.&#160; And so on.&#160; If you find strange output, or unknown
-attributes, please send an email to <a href="http://lists.sourceforge.net/mailman/listinfo/smartmontools-support"> 
-smartmontools-support</a> and we'll help you try and figure it
-out.</p></li>
-
-<li><b>What attributes does smartmontools not yet recognize?</b>
-
-<p>From a Hitachi disk: (230)(250)</p>
-
-<p>If you can attach names/meanings to these attributes, please send me
-a note to <a href="http://lists.sourceforge.net/mailman/listinfo/smartmontools-support"> 
-smartmontools-support</a>.</p></li>
-
-<li><b>When I run <tt>smartd</tt>, the SYSLOG <tt>/var/log/messages</tt>
-contains messages like this:</b>
-<pre>smartd: Reading Device /dev/sdv
-modprobe: modprobe: Can't locate module block-major-65</pre>
-
-<p>This is because when <tt>smartd</tt> starts, it looks for all ATA and
-SCSI devices to monitor (matching the pattern <tt>/dev/hd[a-z]</tt> or
-<tt>/dev/sd[a-z]</tt>).&#160; The log messages appear because your
-system doesn't have most of these devices.</p>
-
-<p>The latest release of smartd can use a configuration file
-<tt>/etc/smartd.conf</tt> to specify which devices to include or exclude
-from start-up search.</p></li>
-
-<li><b>What's the story on IBM S.M.A.R.T. disks?</b>
-
-<p>Apparently some of the older S.M.A.R.T. firmware on IBM disks can 
-interfere with the regular operation of the disk.&#160; If you have this
-problem, here is an <a href="http://www.geocities.com/dtla_update/">IBM
-DISK FIRMWARE UPGRADE</a> that fixes the problem.</p></li>
-</ul>
-
-<hr size="2" /><a name="testinghelp"></a><b>Help needed in testing
-smartmontools, especially on SCSI, FireWire, USB, and SATA
-disks/systems</b>
-
-<p>I have access to a number of systems with ATA S.M.A.R.T. disks, but I
-don't have any access to systems with SCSI, FireWire, USB, and SATA
-S.M.A.R.T. devices.&#160; I'd be very grateful to find someone who could
-help me test the smartmontools code on them.&#160; Since it's derived
-from the smartsuite package, it should initially work about the same way
-with SCSI devices as the smartsuite tools did.</p>
-
-<p>I'd be especially happy if someone would like to take on the task, as
-a developer, of maintaining the SCSI code.&#160; Do you have a beowulf
-cluster with a few hundred SCSI disks?&#160; Please volunteer !</p>
-
-<hr size="2" /><a name="differfromsmartsuite"></a><b>How does
-smartmontools differ from smartsuite?</b>
-
-<p>The smartsuite code was originally developed as a Senior Thesis by
-Michael Cornwell at the Concurrent Systems Laboratory (now part of the
-<a href="http://ssrc.soe.ucsc.edu/">Storage Systems Research
-Center</a>), Jack Baskin School of Engineering, University of
-California, Santa Cruz.
-You can find some information about the original smartsuite project here:
-<a href="http://www.ucsc.edu/news_events/press_releases/archive/99-00/09-99/smart_software.htm">Press Release 1</a>, 
-<a href="http://www.santa-cruz.com/archive/1999/September/22/local/stories/5local.htm">Press Release 2</a>, 
-<a href="http://www.ucsc.edu/currents/99-00/09-27/smart.html">Press Release 3</a>.
-</p>
-
-<p>Smartmontools was derived directly from smartsuite.&#160; It differs
-from smartsuite in that it supports the ATA/ATAPI-5 standard.&#160; So
-for example <tt>smartctl</tt> from smartsuite has no facility for
-printing the S.M.A.R.T. self-test logs, and doesn't print timestamp
-information in the most usable way.&#160; The <tt>smartctl</tt> utility
-in smartmontools has added functionality for this (<tt>-q,-Q, -L,-f, -F, -U, -P
-and -m</tt> options), updated documentation, and also fixes small
-technical bugs in smartsuite.&#160; See the 
-<a href="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/smartmontools/sm5/CHANGELOG?rev=HEAD&amp;content-type=text/plain">CHANGELOG</a>
-file in CVS for a summary of what's been done.&#160; The <tt>smartd</tt>
-utility differs from the smartsuite <tt>smartd</tt> in major ways.&#160;
-First, it prints somewhat more informative error messages to the syslog.
-&#160; Second, on startup it looks for a configuration file
-<tt>/etc/smartd.conf</tt>, and if <tt>smartd</tt> finds this file, it
-monitors the list of devices therein, rather than querying all IDE and
-SCSI devices on your system.&#160; (If the configuration file does not
-exist, then it does query all IDE and SCSI devices.)&#160; Also, it's
-a well-behaved daemon and doesn't leave open file descriptors and other
-detrius behind.&#160; In addition, the <tt>smartmontools</tt> version of
-<tt>smartd</tt> can be instructed (via Directives in the configuration
-file) to monitor for changes in a number of different disk properties:
-the SMART status, failure or prefailure attributes going below
-threshold, new errors appearing in the ATA Error Log or the SMART
-Self-Test Log, and so on.</p>
-
-<p>The other principle difference is that smartmontools is an OpenSource
-development project, meaning that we keep the files in CVS, and that 
-other developers who wish to contribute can commit changes to the
-archive.&#160; If you would like to contribute, please write to to <a href="http://lists.sourceforge.net/mailman/listinfo/smartmontools-support">smartmontools-support</a>.</p>
-
-<p>But the bottom line is that the code in smartmontools is derived
-directly from smartsuite and is similar.&#160; The smartsuite package
-can be found <a href="http://sourceforge.net/projects/smartsuite/">here</a>.</p>
-
-<hr size="2" /><a name="references"></a><b><big>Useful references on
-S.M.A.R.T. and the  ATA/ATAPI standards</big></b>
-
-<p><big>If you are having trouble understanding the output of smartctl
-or smartd, please first read the manual pages:</big></p>
-
-<pre>
-man 8 smartctl
-man 8 smartd
-</pre>
-
-<p><big>If you'd like to know more about S.M.A.R.T., then the following
-references may be helpful:</big></p>
-
-<ul>
- <li>The <a href="http://www.t13.org/project/d1321r1c.pdf"> ATAPI/ATA-5
-Revision 1 specification</a> (start with Section 8.41)</li>
- <li><a href="http://www.t13.org/#FTP_site">Earlier and later revisions
-of the ATAPI/ATA Specs</a></li>
-<li>SCSI References:
-<ul>
- <li>The <a href="http://www.t10.org">homepage of the T10 project</a>.</li>
- <li>The <a href="ftp://ftp.t10.org/t10/drafts/s2/">SCSI-2 draft</a> by the T10 project.</li>
- <li>See also other subdirectories <a href="ftp://ftp.t10.org/t10/drafts/">here</a>.</li>
-</ul>
-</li>
-<li>The original S.M.A.R.T. specification is SFF-8035i from the <a href="http://www.sffcommittee.com/ns/">SFF Committee</a>.&#160; 
-Here is their <a href="ftp://ftp.seagate.com/sff/INF-8035.TXT"> "link"</a>.</li>
- <li>From the <a href="http://cmrr.ucsd.edu/smart/">UCSD SMART Project</a>:
- <ul>
-  <li><a href="http://cmrr.ucsd.edu/smart/tech_papr/HamerlySmartPaper.pdf">Bayesian
-Approaches to Failure Prediction for Disk Drives</a></li>
-  <li><a href="http://cmrr.ucsd.edu/smart/tech_papr/SmtPapTransReliFinalWeb.pdf">Improved
-Disk-Drive Failure Warnings</a></li>
- </ul>
- </li>
- <li>From the Seagate Corporation:
- <ul>
-  <li><a href="http://www.seagate.com/docs/pdf/whitepaper/drive_reliability.pdf" target="_blank">Estimating Drive Reliability in Desktop Computers and
-Consumer Electronics Systems</a></li>
-  <li><a href="http://www.seagate.com/docs/pdf/whitepaper/enhanced_smart.pdf" target="_blank">Enhanced SMART - Get S.M.A.R.T. For Reliability</a></li>
-  <li><a href="http://www.seagate.com/docs/pdf/whitepaper/smart_u8.pdf" target="_blank">Playing it S.M.A.R.T.</a></li>
-  <li><a href="http://www.seagate.com/docs/pdf/whitepaper/Enhanced_DST_Tech_Paper.pdf" target="_blank">Enhanced Drive Self-Test</a></li>
- </ul>
- </li>
- <li><a href="http://www.maxtor.com/products/DiamondMax/software/maxsafe.pdf" target="_blank">Drive reliability and safety system: MaxSafe</a> (Maxtor)</li>
- <li><u>Specifying Reliability in the Disk Drive Industry: No More
-MTBF's</u>, Jon G. Elerath (IBM Storage Systems Division) in
-<i>Proceedings of the IEEE 2000 Annual Reliability and Maintainability
-Symposium, pg 194, 0-7803-5848-1/00/$10.00.</i></li>
-</ul>
-
-<hr size="2" /><a name="sampleoutput"></a><b>Example output
-from smartmontools smartctl utility:</b>
-
-<ul>
- <li><a href="/examples/MAXTOR-0.txt">MAXTOR 4K080H4</a> 80 GB 5400 RPM</li>
- <li><a href="/examples/MAXTOR-1.txt">MAXTOR 4K080H4</a> 80 GB 5400 RPM (has failing SMART status)</li>
- <li><a href="/examples/MAXTOR-2.txt">MAXTOR 4K080H4</a> 80 GB 5400 RPM (has had failing SMART test in the past.  Look at the Seek Error Rate)</li>
- <li><a href="/examples/MAXTOR-3.txt">MAXTOR 6L080J4</a> 80 GB 7200 RPM</li>
- <li><a href="/examples/MAXTOR-4.txt">MAXTOR 6L080J4</a> 80 GB 7200 RPM</li>
- <li><a href="/examples/Maxtor-5.txt">Maxtor 98196H8</a> 80 GB 5400 RPM</li>
- <li><a href="/examples/IC35L120AVVA07-0-0.txt">IBM IC35L120AVVA07</a> 120 GB 7200 RPM</li>
- <li><a href="/examples/IC35L120AVVA07-0-1.txt">IBM IC35L120AVVA07</a> 120 GB 7200 RPM</li>
- <li><a href="/examples/HITACHI_DK23BA-20-0.txt">HITACHI_DK23BA-20</a> Hitachi 20 GB Laptop Disk</li>
- <li><a href="/examples/TOSHIBA-0.txt">TOSHIBA MK2018GAS</a> Toshiba 20 GB Laptop Disk</li>
-</ul>
-
-<hr size="2" />
-
-Maintained by <a href="mailto:smartmontools-support @ lists.sourceforge.net">Bruce Allen</a>
-
-<br />
-
-<div align="center">Hosted by</div>
-
-<div align="center"><a href="http://sourceforge.net/"><img style="border:0;width=:88px;height:31px" src="http://sourceforge.net/sflogo.php?group_id=64297&amp;type=5" alt="SourceForge.net" /></a></div>
-
-<br />
-
-<div align="center"><a href="http://validator.w3.org/check/referer"><img style="border:0;width=:88px;height:31px" src="http://www.w3.org/Icons/valid-xhtml10.png" alt="Valid XHTML 1.0!" /></a></div>
-
-</body>
-</html>
diff --git a/www/script b/www/script
deleted file mode 100755
index fa7cd8c224367b6aba467f81fc960da4efc80375..0000000000000000000000000000000000000000
--- a/www/script
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /bin/bash
-
-# This is a script to wrap smartctl output into http:// displayable form
-# It requires a filename as input, and produces an file with a .html extension as output
-
-if [ $# -ne 1 ] ; then
-	echo This script requires one a file as input
-	exit 1
-fi
-
-model=`grep "Device Model"  $1  | awk '{print $3}' `
-
-# see if file name in use
-let i=0
-while [ -f $model-$i.html ] ; do
-	let i+=1
-done
-
-filename=$model-$i
-echo -e "<pre><tt>\n"    > $filename.html
-cat $1                  >> $filename.html
-echo -e "</tt></pre>\n" >> $filename.html
-
-echo created file $filename.html