Imagelibrary/rtems
1
0
Fork 1
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2025-12-22 07:17:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

After comments D. V. Henkel-Wallace <gumby@zembu.com>, the interface to

Browse Source 
mount() was changed to avoid the use of a string as the options.
This commit is contained in:
Joel Sherrill
1999-06-15 22:16:30 +00:00
parent aea6ce0b39
commit 937ab62c30
14 changed files with 20 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
c/src/exec/libcsupport/include/rtems/libio.h
View File

@@ -562,7 +562,7 @@ int unmount(
int mount( int mount(
rtems_filesystem_mount_table_entry_t **mt_entry, rtems_filesystem_mount_table_entry_t **mt_entry,
rtems_filesystem_operations_table *fs_ops, rtems_filesystem_operations_table *fs_ops,
char *fsoptions, rtems_filesystem_options_t fsoptions,
char *device, char *device,
char *mount_point char *mount_point
); );

2
c/src/exec/libcsupport/src/base_fs.c
View File

@@ -55,7 +55,7 @@ void rtems_filesystem_initialize( void )
status = mount( status = mount(
&first_entry, &first_entry,
&IMFS_ops, &IMFS_ops,
"RW", RTEMS_FILESYSTEM_READ_WRITE,
NULL, NULL,
NULL ); NULL );
if( status == -1 ){ if( status == -1 ){

38
c/src/exec/libcsupport/src/mount.c
View File

@@ -60,11 +60,6 @@ int search_mt_for_mount_point(
rtems_filesystem_location_info_t *location_of_mount_point rtems_filesystem_location_info_t *location_of_mount_point
); );
rtems_filesystem_options_t get_file_system_options(
char *fsoptions
);
int init_fs_mount_table( void ); int init_fs_mount_table( void );
@@ -93,7 +88,7 @@ int init_fs_mount_table( void );
int mount( int mount(
rtems_filesystem_mount_table_entry_t **mt_entry, rtems_filesystem_mount_table_entry_t **mt_entry,
rtems_filesystem_operations_table *fs_ops, rtems_filesystem_operations_table *fs_ops,
char *fsoptions, rtems_filesystem_options_t fsoptions,
char *device, char *device,
char *mount_point char *mount_point
) )
@@ -117,13 +112,8 @@ int mount(
* Are the file system options valid? * Are the file system options valid?
*/ */
if ( fsoptions == NULL ) { if ( fsoptions != RTEMS_FILESYSTEM_READ_ONLY &&
errno = EINVAL; fsoptions != RTEMS_FILESYSTEM_READ_WRITE ) {
return -1;
}
options = get_file_system_options( fsoptions );
if ( options == RTEMS_FILESYSTEM_BAD_OPTIONS ) {
errno = EINVAL; errno = EINVAL;
return -1; return -1;
} }
@@ -257,28 +247,6 @@ int init_fs_mount_table()
return 0; return 0;
} }
/*
* get_file_system_options
*
* This routine will determine is the text string that represents the options
* that are to be used to mount the file system are actually valid. If the
* options are valid the appropriate file system options type will be returned
* to the calling routine.
*/
rtems_filesystem_options_t get_file_system_options(
char *fsoptions
)
{
if ( strcasecmp( "RO", fsoptions ) == 0 )
return RTEMS_FILESYSTEM_READ_ONLY;
if ( strcasecmp( "RW", fsoptions ) == 0 )
return RTEMS_FILESYSTEM_READ_WRITE;
else
return RTEMS_FILESYSTEM_BAD_OPTIONS;
}
/* /*
* search_mt_for_mount_point * search_mt_for_mount_point

2
c/src/exec/libnetworking/lib/tftpDriver.c
View File

@@ -234,7 +234,7 @@ int rtems_bsdnet_initialize_tftp_filesystem ()
status = mount( status = mount(
&entry, &entry,
&rtems_tftp_ops, &rtems_tftp_ops,
"RO", RTEMS_FILESYSTEM_READ_ONLY,
NULL, NULL,
TFTP_PATHNAME_PREFIX TFTP_PATHNAME_PREFIX
); );

2
c/src/lib/include/rtems/libio.h
View File

@@ -562,7 +562,7 @@ int unmount(
int mount( int mount(
rtems_filesystem_mount_table_entry_t **mt_entry, rtems_filesystem_mount_table_entry_t **mt_entry,
rtems_filesystem_operations_table *fs_ops, rtems_filesystem_operations_table *fs_ops,
char *fsoptions, rtems_filesystem_options_t fsoptions,
char *device, char *device,
char *mount_point char *mount_point
); );

2
c/src/lib/libc/base_fs.c
View File

@@ -55,7 +55,7 @@ void rtems_filesystem_initialize( void )
status = mount( status = mount(
&first_entry, &first_entry,
&IMFS_ops, &IMFS_ops,
"RW", RTEMS_FILESYSTEM_READ_WRITE,
NULL, NULL,
NULL ); NULL );
if( status == -1 ){ if( status == -1 ){

2
c/src/lib/libc/libio.h
View File

@@ -562,7 +562,7 @@ int unmount(
int mount( int mount(
rtems_filesystem_mount_table_entry_t **mt_entry, rtems_filesystem_mount_table_entry_t **mt_entry,
rtems_filesystem_operations_table *fs_ops, rtems_filesystem_operations_table *fs_ops,
char *fsoptions, rtems_filesystem_options_t fsoptions,
char *device, char *device,
char *mount_point char *mount_point
); );

38
c/src/lib/libc/mount.c
View File

@@ -60,11 +60,6 @@ int search_mt_for_mount_point(
rtems_filesystem_location_info_t *location_of_mount_point rtems_filesystem_location_info_t *location_of_mount_point
); );
rtems_filesystem_options_t get_file_system_options(
char *fsoptions
);
int init_fs_mount_table( void ); int init_fs_mount_table( void );
@@ -93,7 +88,7 @@ int init_fs_mount_table( void );
int mount( int mount(
rtems_filesystem_mount_table_entry_t **mt_entry, rtems_filesystem_mount_table_entry_t **mt_entry,
rtems_filesystem_operations_table *fs_ops, rtems_filesystem_operations_table *fs_ops,
char *fsoptions, rtems_filesystem_options_t fsoptions,
char *device, char *device,
char *mount_point char *mount_point
) )
@@ -117,13 +112,8 @@ int mount(
* Are the file system options valid? * Are the file system options valid?
*/ */
if ( fsoptions == NULL ) { if ( fsoptions != RTEMS_FILESYSTEM_READ_ONLY &&
errno = EINVAL; fsoptions != RTEMS_FILESYSTEM_READ_WRITE ) {
return -1;
}
options = get_file_system_options( fsoptions );
if ( options == RTEMS_FILESYSTEM_BAD_OPTIONS ) {
errno = EINVAL; errno = EINVAL;
return -1; return -1;
} }
@@ -257,28 +247,6 @@ int init_fs_mount_table()
return 0; return 0;
} }
/*
* get_file_system_options
*
* This routine will determine is the text string that represents the options
* that are to be used to mount the file system are actually valid. If the
* options are valid the appropriate file system options type will be returned
* to the calling routine.
*/
rtems_filesystem_options_t get_file_system_options(
char *fsoptions
)
{
if ( strcasecmp( "RO", fsoptions ) == 0 )
return RTEMS_FILESYSTEM_READ_ONLY;
if ( strcasecmp( "RW", fsoptions ) == 0 )
return RTEMS_FILESYSTEM_READ_WRITE;
else
return RTEMS_FILESYSTEM_BAD_OPTIONS;
}
/* /*
* search_mt_for_mount_point * search_mt_for_mount_point

2
c/src/lib/libnetworking/lib/tftpDriver.c
View File

@@ -234,7 +234,7 @@ int rtems_bsdnet_initialize_tftp_filesystem ()
status = mount( status = mount(
&entry, &entry,
&rtems_tftp_ops, &rtems_tftp_ops,
"RO", RTEMS_FILESYSTEM_READ_ONLY,
NULL, NULL,
TFTP_PATHNAME_PREFIX TFTP_PATHNAME_PREFIX
); );

2
c/src/libnetworking/lib/tftpDriver.c
View File

@@ -234,7 +234,7 @@ int rtems_bsdnet_initialize_tftp_filesystem ()
status = mount( status = mount(
&entry, &entry,
&rtems_tftp_ops, &rtems_tftp_ops,
"RO", RTEMS_FILESYSTEM_READ_ONLY,
NULL, NULL,
TFTP_PATHNAME_PREFIX TFTP_PATHNAME_PREFIX
); );

2
cpukit/libcsupport/include/rtems/libio.h
View File

@@ -562,7 +562,7 @@ int unmount(
int mount( int mount(
rtems_filesystem_mount_table_entry_t **mt_entry, rtems_filesystem_mount_table_entry_t **mt_entry,
rtems_filesystem_operations_table *fs_ops, rtems_filesystem_operations_table *fs_ops,
char *fsoptions, rtems_filesystem_options_t fsoptions,
char *device, char *device,
char *mount_point char *mount_point
); );

2
cpukit/libcsupport/src/base_fs.c
View File

@@ -55,7 +55,7 @@ void rtems_filesystem_initialize( void )
status = mount( status = mount(
&first_entry, &first_entry,
&IMFS_ops, &IMFS_ops,
"RW", RTEMS_FILESYSTEM_READ_WRITE,
NULL, NULL,
NULL ); NULL );
if( status == -1 ){ if( status == -1 ){

38
cpukit/libcsupport/src/mount.c
View File

@@ -60,11 +60,6 @@ int search_mt_for_mount_point(
rtems_filesystem_location_info_t *location_of_mount_point rtems_filesystem_location_info_t *location_of_mount_point
); );
rtems_filesystem_options_t get_file_system_options(
char *fsoptions
);
int init_fs_mount_table( void ); int init_fs_mount_table( void );
@@ -93,7 +88,7 @@ int init_fs_mount_table( void );
int mount( int mount(
rtems_filesystem_mount_table_entry_t **mt_entry, rtems_filesystem_mount_table_entry_t **mt_entry,
rtems_filesystem_operations_table *fs_ops, rtems_filesystem_operations_table *fs_ops,
char *fsoptions, rtems_filesystem_options_t fsoptions,
char *device, char *device,
char *mount_point char *mount_point
) )
@@ -117,13 +112,8 @@ int mount(
* Are the file system options valid? * Are the file system options valid?
*/ */
if ( fsoptions == NULL ) { if ( fsoptions != RTEMS_FILESYSTEM_READ_ONLY &&
errno = EINVAL; fsoptions != RTEMS_FILESYSTEM_READ_WRITE ) {
return -1;
}
options = get_file_system_options( fsoptions );
if ( options == RTEMS_FILESYSTEM_BAD_OPTIONS ) {
errno = EINVAL; errno = EINVAL;
return -1; return -1;
} }
@@ -257,28 +247,6 @@ int init_fs_mount_table()
return 0; return 0;
} }
/*
* get_file_system_options
*
* This routine will determine is the text string that represents the options
* that are to be used to mount the file system are actually valid. If the
* options are valid the appropriate file system options type will be returned
* to the calling routine.
*/
rtems_filesystem_options_t get_file_system_options(
char *fsoptions
)
{
if ( strcasecmp( "RO", fsoptions ) == 0 )
return RTEMS_FILESYSTEM_READ_ONLY;
if ( strcasecmp( "RW", fsoptions ) == 0 )
return RTEMS_FILESYSTEM_READ_WRITE;
else
return RTEMS_FILESYSTEM_BAD_OPTIONS;
}
/* /*
* search_mt_for_mount_point * search_mt_for_mount_point

2
cpukit/libnetworking/lib/tftpDriver.c
View File

@@ -234,7 +234,7 @@ int rtems_bsdnet_initialize_tftp_filesystem ()
status = mount( status = mount(
&entry, &entry,
&rtems_tftp_ops, &rtems_tftp_ops,
"RO", RTEMS_FILESYSTEM_READ_ONLY,
NULL, NULL,
TFTP_PATHNAME_PREFIX TFTP_PATHNAME_PREFIX
); );