[svn-r18708] Description:

	Bring r18638:18704 from trunk to revise_chunks branch.

Tested on:
	Mac OS X/32 10.6.3 (amazon) w/debug & production
	(h5committest not required on this branch)

1 files changed, 7 insertions, 1 deletions

diff --git a/tools/h5ls/h5ls.c b/tools/h5ls/h5ls.c
index c969670..ab3a110 100644
--- a/tools/h5ls/h5ls.c
+++ b/tools/h5ls/h5ls.c
@@ -2180,6 +2180,7 @@ main(int argc, const char *argv[])
     static char root_name[] = "/";
     char        drivername[50];
     const char *preferred_driver = NULL;
+    int err_openfile = 0;
 
     /* Initialize h5tools lib */
     h5tools_init();
@@ -2402,9 +2403,11 @@ main(int argc, const char *argv[])
                 break;
             *oname = '\0';
         } /* end while */
+
         if(file < 0) {
             fprintf(stderr, "%s: unable to open file\n", argv[argno-1]);
             HDfree(fname);
+            err_openfile = 1;
             continue;
         } /* end if */
         if(oname) {
@@ -2478,6 +2481,9 @@ main(int argc, const char *argv[])
         HDfree(elink_list.objs);
     } /* end while */
 
-    leave(EXIT_SUCCESS);
+    if (err_openfile)
+        leave(EXIT_FAILURE);
+    else
+        leave(EXIT_SUCCESS);
 } /* end main() */