summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobb Matzke <matzke@llnl.gov>1998-09-30 20:17:26 (GMT)
committerRobb Matzke <matzke@llnl.gov>1998-09-30 20:17:26 (GMT)
commit177e41c9488b9688ac92a79e8163f1cab26870a9 (patch)
tree8425c69100a4267d3f51a78955449a042bbf86d2
parentbeab7f66e5dd260732fad34b9c26ccb0d8d580a5 (diff)
downloadhdf5-177e41c9488b9688ac92a79e8163f1cab26870a9.zip
hdf5-177e41c9488b9688ac92a79e8163f1cab26870a9.tar.gz
hdf5-177e41c9488b9688ac92a79e8163f1cab26870a9.tar.bz2
[svn-r731] Changes since 19980930
---------------------- ./src/H5G.c ./test/unlink.c Renaming a symbolic link works like on Unix: the link is renamed but the link value is unchanged.
-rw-r--r--src/H5G.c47
1 files changed, 42 insertions, 5 deletions
diff --git a/src/H5G.c b/src/H5G.c
index 6f37549..6126413 100644
--- a/src/H5G.c
+++ b/src/H5G.c
@@ -678,7 +678,7 @@ H5Gunlink(hid_t loc_id, const char *name)
*/
herr_t
H5Gget_objinfo(hid_t loc_id, const char *name, hbool_t follow_link,
- H5G_stat_t *statbuf/*out*/)
+ H5G_stat_t *statbuf/*out*/)
{
H5G_entry_t *loc = NULL;
@@ -2111,7 +2111,7 @@ H5G_link (H5G_entry_t *loc, H5G_link_t type, const char *cur_name,
*/
herr_t
H5G_get_objinfo (H5G_entry_t *loc, const char *name, hbool_t follow_link,
- H5G_stat_t *statbuf/*out*/)
+ H5G_stat_t *statbuf/*out*/)
{
H5O_stab_t stab_mesg;
H5G_entry_t grp_ent, obj_ent;
@@ -2419,15 +2419,52 @@ H5G_unlink(H5G_entry_t *loc, const char *name)
herr_t
H5G_move(H5G_entry_t *loc, const char *src_name, const char *dst_name)
{
+ H5G_stat_t sb;
+ char *linkval=NULL;
+ size_t lv_size=32;
+
FUNC_ENTER(H5G_move, FAIL);
assert(loc);
assert(src_name && *src_name);
assert(dst_name && *dst_name);
- if (H5G_link(loc, H5G_LINK_HARD, src_name, dst_name)<0) {
- HRETURN_ERROR(H5E_SYM, H5E_CANTINIT, FAIL,
- "unable to register new name for object");
+ if (H5G_get_objinfo(loc, src_name, FALSE, &sb)<0) {
+ HRETURN_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "object not found");
}
+ if (H5G_LINK==sb.type) {
+ /*
+ * When renaming a symbolic link we rename the link but don't change
+ * the value of the link.
+ */
+ do {
+ if (NULL==(linkval=H5MM_realloc(linkval, 2*lv_size))) {
+ HRETURN_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
+ "unable to allocate space for symbolic link "
+ "value");
+ }
+ linkval[lv_size-1] = '\0';
+ if (H5G_linkval(loc, src_name, lv_size, linkval)<0) {
+ HRETURN_ERROR(H5E_SYM, H5E_CANTINIT, FAIL,
+ "unable to read symbolic link value");
+ }
+ } while (linkval[lv_size-1]);
+ if (H5G_link(loc, H5G_LINK_SOFT, linkval, dst_name)<0) {
+ HRETURN_ERROR(H5E_SYM, H5E_CANTINIT, FAIL,
+ "unable to rename symbolic link");
+ }
+ H5MM_xfree(linkval);
+
+ } else {
+ /*
+ * Rename the object.
+ */
+ if (H5G_link(loc, H5G_LINK_HARD, src_name, dst_name)<0) {
+ HRETURN_ERROR(H5E_SYM, H5E_CANTINIT, FAIL,
+ "unable to register new name for object");
+ }
+ }
+
+ /* Remove the old name */
if (H5G_unlink(loc, src_name)<0) {
HRETURN_ERROR(H5E_SYM, H5E_CANTINIT, FAIL,
"unable to deregister old object name");