summaryrefslogtreecommitdiffstats
path: root/cpukit/libcsupport/src/unlink.c
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--cpukit/libcsupport/src/unlink.c48
1 files changed, 37 insertions, 11 deletions
diff --git a/cpukit/libcsupport/src/unlink.c b/cpukit/libcsupport/src/unlink.c
index a441d4d6ec..43b1db5705 100644
--- a/cpukit/libcsupport/src/unlink.c
+++ b/cpukit/libcsupport/src/unlink.c
@@ -24,41 +24,67 @@ int unlink(
const char *path
)
{
+ int parentpathlen;
+ const char *name;
+ rtems_filesystem_location_info_t parentloc;
rtems_filesystem_location_info_t loc;
+ int i;
int result;
/*
- * Get the node to be unlinked.
+ * Get the node to be unlinked. Find the parent path first.
*/
-
- result = rtems_filesystem_evaluate_path( path, 0, &loc, false );
- if ( result != 0 )
- return -1;
-
- result = rtems_filesystem_evaluate_parent(RTEMS_LIBIO_PERMS_WRITE, &loc );
- if (result != 0 && errno != ENOTSUP) {
- rtems_filesystem_freenode( &loc );
+
+ parentpathlen = rtems_filesystem_dirname ( path );
+
+ if ( parentpathlen == 0 )
+ rtems_filesystem_get_start_loc( path, &i, &parentloc );
+ else {
+ result = rtems_filesystem_evaluate_path( path, parentpathlen,
+ RTEMS_LIBIO_PERMS_WRITE,
+ &parentloc,
+ false );
+ if ( result != 0 )
+ return -1;
+ }
+
+ /*
+ * Start from the parent to find the node that should be under it.
+ */
+
+ loc = parentloc;
+ name = path + parentpathlen;
+ name += rtems_filesystem_prefix_separators( name, strlen( name ) );
+
+ result = rtems_filesystem_evaluate_relative_path( name , strlen( name ),
+ 0, &loc, false );
+ if ( result != 0 ) {
+ rtems_filesystem_freenode( &parentloc );
return -1;
}
-
+
if ( !loc.ops->node_type_h ) {
rtems_filesystem_freenode( &loc );
+ rtems_filesystem_freenode( &parentloc );
rtems_set_errno_and_return_minus_one( ENOTSUP );
}
if ( (*loc.ops->node_type_h)( &loc ) == RTEMS_FILESYSTEM_DIRECTORY ) {
rtems_filesystem_freenode( &loc );
+ rtems_filesystem_freenode( &parentloc );
rtems_set_errno_and_return_minus_one( EISDIR );
}
if ( !loc.ops->unlink_h ) {
rtems_filesystem_freenode( &loc );
+ rtems_filesystem_freenode( &parentloc );
rtems_set_errno_and_return_minus_one( ENOTSUP );
}
- result = (*loc.ops->unlink_h)( &loc );
+ result = (*loc.ops->unlink_h)( &parentloc, &loc );
rtems_filesystem_freenode( &loc );
+ rtems_filesystem_freenode( &parentloc );
return result;
}