From 256341001927de4c8b34c870bc0e56892ddbb533 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Tue, 13 Mar 2012 09:22:11 +0100 Subject: Filesystem: Rename defines o Removed RTEMS_LIBIO_PERMS_SEARCH. o Renamed RTEMS_LIBIO_PERMS_READ in RTEMS_FS_PERMS_READ. o Renamed RTEMS_LIBIO_PERMS_WRITE in RTEMS_FS_PERMS_WRITE. o Renamed RTEMS_LIBIO_PERMS_EXEC in RTEMS_FS_PERMS_EXEC. o Renamed RTEMS_LIBIO_FOLLOW_HARD_LINK in RTEMS_FS_FOLLOW_HARD_LINK. o Renamed RTEMS_LIBIO_FOLLOW_SYM_LINK in RTEMS_FS_FOLLOW_SYM_LINK. o Renamed RTEMS_LIBIO_MAKE in RTEMS_FS_MAKE. o Renamed RTEMS_LIBIO_EXCLUSIVE in RTEMS_FS_EXCLUSIVE. o Renamed RTEMS_LIBIO_ACCEPT_RESIDUAL_DELIMITERS in RTEMS_FS_ACCEPT_RESIDUAL_DELIMITERS. o Renamed RTEMS_LIBIO_REJECT_TERMINAL_DOT in RTEMS_FS_REJECT_TERMINAL_DOT. --- cpukit/libfs/src/imfs/imfs_eval.c | 8 ++++---- cpukit/libfs/src/imfs/imfs_load_tar.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'cpukit/libfs/src/imfs') diff --git a/cpukit/libfs/src/imfs/imfs_eval.c b/cpukit/libfs/src/imfs/imfs_eval.c index 43f2ee40e0..33e7e36520 100644 --- a/cpukit/libfs/src/imfs/imfs_eval.c +++ b/cpukit/libfs/src/imfs/imfs_eval.c @@ -124,7 +124,7 @@ static rtems_filesystem_eval_path_generic_status IMFS_eval_token( IMFS_jnode_t *dir = currentloc->node_access; bool access_ok = rtems_filesystem_eval_path_check_access( ctx, - RTEMS_LIBIO_PERMS_SEARCH, + RTEMS_FS_PERMS_EXEC, dir->st_mode, dir->st_uid, dir->st_gid @@ -136,8 +136,8 @@ static rtems_filesystem_eval_path_generic_status IMFS_eval_token( if ( entry != NULL ) { bool terminal = !rtems_filesystem_eval_path_has_path( ctx ); int eval_flags = rtems_filesystem_eval_path_get_flags( ctx ); - bool follow_hard_link = (eval_flags & RTEMS_LIBIO_FOLLOW_HARD_LINK) != 0; - bool follow_sym_link = (eval_flags & RTEMS_LIBIO_FOLLOW_SYM_LINK) != 0; + bool follow_hard_link = (eval_flags & RTEMS_FS_FOLLOW_HARD_LINK) != 0; + bool follow_sym_link = (eval_flags & RTEMS_FS_FOLLOW_SYM_LINK) != 0; rtems_filesystem_eval_path_clear_token( ctx ); @@ -163,7 +163,7 @@ static rtems_filesystem_eval_path_generic_status IMFS_eval_token( } else { access_ok = rtems_filesystem_eval_path_check_access( ctx, - RTEMS_LIBIO_PERMS_EXEC, + RTEMS_FS_PERMS_EXEC, entry->st_mode, entry->st_uid, entry->st_gid diff --git a/cpukit/libfs/src/imfs/imfs_load_tar.c b/cpukit/libfs/src/imfs/imfs_load_tar.c index 0ae0f7cf88..fd038b0ae9 100644 --- a/cpukit/libfs/src/imfs/imfs_load_tar.c +++ b/cpukit/libfs/src/imfs/imfs_load_tar.c @@ -92,7 +92,7 @@ int rtems_tarfs_load( unsigned long nblocks; IMFS_jnode_t *node; int rv = 0; - int eval_flags = RTEMS_LIBIO_FOLLOW_LINK; + int eval_flags = RTEMS_FS_FOLLOW_LINK; rtems_filesystem_eval_path_context_t ctx; rtems_filesystem_location_info_t rootloc; rtems_filesystem_location_info_t *currentloc = @@ -101,7 +101,7 @@ int rtems_tarfs_load( rtems_filesystem_eval_path_extract_currentloc( &ctx, &rootloc ); rtems_filesystem_eval_path_set_flags( &ctx, - RTEMS_LIBIO_MAKE | RTEMS_LIBIO_EXCLUSIVE + RTEMS_FS_MAKE | RTEMS_FS_EXCLUSIVE ); if (rootloc.ops != &IMFS_ops && rootloc.ops != &fifoIMFS_ops) { rv = -1; -- cgit v1.2.3