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/devfs/devfs_eval.c | 4 ++-- cpukit/libfs/src/imfs/imfs_eval.c | 8 ++++---- cpukit/libfs/src/imfs/imfs_load_tar.c | 4 ++-- cpukit/libfs/src/nfsclient/src/nfs.c | 2 +- cpukit/libfs/src/rfs/rtems-rfs-rtems.c | 4 ++-- cpukit/libfs/src/rfs/rtems-rfs-shell.c | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) (limited to 'cpukit/libfs') diff --git a/cpukit/libfs/src/devfs/devfs_eval.c b/cpukit/libfs/src/devfs/devfs_eval.c index b7a31ee921..a0cfbbb8e4 100644 --- a/cpukit/libfs/src/devfs/devfs_eval.c +++ b/cpukit/libfs/src/devfs/devfs_eval.c @@ -63,14 +63,14 @@ void devFS_eval_path( int eval_flags = rtems_filesystem_eval_path_get_flags(ctx); if (node != NULL) { - if ((eval_flags & RTEMS_LIBIO_EXCLUSIVE) == 0) { + if ((eval_flags & RTEMS_FS_EXCLUSIVE) == 0) { currentloc->node_access = node; rtems_filesystem_eval_path_clear_path(ctx); } else { rtems_filesystem_eval_path_error(ctx, EEXIST); } } else { - if ((eval_flags & RTEMS_LIBIO_MAKE) != 0) { + if ((eval_flags & RTEMS_FS_MAKE) != 0) { if (free_node != NULL) { free_node->mode = S_IRWXU | S_IRWXG | S_IRWXO; currentloc->node_access = free_node; 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; diff --git a/cpukit/libfs/src/nfsclient/src/nfs.c b/cpukit/libfs/src/nfsclient/src/nfs.c index 27a4338ae8..ebcdbb3863 100644 --- a/cpukit/libfs/src/nfsclient/src/nfs.c +++ b/cpukit/libfs/src/nfsclient/src/nfs.c @@ -1428,7 +1428,7 @@ static rtems_filesystem_eval_path_generic_status nfs_eval_part( if (nfs_update_currentloc(ctx, nfs, entry)) { int eval_flags = rtems_filesystem_eval_path_get_flags(ctx); - bool follow_sym_link = (eval_flags & RTEMS_LIBIO_FOLLOW_SYM_LINK) != 0; + bool follow_sym_link = (eval_flags & RTEMS_FS_FOLLOW_SYM_LINK) != 0; bool terminal = !rtems_filesystem_eval_path_has_path( ctx ); if (SERP_ATTR(entry).type == NFLNK && (follow_sym_link || !terminal)) { diff --git a/cpukit/libfs/src/rfs/rtems-rfs-rtems.c b/cpukit/libfs/src/rfs/rtems-rfs-rtems.c index 577a6e52be..3d746769f5 100644 --- a/cpukit/libfs/src/rfs/rtems-rfs-rtems.c +++ b/cpukit/libfs/src/rfs/rtems-rfs-rtems.c @@ -137,7 +137,7 @@ rtems_rfs_rtems_eval_token( rtems_filesystem_eval_path_generic_status status = RTEMS_FILESYSTEM_EVAL_PATH_GENERIC_DONE; rtems_rfs_inode_handle* inode = arg; - bool access_ok = rtems_rfs_rtems_eval_perms (ctx, RTEMS_LIBIO_PERMS_SEARCH, inode); + bool access_ok = rtems_rfs_rtems_eval_perms (ctx, RTEMS_FS_PERMS_EXEC, inode); if (access_ok) { if (rtems_filesystem_is_current_directory (token, tokenlen)) { @@ -179,7 +179,7 @@ rtems_rfs_rtems_eval_token( bool is_sym_link = rtems_rfs_rtems_node_type_by_inode (inode) == RTEMS_FILESYSTEM_SYM_LINK; int eval_flags = rtems_filesystem_eval_path_get_flags (ctx); - bool follow_sym_link = (eval_flags & RTEMS_LIBIO_FOLLOW_SYM_LINK) != 0; + bool follow_sym_link = (eval_flags & RTEMS_FS_FOLLOW_SYM_LINK) != 0; bool terminal = !rtems_filesystem_eval_path_has_path (ctx); rtems_filesystem_eval_path_clear_token (ctx); diff --git a/cpukit/libfs/src/rfs/rtems-rfs-shell.c b/cpukit/libfs/src/rfs/rtems-rfs-shell.c index 8ef5b76ff5..96df5f43e9 100644 --- a/cpukit/libfs/src/rfs/rtems-rfs-shell.c +++ b/cpukit/libfs/src/rfs/rtems-rfs-shell.c @@ -103,7 +103,7 @@ rtems_rfs_get_fs (const char* path, rtems_rfs_file_system** fs) */ { rtems_filesystem_eval_path_context_t ctx; - int eval_flags = RTEMS_LIBIO_FOLLOW_LINK; + int eval_flags = RTEMS_FS_FOLLOW_LINK; const rtems_filesystem_location_info_t *currentloc = rtems_filesystem_eval_path_start (&ctx, path, eval_flags); *fs = rtems_rfs_rtems_pathloc_dev (currentloc); -- cgit v1.2.3