cleanup of error messages around sg_cmds_open_device(); add flock error msg for ddpt

git-svn-id: https://svn.bingwo.ca/repos/sg3_utils/trunk@772 6180dd3e-e324-4e3e-922d-17de1ae2f315

1 files changed, 20 insertions, 9 deletions

diff --git a/src/sg_rtpg.c b/src/sg_rtpg.c
index 9a366583..2203c015 100644
--- a/src/sg_rtpg.c
+++ b/src/sg_rtpg.c
@@ -31,7 +31,7 @@
  * to the given SCSI device.
  */
 
-static const char * version_str = "1.25 20180219";
+static const char * version_str = "1.26 20180513";
 
 #define REPORT_TGT_GRP_BUFF_LEN 1024
 
@@ -143,7 +143,8 @@ int main(int argc, char * argv[])
     bool raw = false;
     bool o_readonly = false;
     bool extended = false;
-    int sg_fd, k, j, off, res, c, report_len, tgt_port_count;
+    int k, j, off, res, c, report_len, tgt_port_count;
+    int sg_fd = -1;
     int ret = 0;
     int verbose = 0;
     uint8_t reportTgtGrpBuff[REPORT_TGT_GRP_BUFF_LEN];
@@ -217,8 +218,11 @@ int main(int argc, char * argv[])
 
     sg_fd = sg_cmds_open_device(device_name, o_readonly, verbose);
     if (sg_fd < 0) {
-        pr2serr("open error: %s: %s\n", device_name, safe_strerror(-sg_fd));
-        return SG_LIB_FILE_ERROR;
+        if (verbose)
+            pr2serr("open error: %s: %s\n", device_name,
+                    safe_strerror(-sg_fd));
+        ret = sg_convert_errno(-sg_fd);
+        goto err_out;
     }
 
     memset(reportTgtGrpBuff, 0x0, sizeof(reportTgtGrpBuff));
@@ -312,11 +316,18 @@ int main(int argc, char * argv[])
     }
 
 err_out:
-    res = sg_cmds_close_device(sg_fd);
-    if (res < 0) {
-        pr2serr("close error: %s\n", safe_strerror(-res));
-        if (0 == ret)
-            return SG_LIB_FILE_ERROR;
+    if (sg_fd >= 0) {
+        res = sg_cmds_close_device(sg_fd);
+        if (res < 0) {
+            pr2serr("close error: %s\n", safe_strerror(-res));
+            if (0 == ret)
+                ret = sg_convert_errno(-res);
+        }
+    }
+    if (0 == verbose) {
+        if (! sg_if_can2stderr("sg_rtpg failed: ", ret))
+            pr2serr("Some error occurred, try again with '-v' "
+                    "or '-vv' for more information\n");
     }
     return (ret >= 0) ? ret : SG_LIB_CAT_OTHER;
 }