2009-06-12 Chris Johns <chrisj@rtems.org>

        * libblock/src/bdbuf.c: Update comments.
        * libblock/src/bdpart.c, libblock/src/ide_part_table.c: Get the
        device from the rdev field of the stat buf.
        * libcsupport/include/rtems/libio.h: Add a path length to evalpath
        handler. Add parent locations to rmmod and unlink handlers.
        * libcsupport/include/rtems/libio_.h: Add a path length to
        rtems_filesystem_evaluate_path. Add
        rtems_filesystem_evaluate_relative_path, rtems_filesystem_dirname,
        and rtems_filesystem_prefix_separators. Remove
        rtems_filesystem_evaluate_parent.
        * libcsupport/src/base_fs.c, libcsupport/src/chdir.c,
        libcsupport/src/chmod.c, libcsupport/src/chown.c,
        libcsupport/src/chroot.c, libcsupport/src/fchdir.c,
        libcsupport/src/link.c, libcsupport/src/mount.c,
        libcsupport/src/open.c, libcsupport/src/privateenv.c,
        libcsupport/src/readlink.c, libcsupport/src/unmount.c,
        libcsupport/src/utime.c, libcsupport/src/unmount.c,
        libcsupport/src/utime.c, libfs/src/devfs/devfs.h,
        libfs/src/devfs/devfs_eval.c, libfs/src/devfs/devstat.c,
        libfs/src/dosfs/msdos_create.c, libfs/src/dosfs/msdos_misc.c,
        libfs/src/imfs/imfs.h, libfs/src/imfs/imfs_eval.c,
        libfs/src/imfs/imfs_load_tar.c, libfs/src/imfs/ioman.c,
        libfs/src/pipe/pipe.c, libmisc/fsmount/fsmount.c,
        libnetworking/lib/ftpfs.c: Add the length parameter to the eval
        call.
        * libcsupport/src/eval.c: Add rtems_filesystem_prefix_separators,
        rtems_filesystem_dirname,
        rtems_filesystem_evaluate_relative_path. Add the length parameter
        to the eval call.
        * libcsupport/src/rmdir.c: Find the parent pathloc then the node
        pathloc from that node. Remove the call to find the parent given
        the node pathloc.
        * libcsupport/src/stat.c: Add the length parameter to the eval
        call. Set the device into the rdev field.
        * libcsupport/src/unlink.c: Find the parent pathloc then the node
        pathloc from that node. Remove the call to find the parent given
        the node pathloc.
        * libfs/src/dosfs/fat.c, libfs/src/dosfs/msdos_format.c: Get the
        disk device number from the stat rdev field.
        * libfs/src/dosfs/msdos.h: Add the length parameter to the eval
        call. Add the parent pathloc to the rmnod handler.
        * libfs/src/dosfs/msdos_dir.c: Add the parent pathloc to the rmnod
        handler.
        * libfs/src/dosfs/msdos_eval.c: Add the length parameter to the
        eval and token call.
        * libfs/src/imfs/imfs_directory.c: Add the parent pathloc to the
        rmnod handler.
        * libfs/src/imfs/imfs_fchmod.c: Do not test the mode flags for
        only the allowed flags. Add the missing flags spec'ed in the POSIX
        standard.
        * libfs/src/imfs/imfs_fsunmount.c, libfs/src/imfs/imfs_rmnod.c,
        libfs/src/imfs/imfs_unlink.c, libfs/src/imfs/memfile.c: Add the
        parent node. Currently ignored in the IMFS.
        * libfs/src/imfs/imfs_stat.c: Return the device number in the rdev
        field.
        * libfs/src/imfs/imfs_mknod.c, libfs/src/imfs/imfs_symlink.c : Add
        the length parameter to the token call.
        * libfs/src/nfsclient/src/nfs.c: Add the length parameter to the
        eval call and parent node to the rmnod and unlink command.
        * libmisc/shell/internal.h: Remove the libc mounter decl to make
        public.
        * libmisc/shell/main_mount.c: Add support for hooking external
        mount support for new file systems.
        * libmisc/shell/shell.h: Add helper functions for the mount
        command.

1 files changed, 35 insertions, 9 deletions

diff --git a/cpukit/libcsupport/src/rmdir.c b/cpukit/libcsupport/src/rmdir.c
index 4b1de71c8a..ca0129fd3b 100644
--- a/cpukit/libcsupport/src/rmdir.c
+++ b/cpukit/libcsupport/src/rmdir.c
@@ -28,20 +28,42 @@ int rmdir(
   const char *pathname
 )
 {
+  int                               parentpathlen;
+  const char                       *name;
+  rtems_filesystem_location_info_t  parentloc;
   rtems_filesystem_location_info_t  loc;
+  int                               i;
   int                               result;
-
+  
   /*
-   *  Get the node where we wish to go.
+   *  Get the parent node of the node we wish to remove. Find the parent path.
    */
 
-  result = rtems_filesystem_evaluate_path( pathname, 0, &loc, false );
-  if ( result != 0 )
-     return -1;
+  parentpathlen = rtems_filesystem_dirname ( pathname );
 
-  result = rtems_filesystem_evaluate_parent(RTEMS_LIBIO_PERMS_WRITE, &loc );
-  if (result != 0) {
-    rtems_filesystem_freenode( &loc );
+  if ( parentpathlen == 0 )
+    rtems_filesystem_get_start_loc( pathname, &i, &parentloc );
+  else {
+    result = rtems_filesystem_evaluate_path(pathname, 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 = pathname + 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;
   }
 
@@ -51,11 +73,13 @@ int rmdir(
 
   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( ENOTDIR );
   }
 
@@ -65,12 +89,14 @@ int rmdir(
 
   if ( !loc.handlers->rmnod_h ){
     rtems_filesystem_freenode( &loc );
+    rtems_filesystem_freenode( &parentloc );
     rtems_set_errno_and_return_minus_one( ENOTSUP );
   }
 
-  result =  (*loc.handlers->rmnod_h)( &loc );
+  result =  (*loc.handlers->rmnod_h)( &parentloc, &loc );
 
   rtems_filesystem_freenode( &loc );
+  rtems_filesystem_freenode( &parentloc );
 
   return result;
 }