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, 62 insertions, 22 deletions

diff --git a/cpukit/libcsupport/src/eval.c b/cpukit/libcsupport/src/eval.c
index 7c9c0a7e47..5870155189 100644
--- a/cpukit/libcsupport/src/eval.c
+++ b/cpukit/libcsupport/src/eval.c
@@ -21,8 +21,9 @@
 #include <rtems/libio_.h>
 #include <rtems/seterr.h>
 
-int rtems_filesystem_evaluate_path(
+int rtems_filesystem_evaluate_relative_path(
   const char                        *pathname,
+  int                                pathnamelen,
   int                                flags,
   rtems_filesystem_location_info_t  *pathloc,
   int                                follow_link
@@ -42,16 +43,10 @@ int rtems_filesystem_evaluate_path(
   if ( !pathloc )
     rtems_set_errno_and_return_minus_one( EIO );       /* should never happen */
 
-  /*
-   * Evaluate the path using the optable evalpath.
-   */
-
-  rtems_filesystem_get_start_loc( pathname, &i, pathloc );
-
   if ( !pathloc->ops->evalpath_h )
     rtems_set_errno_and_return_minus_one( ENOTSUP );
 
-  result = (*pathloc->ops->evalpath_h)( &pathname[i], flags, pathloc );
+  result = (*pathloc->ops->evalpath_h)( &pathname[i], pathnamelen, flags, pathloc );
 
   /*
    * Get the Node type and determine if you need to follow the link or
@@ -90,34 +85,79 @@ int rtems_filesystem_evaluate_path(
          */
 
         result =  (*pathloc->ops->eval_link_h)( pathloc, flags );
-
     }
   }
 
   return result;
 }
 
-
-int rtems_filesystem_evaluate_parent(
+int rtems_filesystem_evaluate_path(
+  const char                        *pathname,
+  int                                pathnamelen,
   int                                flags,
-  rtems_filesystem_location_info_t  *pathloc
+  rtems_filesystem_location_info_t  *pathloc,
+  int                                follow_link
 )
 {
-  rtems_filesystem_location_info_t  parent;
-  int                               result;
+  int                           i;
+  int                           result;
+  rtems_filesystem_node_types_t type;
+
+  /*
+   * Verify Input parameters.
+   */
+
+  if ( !pathname )
+    rtems_set_errno_and_return_minus_one( EFAULT );
 
   if ( !pathloc )
     rtems_set_errno_and_return_minus_one( EIO );       /* should never happen */
 
-  if ( !pathloc->ops->evalpath_h )
-    rtems_set_errno_and_return_minus_one( ENOTSUP );
+  /*
+   * Evaluate the path using the optable evalpath.
+   */
+
+  rtems_filesystem_get_start_loc( pathname, &i, pathloc );
+
+  /*
+   * We evaluation the path relative to the start location we get got.
+   */
+  return rtems_filesystem_evaluate_relative_path( pathname,
+                                                  pathnamelen,
+                                                  flags,
+                                                  pathloc,
+                                                  follow_link );
+}
 
-  parent = *pathloc;
-  result = (*pathloc->ops->evalpath_h)( "..", flags, &parent );
-  if (result != 0){
-    return -1;
+int rtems_filesystem_dirname(
+  const char  *pathname
+)
+{
+  int len = strlen( pathname );
+
+  while ( len ) {
+    len--;
+    if ( rtems_filesystem_is_separator( pathname[len] ) )
+      break;
   }
-  rtems_filesystem_freenode( &parent );
 
-  return result;
+  return len;
+}
+
+int rtems_filesystem_prefix_separators(
+  const char  *pathname,
+  int          pathnamelen
+)
+{
+  /*
+   * Eat any separators at start of the path.
+   */
+  int stripped = 0;
+  while ( *pathname && pathnamelen && rtems_filesystem_is_separator( *pathname ) )
+  {
+    pathname++;
+    pathnamelen--;
+    stripped++;
+  }
+  return stripped;
 }