From 7baa484300d36a9ced34f6642501f91fd1428461 Mon Sep 17 00:00:00 2001 From: Chris Johns Date: Fri, 12 Jun 2009 01:53:33 +0000 Subject: 2009-06-12 Chris Johns * 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. --- cpukit/libmisc/fsmount/fsmount.c | 3 ++- cpukit/libmisc/shell/internal.h | 7 ------- cpukit/libmisc/shell/main_mount.c | 40 ++++++++++++++++++++++++++++++++++++++- cpukit/libmisc/shell/shell.h | 31 ++++++++++++++++++++++++++++++ 4 files changed, 72 insertions(+), 9 deletions(-) (limited to 'cpukit/libmisc') diff --git a/cpukit/libmisc/fsmount/fsmount.c b/cpukit/libmisc/fsmount/fsmount.c index 506c44aeb1..6e9ba263a7 100644 --- a/cpukit/libmisc/fsmount/fsmount.c +++ b/cpukit/libmisc/fsmount/fsmount.c @@ -76,7 +76,8 @@ int rtems_fsmount_create_mount_point /* * scan through given string, one segment at a time */ - token_type = IMFS_get_token(mount_point+total_len,token,&token_len); + token_type = IMFS_get_token(mount_point+total_len,strlen(mount_point+total_len), + token,&token_len); total_len += token_len; strncpy(tok_buffer,mount_point,total_len); tok_buffer[total_len] = '\0'; diff --git a/cpukit/libmisc/shell/internal.h b/cpukit/libmisc/shell/internal.h index 1855d0b080..aadd346092 100644 --- a/cpukit/libmisc/shell/internal.h +++ b/cpukit/libmisc/shell/internal.h @@ -29,13 +29,6 @@ rtems_shell_topic_t * rtems_shell_lookup_topic(const char *topic); void rtems_shell_register_monitor_commands(void); void rtems_shell_initialize_command_set(void); -int rtems_shell_libc_mounter( - const char* driver, - const char* path, - rtems_shell_filesystems_t* fs, - rtems_filesystem_options_t options -); - void rtems_shell_print_heap_info( const char *c, Heap_Information *h diff --git a/cpukit/libmisc/shell/main_mount.c b/cpukit/libmisc/shell/main_mount.c index c949715313..43b6aaf36e 100644 --- a/cpukit/libmisc/shell/main_mount.c +++ b/cpukit/libmisc/shell/main_mount.c @@ -28,6 +28,30 @@ #include #include "internal.h" +static rtems_chain_control filesystems; +static bool fs_init; + +static void rtems_shell_mount_fsys_init() +{ + if (!fs_init) + { + rtems_chain_initialize_empty (&filesystems); + fs_init = true; + } +} + +void rtems_shell_mount_add_fsys(rtems_shell_filesystems_t* fs) +{ + rtems_shell_mount_fsys_init(); + rtems_chain_append (&filesystems, &fs->link); +} + +void rtems_shell_mount_del_fsys(rtems_shell_filesystems_t* fs) +{ + if (fs_init) + rtems_chain_extract (&fs->link); +} + int rtems_shell_libc_mounter( const char* driver, const char* path, @@ -60,12 +84,14 @@ int rtems_shell_main_mount( char* driver = NULL; char* mount_point = NULL; int arg; + + rtems_shell_mount_fsys_init(); for (arg = 1; arg < argc; arg++) { if (argv[arg][0] == '-') { if (argv[arg][1] == 't') { rtems_shell_filesystems_t** a; - + arg++; if (arg == argc) { fprintf( @@ -82,6 +108,18 @@ int rtems_shell_main_mount( break; } } + + if (!fs && !rtems_chain_is_empty(&filesystems)) { + rtems_chain_node* node = filesystems.first; + while (!rtems_chain_is_tail (&filesystems, node)) { + rtems_shell_filesystems_t* f = (rtems_shell_filesystems_t*)node; + if (strcmp (argv[arg], f->name) == 0) { + fs = f; + break; + } + node = node->next; + } + } } else if (argv[arg][1] == 'r') { options = RTEMS_FILESYSTEM_READ_ONLY; } else if (argv[arg][1] == 'L') { diff --git a/cpukit/libmisc/shell/shell.h b/cpukit/libmisc/shell/shell.h index 333b03d977..a9782b846b 100644 --- a/cpukit/libmisc/shell/shell.h +++ b/cpukit/libmisc/shell/shell.h @@ -24,6 +24,7 @@ #include #include #include +#include #ifdef __cplusplus extern "C" { @@ -232,6 +233,7 @@ typedef int (*rtems_shell_filesystems_mounter_t)( ); struct rtems_shell_filesystems_tt { + rtems_chain_node link; const char *name; int driver_needed; const rtems_filesystem_operations_table *fs_ops; @@ -257,6 +259,35 @@ void rtems_shell_get_prompt( size_t size ); +/** + * Helper for the mount command. + * + * @param[in] driver The path to the driver. + * @param[in] path The path to mount on. + * @param[in] fs The file system definition. + * @param[in] options Special file system options. + */ +int rtems_shell_libc_mounter( + const char* driver, + const char* path, + rtems_shell_filesystems_t* fs, + rtems_filesystem_options_t options +); + +/** + * Add a new file system mount configuration to the mount command. + * + * @param[in] fs The file system mount data. + */ +void rtems_shell_mount_add_fsys(rtems_shell_filesystems_t* fs); + +/** + * Delete file system mount configuration from the mount command. + * + * @param[in] fs The file system mount data to remove. + */ +void rtems_shell_mount_del_fsys(rtems_shell_filesystems_t* fs); + #ifdef __cplusplus } #endif -- cgit v1.2.3