5 files changed, 114 insertions, 100 deletions
diff --git a/windows/installhdf5lib.bat b/windows/installhdf5lib.bat
index e10707b..5c81f33 100755
--- a/windows/installhdf5lib.bat
+++ b/windows/installhdf5lib.bat
@@ -14,7 +14,7 @@ rem access to either file, you may request a copy from help@hdfgroup.org.
 
 
 rem This batch file is used to install HDF5 libraries and tools
-rem Last Updated: 2/12/2007
+rem Last Updated: 3/3/08
 
 setlocal enabledelayedexpansion
 pushd %~dp0
@@ -27,7 +27,7 @@ rem Create the directory structure that we'll need to install
 :create_directories
 
     for %%a in (debug release) do (
-        for %%b in (bin bindll dll lib include modsdll) do (
+        for %%b in (bin bindll dll lib include mods modsdll) do (
             if not exist hdf5lib\%%a\%%b (
                 mkdir hdf5lib\%%a\%%b
             )
@@ -220,7 +220,7 @@ rem Install Fortran Libraries and Tools
     
     rem ===DEBUG===
     rem include
-    call :safe_copy proj\hdf5_fortran\debug\*.mod hdf5lib\debug\include
+    call :safe_copy proj\hdf5_fortran\debug\*.mod hdf5lib\debug\mods
     rem lib
     call :safe_copy proj\hdf5_fortran\debug\hdf5_fortrand.lib hdf5lib\debug\lib
     call :safe_copy proj\hdf5_f90cstub\debug\hdf5_f90cstubd.lib hdf5lib\debug\lib
@@ -234,7 +234,7 @@ rem Install Fortran Libraries and Tools
 
     rem ===RELEASE===
     rem include
-    call :safe_copy proj\hdf5_fortran\release\*.mod hdf5lib\release\include
+    call :safe_copy proj\hdf5_fortran\release\*.mod hdf5lib\release\mods
     rem lib
     call :safe_copy proj\hdf5_fortran\release\hdf5_fortran.lib hdf5lib\release\lib
     call :safe_copy proj\hdf5_f90cstub\release\hdf5_f90cstub.lib hdf5lib\release\lib
@@ -255,7 +255,7 @@ rem Install HL Fortran Libraries and Tools
     
     rem ===DEBUG===
     rem include
-    call :safe_copy proj\hdf5_hl_fortran\debug\*.mod  hdf5lib\debug\include
+    call :safe_copy proj\hdf5_hl_fortran\debug\*.mod  hdf5lib\debug\mods
     rem lib
     call :safe_copy proj\hdf5_hl_fortran\debug\hdf5_hl_fortrand.lib hdf5lib\debug\lib
     call :safe_copy proj\hdf5_hl_f90cstub\debug\hdf5_hl_f90cstubd.lib hdf5lib\debug\lib
@@ -269,7 +269,7 @@ rem Install HL Fortran Libraries and Tools
 
     rem ===RELEASE===
     rem include
-    call :safe_copy proj\hdf5_hl_fortran\release\*.mod  hdf5lib\release\include
+    call :safe_copy proj\hdf5_hl_fortran\release\*.mod  hdf5lib\release\mods
     rem lib
     call :safe_copy proj\hdf5_hl_fortran\release\hdf5_hl_fortran.lib hdf5lib\release\lib
     call :safe_copy proj\hdf5_hl_f90cstub\release\hdf5_hl_f90cstub.lib hdf5lib\release\lib
diff --git a/windows/src/H5pubconf.h b/windows/src/H5pubconf.h
index 00e9015..926c63a 100755
--- a/windows/src/H5pubconf.h
+++ b/windows/src/H5pubconf.h
@@ -19,7 +19,7 @@
 /*
  * End of Windows Specific Definitions
  */
-
+ 
 /* Define if your system generates wrong code for log2 routine. */
 /* #undef H5_BAD_LOG2_CODE_GENERATED */
 
@@ -108,7 +108,6 @@
 /* #undef H5_HAVE_FEATURES_H */
 
 /* Define if support for deflate (zlib) filter is enabled */
-#define H5_HAVE_FILTER_DEFLATE 1
 
 /* Define if support for Fletcher32 checksum is enabled */
 #define H5_HAVE_FILTER_FLETCHER32 1
@@ -220,10 +219,10 @@
 /* #undef H5_HAVE_LIBSOCKET */
 
 /* Define to 1 if you have the `sz' library (-lsz). */
-/* #undef H5_HAVE_LIBSZ */
+#define H5_HAVE_LIBSZ 1
 
 /* Define to 1 if you have the `z' library (-lz). */
-/* #undef H5_HAVE_LIBZ */
+#define H5_HAVE_LIBZ 1
 
 /* Define to 1 if you have the `longjmp' function. */
 #define H5_HAVE_LONGJMP 1
@@ -231,9 +230,6 @@
 /* Define to 1 if you have the `lseek64' function. */
 /* #undef H5_HAVE_LSEEK64 */
 
-/* Define to 1 if you have the `lstat' function. */
-/* #undef H5_HAVE_LSTAT */
-
 /* Define to 1 if you have the <memory.h> header file. */
 #define H5_HAVE_MEMORY_H 1
 
@@ -270,6 +266,9 @@
 /* Define to 1 if you have the `setsysinfo' function. */
 /* #undef H5_HAVE_SETSYSINFO */
 
+/* Define to 1 if you have the `sigaction' function. */
+/* #undef H5_HAVE_SIGACTION */
+
 /* Define to 1 if you have the `siglongjmp' function. */
 /* #undef H5_HAVE_SIGLONGJMP */
 
@@ -479,13 +478,13 @@
 #define H5_PACKAGE_NAME "HDF5"
 
 /* Define to the full name and version of this package. */
-#define H5_PACKAGE_STRING "HDF5 1.9.69-FA_a4"
+#define H5_PACKAGE_STRING "HDF5 1.9.73-FA_a4"
 
 /* Define to the one symbol short name of this package. */
 #define H5_PACKAGE_TARNAME "hdf5"
 
 /* Define to the version of this package. */
-#define H5_PACKAGE_VERSION "1.9.69-FA_a4"
+#define H5_PACKAGE_VERSION "1.9.73-FA_a4"
 
 /* Width for printf() for type `long long' or `__int64', use `ll' */
 #define H5_PRINTF_LL_WIDTH "I64"
@@ -642,7 +641,7 @@
 /* #undef H5_USING_MEMCHECKER */
 
 /* Version number of package */
-#define H5_VERSION "1.9.69-FA_a4"
+#define H5_VERSION "1.9.73-FA_a4"
 
 /* Define if vsnprintf() returns the correct value for formatted strings that
    don't fit into size allowed */
diff --git a/windows/test/checktests.bat b/windows/test/checktests.bat
index 77a47aa..e76ba01 100644
--- a/windows/test/checktests.bat
+++ b/windows/test/checktests.bat
@@ -125,8 +125,7 @@ rem on it for sending parameters.  --SJW 9/6/07
     call :add_test reserved%2 .\reserved%2\%1
     call :add_test cross_read%2 .\cross_read%2\%1
     call :add_test freespace%2 .\freespace%2\%1
-	rem Test commented out until fixed - assert hangs daily test
-	rem call :add_test mf%2 .\mf%2\%1
+	call :add_test mf%2 .\mf%2\%1
     call :add_test btree2%2 .\btree2%2\%1
     call :add_test fheap%2 .\fheap%2\%1
     call :add_test earray%2 .\earray%2\%1
diff --git a/windows/tools/h5diff/testh5diff.bat b/windows/tools/h5diff/testh5diff.bat
index afbef81..0023ec3 100644
--- a/windows/tools/h5diff/testh5diff.bat
+++ b/windows/tools/h5diff/testh5diff.bat
@@ -564,162 +564,162 @@ rem ############################################################################
     call :tooltest h5diff_207.txt -c %file2% %file2% g2/dset8  g2/dset9
 
     rem ##############################################################################
-    rem # Links compare without --follow-links nor --no-dangling-links
+    rem # Links compare without --follow-symlinks nor --no-dangling-links
     rem ##############################################################################
     rem test for bug1749
 	call :testing %h5diff% -v %srcfile12% %srcfile12% /link_g1 /link_g2
     call :tooltest h5diff_300.txt -v %file12% %file12% /link_g1 /link_g2
 
     rem ##############################################################################
-    rem # Links compare with --follow-links Only
+    rem # Links compare with --follow-symlinks Only
     rem ##############################################################################
     rem soft links file to file
-	call :testing %h5diff% --follow-links -v  %srcfile13% %srcfile13%
-    call :tooltest h5diff_400.txt --follow-links -v %file13% %file13% 
+	call :testing %h5diff% --follow-symlinks -v  %srcfile13% %srcfile13%
+    call :tooltest h5diff_400.txt --follow-symlinks -v %file13% %file13% 
 
     rem softlink vs dset"
-	call :testing %h5diff% --follow-links -v %srcfile13% %srcfile13% /softlink_dset1_1 /target_dset2
-    call :tooltest h5diff_401.txt --follow-links -v %file13% %file13% /softlink_dset1_1 /target_dset2
+	call :testing %h5diff% --follow-symlinks -v %srcfile13% %srcfile13% /softlink_dset1_1 /target_dset2
+    call :tooltest h5diff_401.txt --follow-symlinks -v %file13% %file13% /softlink_dset1_1 /target_dset2
 
     rem dset vs softlink"
-	call :testing %h5diff% --follow-links -v %srcfile13% %srcfile13% /target_dset2 /softlink_dset1_1
-    call :tooltest h5diff_402.txt --follow-links -v %file13% %file13% /target_dset2 /softlink_dset1_1
+	call :testing %h5diff% --follow-symlinks -v %srcfile13% %srcfile13% /target_dset2 /softlink_dset1_1
+    call :tooltest h5diff_402.txt --follow-symlinks -v %file13% %file13% /target_dset2 /softlink_dset1_1
 
     rem softlink vs softlink"
-	call :testing %h5diff% --follow-links -v %srcfile13% %srcfile13% /softlink_dset1_1 /softlink_dset2
-    call :tooltest h5diff_403.txt --follow-links -v %file13% %file13% /softlink_dset1_1 /softlink_dset2
+	call :testing %h5diff% --follow-symlinks -v %srcfile13% %srcfile13% /softlink_dset1_1 /softlink_dset2
+    call :tooltest h5diff_403.txt --follow-symlinks -v %file13% %file13% /softlink_dset1_1 /softlink_dset2
 
     rem extlink vs extlink (FILE)"
-	call :testing %h5diff% --follow-links -v %srcfile15% %srcfile15%
-    call :tooltest h5diff_404.txt --follow-links -v %file15% %file15%
+	call :testing %h5diff% --follow-symlinks -v %srcfile15% %srcfile15%
+    call :tooltest h5diff_404.txt --follow-symlinks -v %file15% %file15%
 
     rem extlink vs dset"
-	call :testing %h5diff% --follow-links -v %srcfile15% %srcfile16% /ext_link_dset1 /target_group2/x_dset
-    call :tooltest h5diff_405.txt --follow-links -v %file15% %file16% /ext_link_dset1 /target_group2/x_dset
+	call :testing %h5diff% --follow-symlinks -v %srcfile15% %srcfile16% /ext_link_dset1 /target_group2/x_dset
+    call :tooltest h5diff_405.txt --follow-symlinks -v %file15% %file16% /ext_link_dset1 /target_group2/x_dset
 
     rem dset vs extlink"
-	call :testing %h5diff% --follow-links -v %srcfile16% %srcfile15% /target_group2/x_dset /ext_link_dset1
-    call :tooltest h5diff_406.txt --follow-links -v %file16% %file15% /target_group2/x_dset /ext_link_dset1
+	call :testing %h5diff% --follow-symlinks -v %srcfile16% %srcfile15% /target_group2/x_dset /ext_link_dset1
+    call :tooltest h5diff_406.txt --follow-symlinks -v %file16% %file15% /target_group2/x_dset /ext_link_dset1
 
     rem extlink vs extlink"
-	call :testing %h5diff% --follow-links -v %srcfile15% %srcfile15% /ext_link_dset1 /ext_link_dset2
-    call :tooltest h5diff_407.txt --follow-links -v %file15% %file15% /ext_link_dset1 /ext_link_dset2
+	call :testing %h5diff% --follow-symlinks -v %srcfile15% %srcfile15% /ext_link_dset1 /ext_link_dset2
+    call :tooltest h5diff_407.txt --follow-symlinks -v %file15% %file15% /ext_link_dset1 /ext_link_dset2
 
     rem softlink vs extlink"
-	call :testing %h5diff% --follow-links -v %srcfile13% %srcfile15% /softlink_dset1_1 /ext_link_dset2
-    call :tooltest h5diff_408.txt --follow-links -v %file13% %file15% /softlink_dset1_1 /ext_link_dset2
+	call :testing %h5diff% --follow-symlinks -v %srcfile13% %srcfile15% /softlink_dset1_1 /ext_link_dset2
+    call :tooltest h5diff_408.txt --follow-symlinks -v %file13% %file15% /softlink_dset1_1 /ext_link_dset2
 
     rem extlink vs softlink "
-	call :testing %h5diff% --follow-links -v %srcfile15% %srcfile13% /ext_link_dset2 /softlink_dset1_1
-    call :tooltest h5diff_409.txt --follow-links -v %file15% %file13% /ext_link_dset2 /softlink_dset1_1
+	call :testing %h5diff% --follow-symlinks -v %srcfile15% %srcfile13% /ext_link_dset2 /softlink_dset1_1
+    call :tooltest h5diff_409.txt --follow-symlinks -v %file15% %file13% /ext_link_dset2 /softlink_dset1_1
 
     rem linked_softlink vs linked_softlink (FILE)"
-	call :testing %h5diff% --follow-links -v %srcfile14% %srcfile14%
-    call :tooltest h5diff_410.txt --follow-links -v %file14% %file14%
+	call :testing %h5diff% --follow-symlinks -v %srcfile14% %srcfile14%
+    call :tooltest h5diff_410.txt --follow-symlinks -v %file14% %file14%
 
     rem dset2 vs linked_softlink_dset1"
-	call :testing %h5diff% --follow-links -v %srcfile14% %srcfile14% /target_dset2 /softlink1_to_slink2
-    call :tooltest h5diff_411.txt --follow-links -v %file14% %file14% /target_dset2 /softlink1_to_slink2
+	call :testing %h5diff% --follow-symlinks -v %srcfile14% %srcfile14% /target_dset2 /softlink1_to_slink2
+    call :tooltest h5diff_411.txt --follow-symlinks -v %file14% %file14% /target_dset2 /softlink1_to_slink2
 
     rem    rem linked_softlink_dset1 vs dset2"
-	call :testing %h5diff% --follow-links -v %srcfile14% %srcfile14% /softlink1_to_slink2 /target_dset2
-    call :tooltest h5diff_412.txt --follow-links -v %file14% %file14% /softlink1_to_slink2 /target_dset2
+	call :testing %h5diff% --follow-symlinks -v %srcfile14% %srcfile14% /softlink1_to_slink2 /target_dset2
+    call :tooltest h5diff_412.txt --follow-symlinks -v %file14% %file14% /softlink1_to_slink2 /target_dset2
 
     rem linked_softlink_to_dset1 vs linked_softlink_to_dset2"
-	call :testing %h5diff% --follow-links -v %srcfile14% %srcfile14% /softlink1_to_slink2 /softlink2_to_slink2
-    call :tooltest h5diff_413.txt --follow-links -v %file14% %file14% /softlink1_to_slink2 /softlink2_to_slink2
+	call :testing %h5diff% --follow-symlinks -v %srcfile14% %srcfile14% /softlink1_to_slink2 /softlink2_to_slink2
+    call :tooltest h5diff_413.txt --follow-symlinks -v %file14% %file14% /softlink1_to_slink2 /softlink2_to_slink2
 
     rem group vs linked_softlink_group1"
-	call :testing %h5diff% --follow-links -v %srcfile14% %srcfile14% /target_group /softlink3_to_slink2
-    call :tooltest h5diff_414.txt --follow-links -v %file14% %file14% /target_group /softlink3_to_slink2
+	call :testing %h5diff% --follow-symlinks -v %srcfile14% %srcfile14% /target_group /softlink3_to_slink2
+    call :tooltest h5diff_414.txt --follow-symlinks -v %file14% %file14% /target_group /softlink3_to_slink2
 
     rem linked_softlink_group1 vs group"
-	call :testing %h5diff% --follow-links -v %srcfile14% %srcfile14% /softlink3_to_slink2 /target_group
-    call :tooltest h5diff_415.txt --follow-links -v %file14% %file14% /softlink3_to_slink2 /target_group
+	call :testing %h5diff% --follow-symlinks -v %srcfile14% %srcfile14% /softlink3_to_slink2 /target_group
+    call :tooltest h5diff_415.txt --follow-symlinks -v %file14% %file14% /softlink3_to_slink2 /target_group
 
     rem linked_softlink_to_group1 vs linked_softlink_to_group2"
-	call :testing %h5diff% --follow-links -v %srcfile14% %srcfile14% /softlink3_to_slink2 /softlink4_to_slink2
-    call :tooltest h5diff_416.txt --follow-links -v %file14% %file14% /softlink3_to_slink2 /softlink4_to_slink2
+	call :testing %h5diff% --follow-symlinks -v %srcfile14% %srcfile14% /softlink3_to_slink2 /softlink4_to_slink2
+    call :tooltest h5diff_416.txt --follow-symlinks -v %file14% %file14% /softlink3_to_slink2 /softlink4_to_slink2
 
     rem non-exist-softlink vs softlink"
-	call :testing %h5diff% --follow-links -v %srcfile13% %srcfile13% /softlink_noexist /softlink_dset2
-    call :tooltest h5diff_417.txt --follow-links -v %file13% %file13% /softlink_noexist /softlink_dset2
+	call :testing %h5diff% --follow-symlinks -v %srcfile13% %srcfile13% /softlink_noexist /softlink_dset2
+    call :tooltest h5diff_417.txt --follow-symlinks -v %file13% %file13% /softlink_noexist /softlink_dset2
 
     rem softlink vs non-exist-softlink"
-	call :testing %h5diff% --follow-links -v %srcfile13% %srcfile13% /softlink_dset2 /softlink_noexist
-    call :tooltest h5diff_418.txt --follow-links -v %file13% %file13% /softlink_dset2 /softlink_noexist
+	call :testing %h5diff% --follow-symlinks -v %srcfile13% %srcfile13% /softlink_dset2 /softlink_noexist
+    call :tooltest h5diff_418.txt --follow-symlinks -v %file13% %file13% /softlink_dset2 /softlink_noexist
 
     rem non-exist-extlink_file vs extlink"
-	call :testing %h5diff% --follow-links -v %srcfile15% %srcfile15% /ext_link_noexist2 /ext_link_dset2
-    call :tooltest h5diff_419.txt --follow-links -v %file15% %file15% /ext_link_noexist2 /ext_link_dset2
+	call :testing %h5diff% --follow-symlinks -v %srcfile15% %srcfile15% /ext_link_noexist2 /ext_link_dset2
+    call :tooltest h5diff_419.txt --follow-symlinks -v %file15% %file15% /ext_link_noexist2 /ext_link_dset2
 
     rem exlink vs non-exist-extlink_file"
-	call :testing %h5diff% --follow-links -v %srcfile15% %srcfile15% /ext_link_dset2 /ext_link_noexist2
-    call :tooltest h5diff_420.txt --follow-links -v %file15% %file15% /ext_link_dset2 /ext_link_noexist2
+	call :testing %h5diff% --follow-symlinks -v %srcfile15% %srcfile15% /ext_link_dset2 /ext_link_noexist2
+    call :tooltest h5diff_420.txt --follow-symlinks -v %file15% %file15% /ext_link_dset2 /ext_link_noexist2
 
     rem extlink vs non-exist-extlink_obj"
-	call :testing %h5diff% --follow-links -v %srcfile15% %srcfile15% /ext_link_dset2 /ext_link_noexist1
-    call :tooltest h5diff_421.txt --follow-links -v %file15% %file15% /ext_link_dset2 /ext_link_noexist1
+	call :testing %h5diff% --follow-symlinks -v %srcfile15% %srcfile15% /ext_link_dset2 /ext_link_noexist1
+    call :tooltest h5diff_421.txt --follow-symlinks -v %file15% %file15% /ext_link_dset2 /ext_link_noexist1
 
     rem non-exist-extlink_obj vs extlink"
-	call :testing %h5diff% --follow-links -v %srcfile15% %srcfile15% /ext_link_noexist1 /ext_link_dset2
-    call :tooltest h5diff_422.txt --follow-links -v %file15% %file15% /ext_link_noexist1 /ext_link_dset2
+	call :testing %h5diff% --follow-symlinks -v %srcfile15% %srcfile15% /ext_link_noexist1 /ext_link_dset2
+    call :tooltest h5diff_422.txt --follow-symlinks -v %file15% %file15% /ext_link_noexist1 /ext_link_dset2
 
     rem extlink_to_softlink_to_dset1 vs dset2"
-	call :testing %h5diff% --follow-links -v %srcfile17% %srcfile18% /ext_link_to_slink1 /dset2
-    call :tooltest h5diff_423.txt --follow-links -v %file17% %file18% /ext_link_to_slink1 /dset2
+	call :testing %h5diff% --follow-symlinks -v %srcfile17% %srcfile18% /ext_link_to_slink1 /dset2
+    call :tooltest h5diff_423.txt --follow-symlinks -v %file17% %file18% /ext_link_to_slink1 /dset2
 
     rem dset2 vs extlink_to_softlink_to_dset1"
-	call :testing %h5diff% --follow-links -v %srcfile18% %srcfile17% /dset2 /ext_link_to_slink1
-    call :tooltest h5diff_424.txt --follow-links -v %file18% %file17% /dset2 /ext_link_to_slink1
+	call :testing %h5diff% --follow-symlinks -v %srcfile18% %srcfile17% /dset2 /ext_link_to_slink1
+    call :tooltest h5diff_424.txt --follow-symlinks -v %file18% %file17% /dset2 /ext_link_to_slink1
 
     rem extlink_to_softlink_to_dset1 vs extlink_to_softlink_to_dset2"
-	call :testing %h5diff% --follow-links -v %srcfile17% %srcfile17% /ext_link_to_slink1 /ext_link_to_slink2
-    call :tooltest h5diff_425.txt --follow-links -v %file17% %file17% /ext_link_to_slink1 /ext_link_to_slink2
+	call :testing %h5diff% --follow-symlinks -v %srcfile17% %srcfile17% /ext_link_to_slink1 /ext_link_to_slink2
+    call :tooltest h5diff_425.txt --follow-symlinks -v %file17% %file17% /ext_link_to_slink1 /ext_link_to_slink2
 
 
     rem ##############################################################################
-    rem # Dangling links compare (--follow-links and --no-dangling-links)
+    rem # Dangling links compare (--follow-symlinks and --no-dangling-links)
     rem ##############################################################################
-    rem dangling links --follow-links (FILE to FILE)
-	call :testing %h5diff% --follow-links -v %srclnkfile1% %srclnkfile2%
-    call :tooltest h5diff_450.txt --follow-links -v %lnkfile1% %lnkfile2%
+    rem dangling links --follow-symlinks (FILE to FILE)
+	call :testing %h5diff% --follow-symlinks -v %srclnkfile1% %srclnkfile2%
+    call :tooltest h5diff_450.txt --follow-symlinks -v %lnkfile1% %lnkfile2%
 
-    rem dangling links --follow-links and --no-dangling-links (FILE to FILE)
-	call :testing %h5diff% --follow-links -v --no-dangling-links  %srclnkfile1% %srclnkfile2%
-    call :tooltest h5diff_451.txt --follow-links -v --no-dangling-links  %lnkfile1% %lnkfile2% 
+    rem dangling links --follow-symlinks and --no-dangling-links (FILE to FILE)
+	call :testing %h5diff% --follow-symlinks -v --no-dangling-links  %srclnkfile1% %srclnkfile2%
+    call :tooltest h5diff_451.txt --follow-symlinks -v --no-dangling-links  %lnkfile1% %lnkfile2% 
 
-    rem try --no-dangling-links without --follow-links options
+    rem try --no-dangling-links without --follow-symlinks options
 	call :testing %h5diff%  --no-dangling-links %srcfile13% %srcfile13% 
     call :tooltest h5diff_452.txt  --no-dangling-links %file13% %file13% 
 
     rem dangling link found for soft links (FILE to FILE)
-	call :testing %h5diff% --follow-links -v --no-dangling-links %srcfile13% %srcfile13%
-    call :tooltest h5diff_453.txt --follow-links -v --no-dangling-links %file13% %file13% 
+	call :testing %h5diff% --follow-symlinks -v --no-dangling-links %srcfile13% %srcfile13%
+    call :tooltest h5diff_453.txt --follow-symlinks -v --no-dangling-links %file13% %file13% 
 
     rem dangling link found for soft links (obj to obj)
-	call :testing %h5diff% --follow-links -v --no-dangling-links %srcfile13% %srcfile13% /softlink_dset2 /softlink_noexist
-    call :tooltest h5diff_454.txt --follow-links -v --no-dangling-links %file13% %file13% /softlink_dset2 /softlink_noexist
+	call :testing %h5diff% --follow-symlinks -v --no-dangling-links %srcfile13% %srcfile13% /softlink_dset2 /softlink_noexist
+    call :tooltest h5diff_454.txt --follow-symlinks -v --no-dangling-links %file13% %file13% /softlink_dset2 /softlink_noexist
 
     rem dangling link found for soft links (obj to obj) Both dangle links
-	call :testing %h5diff% --follow-links -v --no-dangling-links %srcfile13% %srcfile13% /softlink_noexist /softlink_noexist
-    call :tooltest h5diff_455.txt --follow-links -v --no-dangling-links %file13% %file13% /softlink_noexist /softlink_noexist
+	call :testing %h5diff% --follow-symlinks -v --no-dangling-links %srcfile13% %srcfile13% /softlink_noexist /softlink_noexist
+    call :tooltest h5diff_455.txt --follow-symlinks -v --no-dangling-links %file13% %file13% /softlink_noexist /softlink_noexist
 
     rem dangling link found for ext links (FILE to FILE)
-	call :testing %h5diff% --follow-links -v --no-dangling-links %srcfile15% %srcfile15%
-    call :tooltest h5diff_456.txt --follow-links -v --no-dangling-links %file15% %file15%
+	call :testing %h5diff% --follow-symlinks -v --no-dangling-links %srcfile15% %srcfile15%
+    call :tooltest h5diff_456.txt --follow-symlinks -v --no-dangling-links %file15% %file15%
 
     rem dangling link found for ext links (obj to obj). target file exist
-	call :testing %h5diff% --follow-links -v --no-dangling-links %srcfile15% %srcfile15% /ext_link_dset1 /ext_link_noexist1
-    call :tooltest h5diff_457.txt --follow-links -v --no-dangling-links %file15% %file15% /ext_link_dset1 /ext_link_noexist1
+	call :testing %h5diff% --follow-symlinks -v --no-dangling-links %srcfile15% %srcfile15% /ext_link_dset1 /ext_link_noexist1
+    call :tooltest h5diff_457.txt --follow-symlinks -v --no-dangling-links %file15% %file15% /ext_link_dset1 /ext_link_noexist1
 
     rem dangling link found for ext links (obj to obj). target file NOT exist
-	call :testing %h5diff% --follow-links -v --no-dangling-links %srcfile15% %srcfile15% /ext_link_dset1 /ext_link_noexist2
-    call :tooltest h5diff_458.txt --follow-links -v --no-dangling-links %file15% %file15% /ext_link_dset1 /ext_link_noexist2
+	call :testing %h5diff% --follow-symlinks -v --no-dangling-links %srcfile15% %srcfile15% /ext_link_dset1 /ext_link_noexist2
+    call :tooltest h5diff_458.txt --follow-symlinks -v --no-dangling-links %file15% %file15% /ext_link_dset1 /ext_link_noexist2
 
     rem dangling link found for ext links (obj to obj). Both dangle links
-	call :testing %h5diff% --follow-links -v --no-dangling-links %srcfile15% %srcfile15% /ext_link_noexist1 /ext_link_noexist2
-    call :tooltest h5diff_459.txt --follow-links -v --no-dangling-links %file15% %file15% /ext_link_noexist1 /ext_link_noexist2
+	call :testing %h5diff% --follow-symlinks -v --no-dangling-links %srcfile15% %srcfile15% /ext_link_noexist1 /ext_link_noexist2
+    call :tooltest h5diff_459.txt --follow-symlinks -v --no-dangling-links %file15% %file15% /ext_link_noexist1 /ext_link_noexist2
 
 	
     rem ##############################################################################
diff --git a/windows/tools/h5ls/testh5ls.bat b/windows/tools/h5ls/testh5ls.bat
index 90321e5..7fa931b 100644
--- a/windows/tools/h5ls/testh5ls.bat
+++ b/windows/tools/h5ls/testh5ls.bat
@@ -172,17 +172,33 @@ rem ############################################################################
     rem test for displaying soft links
     call :tooltest tslink-1.ls 0 -w80 -r tslink.h5
 
-    rem test for displaying external and user-defined links
+    rem test for displaying more soft links with --follow-symlinks
+    call :tooltest tsoftlinks-1.ls 0 --follow-symlinks tsoftlinks.h5
+    call :tooltest tsoftlinks-2.ls 0 --follow-symlinks -r tsoftlinks.h5
+    call :tooltest tsoftlinks-3.ls 0 --follow-symlinks tsoftlinks.h5/group1
+    call :tooltest tsoftlinks-4.ls 0 --follow-symlinks -r tsoftlinks.h5/group1
+    call :tooltest tsoftlinks-5.ls 0 --follow-symlinks tsoftlinks.h5/soft_dset1
+
+    rem test for displaying external and user-defined links with 
+    rem --follow-symlinks
     call :tooltest textlink-1.ls 0 -w80 -r textlink.h5
-    call :tooltest textlinksrc-1.ls 0 -w80 -Er textlinksrc.h5
-    call :tooltest textlinksrc-2.ls 0 -w80 -Erv textlinksrc.h5/ext_link5
-    call :tooltest textlinksrc-3.ls 0 -w80 -Er textlinksrc.h5/ext_link1
+    call :tooltest textlinksrc-1.ls 0 -w80 --follow-symlinks -r textlinksrc.h5
+    call :tooltest textlinksrc-2.ls 0 -w80 --follow-symlinks -rv textlinksrc.h5/ext_link5
+    call :tooltest textlinksrc-3.ls 0 -w80 --follow-symlinks -r textlinksrc.h5/ext_link1
     call :tooltest textlinksrc-4.ls 0 -w80 -r textlinksrc.h5
     call :tooltest textlinksrc-5.ls 0 -w80 -r textlinksrc.h5/ext_link1
-    call :tooltest textlinksrc-6.ls 0 -w80 -E textlinksrc.h5
-    call :tooltest textlinksrc-7.ls 0 -w80 -E textlinksrc.h5/ext_link1
+    call :tooltest textlinksrc-6.ls 0 -w80 --follow-symlinks textlinksrc.h5
+    call :tooltest textlinksrc-7.ls 0 -w80 --follow-symlinks textlinksrc.h5/ext_link1
     call :tooltest tudlink-1.ls 0 -w80 -r tudlink.h5
 
+    rem test for displaying external links with -E
+    rem the option -E will be depriciated but keep it for backward compatibility
+    call :tooltest textlinksrc-1-old.ls 0 -w80 -Er textlinksrc.h5
+    call :tooltest textlinksrc-2-old.ls 0 -w80 -Erv textlinksrc.h5/ext_link5
+    call :tooltest textlinksrc-3-old.ls 0 -w80 -Er textlinksrc.h5/ext_link1
+    call :tooltest textlinksrc-6-old.ls 0 -w80 -E textlinksrc.h5
+    call :tooltest textlinksrc-7-old.ls 0 -w80 -E textlinksrc.h5/ext_link1
+
     rem tests for hard links
     call :tooltest thlink-1.ls 0 -w80 thlink.h5