diff options
| author | Jonathan Kim <jkm@hdfgroup.org> | 2012-04-27 15:50:50 (GMT) |
|---|---|---|
| committer | Jonathan Kim <jkm@hdfgroup.org> | 2012-04-27 15:50:50 (GMT) |
| commit | c631d9e87a1b7b4c70c795fdc7526efb49be62c9 (patch) | |
| tree | f1b2d8aec981bffec62c1026a2e0104ab2605622 /tools/lib | |
| parent | e43c3278c40f4edc43a641bf86bbdd79c629844c (diff) | |
| download | hdf5-c631d9e87a1b7b4c70c795fdc7526efb49be62c9.zip hdf5-c631d9e87a1b7b4c70c795fdc7526efb49be62c9.tar.gz hdf5-c631d9e87a1b7b4c70c795fdc7526efb49be62c9.tar.bz2 | |
[svn-r22320] Purpose:
Fix for HDFFV-7998-h5diff: incorrect behavior and output for comparing symbolic dangling links without following-symlinks option
Description:
Fix not to check and display dangling link status without --follow-symlinks option.
Berfor the fix, when comparing symbolic link to symbolic link without follow-symlinks option, h5diff followed to check if those links are dangling or not. It caused to display output incorrectly (dangling link instead of symbolic link).
The fix also improved performance when comparing lots of symbolic links without the --follow-symlinks option.
Test cases were added and tagged with jira#.
This merged from HDF5 trunk r22319.
Tested:
jam (linux32-LE), koala (linux64-LE), ostrich (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE), Windows (32-LE cmake), cmake (jam)
Diffstat (limited to 'tools/lib')
| -rw-r--r-- | tools/lib/h5diff.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c index 306f914..bcd63f1 100644 --- a/tools/lib/h5diff.c +++ b/tools/lib/h5diff.c @@ -868,8 +868,8 @@ hsize_t h5diff(const char *fname1, /* get any symbolic links info */ - l_ret1 = H5tools_get_symlink_info(file1_id, obj1fullname, &trg_linfo1, TRUE); - l_ret2 = H5tools_get_symlink_info(file2_id, obj2fullname, &trg_linfo2, TRUE); + l_ret1 = H5tools_get_symlink_info(file1_id, obj1fullname, &trg_linfo1, options->follow_links); + l_ret2 = H5tools_get_symlink_info(file2_id, obj2fullname, &trg_linfo2, options->follow_links); /*--------------------------------------------- * check for following symlinks @@ -1697,7 +1697,7 @@ hsize_t diff(hid_t file1_id, */ /* target object1 - get type and name */ - ret = H5tools_get_symlink_info(file1_id, path1, &linkinfo1, TRUE); + ret = H5tools_get_symlink_info(file1_id, path1, &linkinfo1, options->follow_links); /* dangling link */ if (ret == 0) { @@ -1715,7 +1715,7 @@ hsize_t diff(hid_t file1_id, goto out; /* target object2 - get type and name */ - ret = H5tools_get_symlink_info(file2_id, path2, &linkinfo2, TRUE); + ret = H5tools_get_symlink_info(file2_id, path2, &linkinfo2, options->follow_links ); /* dangling link */ if (ret == 0) { |