os_openbsd.cpp,os_netbsd.cpp,os_darwin.cpp - minor fixes related to error handling

git-svn-id: https://svn.code.sf.net/p/smartmontools/code/trunk@4190 4ea69e1a-61f1-4043-bf83-b5c94c648137

smartmontools/ChangeLog

 $Id$
 
+2015-12-18  Alex Samorukov <samm@os2.kiev.ua>
+
+	os_netbsd.cpp, os_openbsd.cpp: fix ioctl returtn value check
+	os_darwin.cpp: fix error handling
+
 2015-12-16  Douglas Gilbert  <dgilbert@interlog.com>
 
 	scsiprint.cpp: stop tape drive looking for Solid State media

smartmontools/os_darwin.cpp

@@ -312,9 +312,9 @@ static int make_device_names (char*** devlist, const char* name) {
 
   // Create an array of service names.
   IOIteratorReset (i);
-  *devlist = (char**)calloc (result, sizeof (char *)); 
-  if (! *devlist)
+  if (! result)
     goto error;
+  *devlist = (char**)calloc (result, sizeof (char *)); 
   index = 0;
   while ((device = IOIteratorNext (i)) != MACH_PORT_NULL) {
     if (is_smart_capable (device))
@@ -455,7 +455,7 @@ bool darwin_ata_device::ata_pass_through(const ata_cmd_in & in, ata_cmd_out & ou
         if (select != SHORT_SELF_TEST && select != EXTEND_SELF_TEST)
         {
           errno = EINVAL;
-          err = -1;
+          return set_err(ENOSYS, "Unsupported SMART self-test mode");
         }
         err = smartIf->SMARTExecuteOffLineImmediate (ifp, 
           select == EXTEND_SELF_TEST);

smartmontools/os_darwin/pkg/installer/README.html

@@ -6,7 +6,7 @@ and monitor storage systems using the Self-Monitoring, Analysis and Reporting
 Technology System (SMART) built into most modern ATA and SCSI harddisks.
 In many cases, these utilities will provide advanced warning of disk degradation and failure.
 <h2>Installing</h2>
-To install package click on the smartmontools.pkg icon and follow installation process.
+To install package click on the smartmontools.pkg icon and follow installation process. Files will be installed to the /usr/local/ directory.
 <h2>Usage</h2>
  If you are having trouble understanding the output of smartctl or smartd, please first read the manual pages installed on your system:
 <pre>

smartmontools/os_netbsd.cpp

@@ -327,7 +327,8 @@ ata_command_interface(int fd, smart_command_set command, int select, char *data)
     return 0;
   }
 
-  if ((retval = ioctl(fd, ATAIOCCOMMAND, &req))) {
+  retval = ioctl(fd, ATAIOCCOMMAND, &req);
+  if (retval < 0) {
     perror("Failed command");
     return -1;
   }

smartmontools/os_openbsd.cpp

@@ -323,7 +323,8 @@ ata_command_interface(int fd, smart_command_set command, int select, char *data)
 
     unsigned const short normal = WDSMART_CYL, failed = 0x2cf4;
 
-    if ((retval = ioctl(fd, ATAIOCCOMMAND, &req))) {
+    retval = ioctl(fd, ATAIOCCOMMAND, &req);
+    if (retval < 0) {
       perror("Failed command");
       return -1;
     }