Changeset ec9d486 in rtems

Timestamp:

Apr 16, 2011, 3:47:32 AM (9 years ago)

Author:

Chris Johns <chrisj@…>

Branches:

4.10

Children:

701d4d84

Parents:

17cc97d

Message:

2011-04-16 Chris Johns <chrisj@…>

PR 1774/filesystem

• libfs/src/imfs/imfs_eval.c: Fix the IMFS eval and eval for make handlers to not inspect a mounted file sytems path.

Location:

cpukit

Files:

• ChangeLog (modified) (1 diff)
• libfs/src/imfs/imfs_eval.c (modified) (10 diffs)

cpukit/ChangeLog

@@ +1 @@
+2011-04-16      Chris Johns <chrisj@rtems.org>
+
+        PR 1774/filesystem
+        * libfs/src/imfs/imfs_eval.c: Fix the IMFS eval and eval for make
+        handlers to not inspect a mounted file sytems path.
+        
 2011-04-04      Sebastien Bourdeauducq <sebastien.bourdeauducq@gmail.com>
 

cpukit/libfs/src/imfs/imfs_eval.c

@@ -307 +307 @@
    */
   pathlen = strlen( path );
+
   /*
    *  Evaluate all tokens until we are done or an error occurs.
@@ -336 +337 @@
        /*
         *  Am I at the root of all filesystems? (chroot'ed?)
-        */
+        */
 
        if ( pathloc->node_access == rtems_filesystem_root.node_access )
@@ -342 +343 @@
 
 
-        /*
-         * Am I at the root of this mounted filesystem?
-         */
-
-        if (pathloc->node_access == pathloc->mt_entry->mt_fs_root.node_access){
+       /*
+        * Am I at the root of this mounted filesystem?
+        */
+
+        if (pathloc->node_access ==
+            pathloc->mt_entry->mt_fs_root.node_access){
 
           /*
-           *  Am I at the root of all filesystems?
-           */
+           *  Am I at the root of all filesystems?
+           */
 
           if ( pathloc->node_access == rtems_filesystem_root.node_access ) {
             break;
-
-          } else {
+          } else {
             newloc = pathloc->mt_entry->mt_point_node;
             *pathloc = newloc;
-            return (*pathloc->ops->evalformake_h)( &path[i-len], pathloc, name );
-          }
-        } else {
-
+            return (*pathloc->ops->evalformake_h)( &path[i], pathloc, name );
+          }
+        } else {
           if ( !node->Parent )
             rtems_set_errno_and_return_minus_one( ENOENT );
 
           node = node->Parent;
-        }
+        }
 
         pathloc->node_access = node;
@@ -372 +372 @@
 
       case IMFS_NAME:
-
-        if ( node->type == IMFS_HARD_LINK ) {
+        /*
+         *  If we are at a link follow it.
+         */
+
+        if ( node->type == IMFS_HARD_LINK ) {
 
           result = IMFS_evaluate_link( pathloc, 0 );
@@ -379 +382 @@
             return -1;
 
-        } else if ( node->type == IMFS_SYM_LINK ) {
+        } else if ( node->type == IMFS_SYM_LINK ) {
 
           result = IMFS_evaluate_link( pathloc, 0 );
@@ -385 +388 @@
           if ( result == -1 )
             return -1;
-        }
+        }
 
         node = pathloc->node_access;
@@ -393 +396 @@
         /*
          * Only a directory can be decended into.
-         */
+         */
 
         if ( node->type != IMFS_DIRECTORY )
           rtems_set_errno_and_return_minus_one( ENOTDIR );
 
-        /*
-         * If we are at a node that is a mount point. Set loc to the
-         * new fs root node and let them finish evaluating the path.
-         */
-
-        if ( node->info.directory.mt_fs != NULL ) {
-          newloc  = node->info.directory.mt_fs->mt_fs_root;
-          *pathloc = newloc;
-          return (*pathloc->ops->evalformake_h)( &path[i-len], pathloc, name );
-        }
-
-        /*
-         * Otherwise find the token name in the present location.
-         */
+        /*
+         * Otherwise find the token name in the present location.
+         */
 
         node = IMFS_find_match_in_dir( node, token );
 
-        /*
-         * If there is no node we have found the name of the node we
+        /*
+         * If there is no node we have found the name of the node we
          * wish to create.
-         */
+         */
 
         if ( ! node )
           done = true;
-        else
+        else {
+          /*
+           * If we are at a node that is a mount point. Set loc to the
+           * new fs root node and let them finish evaluating the path.
+           */
+
+          if ( node->info.directory.mt_fs != NULL ) {
+            newloc  = node->info.directory.mt_fs->mt_fs_root;
+            *pathloc = newloc;
+            return (*pathloc->ops->evalformake_h)( &path[i], pathloc, name );
+          }
+          
           pathloc->node_access = node;
-
+        }
         break;
 
@@ -559 +562 @@
             newloc = pathloc->mt_entry->mt_point_node;
             *pathloc = newloc;
-            return (*pathloc->ops->evalpath_h)(&(pathname[i-len]),
-                                               pathnamelen+len,
+            return (*pathloc->ops->evalpath_h)(&(pathname[i]),
+                                               pathnamelen,
                                                flags,pathloc);
           }
         } else {
-
           if ( !node->Parent )
             rtems_set_errno_and_return_minus_one( ENOENT );
 
           node = node->Parent;
-          pathloc->node_access = node;
-
         }
 
@@ -606 +606 @@
 
         /*
+         *  Otherwise find the token name in the present location.
+         */
+
+        node = IMFS_find_match_in_dir( node, token );
+
+        if ( !node )
+          rtems_set_errno_and_return_minus_one( ENOENT );
+
+
+        /*
+         *  Set the node access to the point we have found.
+         */
+
+        pathloc->node_access = node;
+        
+        /*
          *  If we are at a node that is a mount point. Set loc to the
          *  new fs root node and let them finish evaluating the path.
@@ -613 +629 @@
           newloc   = node->info.directory.mt_fs->mt_fs_root;
           *pathloc = newloc;
-          return (*pathloc->ops->evalpath_h)( &pathname[i-len],
-                                              pathnamelen+len,
+          return (*pathloc->ops->evalpath_h)( &pathname[i],
+                                              pathnamelen,
                                               flags, pathloc );
         }
-
-        /*
-         *  Otherwise find the token name in the present location.
-         */
-
-        node = IMFS_find_match_in_dir( node, token );
-        if ( !node )
-          rtems_set_errno_and_return_minus_one( ENOENT );
-
-        /*
-         *  Set the node access to the point we have found.
-         */
-
-        pathloc->node_access = node;
         break;