Skip to content
Snippets Groups Projects
Commit ff0c70f4 authored by dpgilbert's avatar dpgilbert
Browse files

pass back error status from smartctl for SCSI devices

git-svn-id: https://smartmontools.svn.sourceforge.net/svnroot/smartmontools/trunk@720 4ea69e1a-61f1-4043-bf83-b5c94c648137
parent a5075b0d
No related branches found
No related tags found
No related merge requests found
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
#include "utility.h" #include "utility.h"
extern const char *atacmds_c_cvsid, *ataprint_c_cvsid, *knowndrives_c_cvsid, *scsicmds_c_cvsid, *scsiprint_c_cvsid, *utility_c_cvsid; extern const char *atacmds_c_cvsid, *ataprint_c_cvsid, *knowndrives_c_cvsid, *scsicmds_c_cvsid, *scsiprint_c_cvsid, *utility_c_cvsid;
const char* smartctl_c_cvsid="$Id: smartctl.c,v 1.75 2003/04/22 11:40:51 ballen4705 Exp $" const char* smartctl_c_cvsid="$Id: smartctl.c,v 1.76 2003/05/01 08:51:46 dpgilbert Exp $"
ATACMDS_H_CVSID ATAPRINT_H_CVSID EXTERN_H_CVSID KNOWNDRIVES_H_CVSID SCSICMDS_H_CVSID SCSIPRINT_H_CVSID SMARTCTL_H_CVSID UTILITY_H_CVSID; ATACMDS_H_CVSID ATAPRINT_H_CVSID EXTERN_H_CVSID KNOWNDRIVES_H_CVSID SCSICMDS_H_CVSID SCSIPRINT_H_CVSID SMARTCTL_H_CVSID UTILITY_H_CVSID;
// This is a block containing all the "control variables". We declare // This is a block containing all the "control variables". We declare
...@@ -703,7 +703,7 @@ int main (int argc, char **argv){ ...@@ -703,7 +703,7 @@ int main (int argc, char **argv){
if (tryata) if (tryata)
retval = ataPrintMain(fd); retval = ataPrintMain(fd);
else if (tryscsi) else if (tryscsi)
scsiPrintMain (device, fd); retval = scsiPrintMain(device, fd);
else { else {
pout("Smartctl: specify if this is an ATA or SCSI device with the -d option.\n"); pout("Smartctl: specify if this is an ATA or SCSI device with the -d option.\n");
Usage(); Usage();
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
#include "utility.h" #include "utility.h"
extern const char *atacmds_c_cvsid, *ataprint_c_cvsid, *knowndrives_c_cvsid, *scsicmds_c_cvsid, *scsiprint_c_cvsid, *utility_c_cvsid; extern const char *atacmds_c_cvsid, *ataprint_c_cvsid, *knowndrives_c_cvsid, *scsicmds_c_cvsid, *scsiprint_c_cvsid, *utility_c_cvsid;
const char* smartctl_c_cvsid="$Id: smartctl.cpp,v 1.75 2003/04/22 11:40:51 ballen4705 Exp $" const char* smartctl_c_cvsid="$Id: smartctl.cpp,v 1.76 2003/05/01 08:51:46 dpgilbert Exp $"
ATACMDS_H_CVSID ATAPRINT_H_CVSID EXTERN_H_CVSID KNOWNDRIVES_H_CVSID SCSICMDS_H_CVSID SCSIPRINT_H_CVSID SMARTCTL_H_CVSID UTILITY_H_CVSID; ATACMDS_H_CVSID ATAPRINT_H_CVSID EXTERN_H_CVSID KNOWNDRIVES_H_CVSID SCSICMDS_H_CVSID SCSIPRINT_H_CVSID SMARTCTL_H_CVSID UTILITY_H_CVSID;
// This is a block containing all the "control variables". We declare // This is a block containing all the "control variables". We declare
...@@ -703,7 +703,7 @@ int main (int argc, char **argv){ ...@@ -703,7 +703,7 @@ int main (int argc, char **argv){
if (tryata) if (tryata)
retval = ataPrintMain(fd); retval = ataPrintMain(fd);
else if (tryscsi) else if (tryscsi)
scsiPrintMain (device, fd); retval = scsiPrintMain(device, fd);
else { else {
pout("Smartctl: specify if this is an ATA or SCSI device with the -d option.\n"); pout("Smartctl: specify if this is an ATA or SCSI device with the -d option.\n");
Usage(); Usage();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment