change log for rtems (2011-04-16)
rtems-vc at rtems.org
rtems-vc at rtems.org
Sat Apr 16 05:15:01 UTC 2011
*ccj*:
2011-04-16 Chris Johns <chrisj at 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.
M 1.2801 cpukit/ChangeLog
M 1.32 cpukit/libfs/src/imfs/imfs_eval.c
diff -u rtems/cpukit/ChangeLog:1.2800 rtems/cpukit/ChangeLog:1.2801
--- rtems/cpukit/ChangeLog:1.2800 Fri Apr 15 06:13:20 2011
+++ rtems/cpukit/ChangeLog Fri Apr 15 23:40:11 2011
@@ -1,5 +1,10 @@
-2011-04-15 Sebastian Huber <sebastian.huber at embedded-brains.de>
+2011-04-16 Chris Johns <chrisj at 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-15 Sebastian Huber <sebastian.huber at embedded-brains.de>
* libcsupport/src/ioctl.c, libfs/src/pipe/fifo.c: Fixed integer type.
2011-04-11 Joel Sherrill <joel.sherrill at oarcorp.com>
diff -u rtems/cpukit/libfs/src/imfs/imfs_eval.c:1.31 rtems/cpukit/libfs/src/imfs/imfs_eval.c:1.32
--- rtems/cpukit/libfs/src/imfs/imfs_eval.c:1.31 Fri Aug 27 12:32:59 2010
+++ rtems/cpukit/libfs/src/imfs/imfs_eval.c Fri Apr 15 23:40:11 2011
@@ -292,6 +292,7 @@
* Get the path length.
*/
pathlen = strlen( path );
+
/*
* Evaluate all tokens until we are done or an error occurs.
*/
@@ -321,56 +322,58 @@
case IMFS_UP_DIR:
/*
* Am I at the root of all filesystems? (chroot'ed?)
- */
+ */
if ( pathloc->node_access == rtems_filesystem_root.node_access )
break; /* Throw out the .. in this case */
- /*
- * Am I at the root of this mounted filesystem?
- */
+ /*
+ * Am I at the root of this mounted filesystem?
+ */
- if (pathloc->node_access == pathloc->mt_entry->mt_fs_root.node_access){
+ 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;
break;
case IMFS_NAME:
+ /*
+ * If we are at a link follow it.
+ */
- if ( node->type == IMFS_HARD_LINK ) {
+ if ( node->type == IMFS_HARD_LINK ) {
result = IMFS_evaluate_link( pathloc, 0 );
if ( result == -1 )
return -1;
- } else if ( node->type == IMFS_SYM_LINK ) {
+ } else if ( node->type == IMFS_SYM_LINK ) {
result = IMFS_evaluate_link( pathloc, 0 );
if ( result == -1 )
return -1;
- }
+ }
node = pathloc->node_access;
if ( !node )
@@ -378,38 +381,38 @@
/*
* 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
- pathloc->node_access = node;
+ 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;
case IMFS_NO_MORE_PATH:
@@ -543,18 +546,15 @@
} else {
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;
-
}
pathloc->node_access = node;
@@ -564,17 +564,17 @@
/*
* If we are at a link follow it.
*/
+
if ( node->type == IMFS_HARD_LINK ) {
+
IMFS_evaluate_hard_link( pathloc, 0 );
+
node = pathloc->node_access;
-
- /*
- * It would be a design error if we evaluated the link and
- * was broken.
- */
- IMFS_assert( node );
+ if ( !node )
+ rtems_set_errno_and_return_minus_one( ENOTDIR );
} else if ( node->type == IMFS_SYM_LINK ) {
+
result = IMFS_evaluate_sym_link( pathloc, 0 );
/*
@@ -589,25 +589,16 @@
/*
* 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->evalpath_h)( &pathname[i-len],
- pathnamelen+len,
- 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 );
@@ -616,6 +607,19 @@
*/
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.
+ */
+
+ 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],
+ pathnamelen,
+ flags, pathloc );
+ }
break;
case IMFS_NO_MORE_PATH:
--
Generated by Deluxe Loginfo [http://www.codewiz.org/projects/index.html#loginfo] 2.122 by Bernardo Innocenti <bernie at develer.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/vc/attachments/20110416/132f835b/attachment.html>
More information about the vc
mailing list