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

diff --git a/cpukit/libfs/src/imfs/imfs_eval.c b/cpukit/libfs/src/imfs/imfs_eval.c
index 62d02f964e..5dcf7576a5 100644
--- a/cpukit/libfs/src/imfs/imfs_eval.c
+++ b/cpukit/libfs/src/imfs/imfs_eval.c
@@ -206,6 +206,7 @@ int IMFS_evaluate_sym_link(
 
   result = IMFS_eval_path(
     &jnode->info.sym_link.name[i],
+    strlen( &jnode->info.sym_link.name[i] ),
     flags,
     node
   );
@@ -294,6 +295,7 @@ int IMFS_evaluate_for_make(
   rtems_filesystem_location_info_t    newloc;
   IMFS_jnode_t                       *node;
   bool                                done = false;
+  int                                 pathlen;
   int                                 result;
 
   /*
@@ -303,12 +305,17 @@ int IMFS_evaluate_for_make(
   node = pathloc->node_access;
 
   /*
+   * Get the path length.
+   */
+  pathlen = strlen( path );
+  /*
    *  Evaluate all tokens until we are done or an error occurs.
    */
-
+  
   while( !done ) {
 
-    type = IMFS_get_token( &path[i], token, &len );
+    type = IMFS_get_token( &path[i], pathlen, token, &len );
+    pathlen -= len;
     i +=  len;
 
     if ( !pathloc->node_access )
@@ -480,6 +487,7 @@ int IMFS_evaluate_for_make(
 
 int IMFS_eval_path(
   const char                        *pathname,     /* IN     */
+  int                                pathnamelen,  /* IN     */
   int                                flags,        /* IN     */
   rtems_filesystem_location_info_t  *pathloc       /* IN/OUT */
 )
@@ -510,8 +518,9 @@ int IMFS_eval_path(
 
   while( (type != IMFS_NO_MORE_PATH) && (type != IMFS_INVALID_TOKEN) ) {
 
-    type = IMFS_get_token( &pathname[i], token, &len );
-    i +=  len;
+    type = IMFS_get_token( &pathname[i], pathnamelen, token, &len );
+    pathnamelen -= len;
+    i += len;
 
     if ( !pathloc->node_access )
       rtems_set_errno_and_return_minus_one( ENOENT );
@@ -551,7 +560,9 @@ int IMFS_eval_path(
 	  } else {
             newloc = pathloc->mt_entry->mt_point_node;
             *pathloc = newloc;
-            return (*pathloc->ops->evalpath_h)(&(pathname[i-len]),flags,pathloc);
+            return (*pathloc->ops->evalpath_h)(&(pathname[i-len]),
+                                               pathnamelen+len,
+                                               flags,pathloc);
 	  }
 	} else {
 
@@ -603,7 +614,9 @@ int IMFS_eval_path(
         if ( node->info.directory.mt_fs != NULL ) {
           newloc   = node->info.directory.mt_fs->mt_fs_root;
           *pathloc = newloc;
-          return (*pathloc->ops->evalpath_h)( &pathname[i-len], flags, pathloc );
+          return (*pathloc->ops->evalpath_h)( &pathname[i-len],
+                                              pathnamelen+len,
+                                              flags, pathloc );
 	}
 
 	/*
@@ -645,7 +658,9 @@ int IMFS_eval_path(
     if ( node->info.directory.mt_fs != NULL ) {
       newloc   = node->info.directory.mt_fs->mt_fs_root;
       *pathloc = newloc;
-      return (*pathloc->ops->evalpath_h)( &pathname[i-len], flags, pathloc );
+      return (*pathloc->ops->evalpath_h)( &pathname[i-len],
+                                          pathnamelen+len,
+                                          flags, pathloc );
     } else {
       result = IMFS_Set_handlers( pathloc );
     }