[svn-r23219] Description:

    Bring reviewed changes from Coverity branch back to trunk (QK & JK):

r20457:
Coverity issue 691: return of H5duo could be negative. Fixed by using
STDOUT_FILENO and redesign parse_command_line and main to cleanup file
allocations. The output_file var is null when using stdout. In cleanup do not
close output_file if NULL.

r20510:
Initialize ufid = -1 and predicate HDclose call on ufid != -1

r20511:
Purpose: Fix coverity issue 1715

Description: Free "file" and nested data on failure in H5FD_core_open.

r20512:
Initialize ifid = -1 and predicate HDclose call on ifid != -1

r20514:
Initialize h5fid = -1 and predicate HDclose call on h5fid != -1

r20516:
Added else branch to the if (ret_value < 0) check.

r20522:
Addressed coverity issues 930-933, 850, 836, 835, 1307.  All minor 
potential buffer overwrite bugs, or coverity errors.  Fixed by replacing
strcpy and sprintf with strncpy and snprintf.

r20523:
fixed coverity issues 68, 1120, 1116i

r20524:
Check  H5Z_SZIP->encoder_present < 1 assuming 0 represents absence.

r20601:
Purpose: Fix coverity issues 1703-1705

Description: Modified the cleanup code in test_free in accum.c to reset
allocated buffers to NULL after they are freed, and modified the error cleanup
code to check if these buffers are NULL before freeing them.  Also fixed some
unrelated warnings in accum.c.

r20602:
Use HDsnprintf and HDstrncat

r20603:
Purpose: Fix coverity issues 808-809

Description: Modified test_core in vfd.c to check the returns from malloc, and
keep track of whether points and check are allocated by setting them to NULL
when they are not.  Added code to free points and check on error if they are
not NULL.  Also fixed unrelated warnings in vfd.c.

r20604:
Use HDstrncpy.

r20605:
Use HDstrncpy and HDstrncat.

r20606:
Purpose: Fix coverity issue 807

Description: Modified long_compact in stab.c to keep track of whether objname is
allocated by setting it to NULL when it is not.  Added code to free objname on
error if it is not NULL.

r20607:
Changed string function calls to use versions that specify the string length
to fix coverity issues 832 and 839.


Tested on:
    Mac OSX/64 10.8.2 (amazon)
    (Too minor to require h5committest)

1 files changed, 80 insertions, 85 deletions

diff --git a/tools/h5jam/h5unjam.c b/tools/h5jam/h5unjam.c
index c304045..18b5f11 100644
--- a/tools/h5jam/h5unjam.c
+++ b/tools/h5jam/h5unjam.c
@@ -43,14 +43,14 @@ static const char *s_opts = "hu:i:o:d:V";
 static struct long_options l_opts[] = {
     { "help", no_arg, 'h' },
     { "hel", no_arg, 'h' },
-  {"i", require_arg, 'i'},  /* input file */
-  {"u", require_arg, 'u'},  /* user block file */
-  {"o", require_arg, 'o'},  /* output file */
-  {"delete", no_arg, 'd'},  /* delete ub */
-  {"delet", no_arg, 'd'},
-  {"dele", no_arg, 'd'},
-  {"del", no_arg, 'd'},
-  {"de", no_arg, 'd'},
+    {"i", require_arg, 'i'},    /* input file */
+    {"u", require_arg, 'u'},    /* user block file */
+    {"o", require_arg, 'o'},    /* output file */
+    {"delete", no_arg, 'd'},    /* delete ub */
+    {"delet", no_arg, 'd'},
+    {"dele", no_arg, 'd'},
+    {"del", no_arg, 'd'},
+    {"de", no_arg, 'd'},
     { NULL, 0, '\0' }
 };
 
@@ -123,86 +123,69 @@ usage(const char *prog)
 }
 
 /*-------------------------------------------------------------------------
- * Function:    leave
- *
- * Purpose:     Shutdown and call exit()
- *
- * Return:      Does not return
- *
- *-------------------------------------------------------------------------
- */
-static void
-leave(int ret)
-{
-    if (ub_file)
-        HDfree (ub_file);
-    if (input_file)
-        HDfree (input_file);
-    if (output_file)
-        HDfree (output_file);
-
-    h5tools_close();
-
-    HDexit(ret);
-}
-
-/*-------------------------------------------------------------------------
  * Function:    parse_command_line
  *
  * Purpose:     Parse the command line for the h5dumper.
  *
- * Return:      Success:
+ * Return:      Success:    EXIT_SUCCESS;
  *
- *              Failure:    Exits program with EXIT_FAILURE value.
- *
- * Programmer:
- *
- * Modifications:
+ *              Failure:    Exits function with EXIT_FAILURE value.
  *
  *-------------------------------------------------------------------------
  */
-
-static void
+static int
 parse_command_line(int argc, const char *argv[])
 {
     int opt = FALSE;
 
     /* parse command line options */
     while ((opt = get_option(argc, argv, s_opts, l_opts)) != EOF) {
-        switch ((char) opt) {
-        case 'o':
-            output_file = HDstrdup (opt_arg);
-            break;
-        case 'i':
-            input_file = HDstrdup (opt_arg);
-            break;
-        case 'u':
-            ub_file = HDstrdup (opt_arg);
-            break;
-        case 'd':
-            do_delete = TRUE;
-            break;
-        case 'h':
-            usage(h5tools_getprogname());
-            leave(EXIT_SUCCESS);
-        case 'V':
-            print_version(h5tools_getprogname());
-            leave(EXIT_SUCCESS);
-        case '?':
-        default:
-            usage(h5tools_getprogname());
-            leave(EXIT_FAILURE);
+        switch((char)opt) {
+            case 'o':
+                output_file = HDstrdup(opt_arg);
+                break;
+
+            case 'i':
+                input_file = HDstrdup(opt_arg);
+                break;
+
+            case 'u':
+                ub_file = HDstrdup(opt_arg);
+                break;
+
+            case 'd':
+                do_delete = TRUE;
+                break;
+
+            case 'h':
+                usage(h5tools_getprogname());
+                h5tools_setstatus(EXIT_SUCCESS);
+                goto done;
+
+            case 'V':
+                print_version (h5tools_getprogname());
+                h5tools_setstatus(EXIT_SUCCESS);
+                goto done;
+
+            case '?':
+            default:
+                usage(h5tools_getprogname());
+                h5tools_setstatus(EXIT_FAILURE);
+                goto done;
         }
     }
 
-    /* check for file name to be processed */
-/*
-    if (argc <= opt_ind+2) {
-        error_msg("missing file name\n");
-        usage(h5tools_getprogname());
-        HDexit(EXIT_FAILURE);
-    }
-*/
+    return EXIT_SUCCESS;
+    
+done:
+    if(input_file)
+        HDfree(input_file);
+    if(output_file)
+        HDfree(output_file);
+    if(ub_file)
+        HDfree(ub_file);
+
+    return EXIT_FAILURE;
 }
 
 /*-------------------------------------------------------------------------
@@ -246,13 +229,15 @@ main(int argc, const char *argv[])
     /* Initialize h5tools lib */
     h5tools_init();
 
-    parse_command_line(argc, argv);
+    if(EXIT_FAILURE == parse_command_line(argc, argv))
+        goto done;
 
     if (input_file == NULL) {
         /* no user block */
         error_msg("missing arguemnt for HDF5 file input.\n");
         help_ref_msg(stderr);
-        leave (EXIT_FAILURE);
+        h5tools_setstatus(EXIT_FAILURE);
+        goto done;
     }
 
     testval = H5Fis_hdf5(input_file);
@@ -286,8 +271,10 @@ main(int argc, const char *argv[])
         goto done;
     }
 
-    H5Pclose(plist);
-    H5Fclose(ifile);
+    status = H5Pclose(plist);
+    HDassert(status >= 0);
+    status = H5Fclose(ifile);
+    HDassert(status >= 0);
 
     if (usize == 0) {
   /* no user block to remove: message? */
@@ -320,7 +307,7 @@ main(int argc, const char *argv[])
 
     if (ub_file == NULL) {
         /* write to sdtout */
-        ufid = HDdup(1);
+        ufid = STDOUT_FILENO;
     } 
     else {
         ufid = HDopen(ub_file,O_WRONLY|O_CREAT|O_TRUNC, 0644 );
@@ -371,17 +358,25 @@ main(int argc, const char *argv[])
     }
 
 done:
-    if (ub_file) {
-        HDfree (ub_file);
-        if (ufid >= 0) HDclose(ufid);
+    if(input_file)
+        HDfree(input_file);
+    if(output_file)
+        HDfree(output_file);
+    if(ub_file) {
+        HDfree(ub_file);
+        if(ufid >= 0)
+            status = HDclose(ufid);
+            HDassert(status >= 0);
     }
-    if (input_file)
-        HDfree (input_file);
-    if (output_file)
-        HDfree (output_file);
 
-    if (h5fid >= 0) HDclose(h5fid);
-    if (ifid >= 0) HDclose(ifid);
+    if(h5fid >= 0) {
+        status = HDclose(h5fid);
+        HDassert(status >= 0);
+    }
+    if(ifid >= 0) {
+        status = HDclose(ifid);
+        HDassert(status >= 0);
+    }
 
     return h5tools_getstatus();
 }