Imagelibrary/rtems
1
0
Fork 1
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2025-12-26 14:18:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

dosfs: Fix device identifier

Browse Source 
Update #3358.
This commit is contained in:
Sebastian Huber
2018-11-27 11:56:01 +01:00
parent a7267241a9
commit 06331e4dcb
2 changed files with 42 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cpukit/libfs/src/dosfs/fat.c
View File

@@ -505,7 +505,7 @@ fat_init_volume_info(fat_fs_info_t *fs_info, const char *device)
rtems_set_errno_and_return_minus_one(ENXIO);
}
vol->dev = stat_buf.st_dev;
vol->dev = stat_buf.st_rdev;
/* Read boot record */
/* FIXME: Asserts FAT_MAX_BPB_SIZE < bdbuf block size */

41
testsuites/fstests/fsdosfsname01/init.c
View File

@@ -29,6 +29,7 @@
#include <rtems/dosfs.h>
#include <rtems/ramdisk.h>
#include <rtems/libcsupport.h>
#include <rtems/userenv.h>
#include "image.h"
#include "image_bin_le_singlebyte.h"
#include "image_bin_le_multibyte.h"
@@ -1143,6 +1144,44 @@ static void test_file_with_same_name_as_volume_label( void )
rtems_test_assert( rc == 0 );
}
static void test_getcwd( void )
{
const char *dir_path = MOUNT_DIR "/somedir";
char cwd_buf[128];
char *cwd;
int rc;
rtems_status_code sc;
sc = rtems_libio_set_private_env();
rtems_test_assert( sc == RTEMS_SUCCESSFUL );
cwd = getcwd( cwd_buf, sizeof( cwd_buf ) );
rtems_test_assert( cwd != NULL );
rtems_test_assert( strcmp( cwd, "/" ) == 0 );
rc = mkdir( dir_path, S_IRWXU | S_IRWXG | S_IRWXO );
rtems_test_assert( rc == 0 );
rc = chdir( dir_path );
rtems_test_assert( rc == 0 );
cwd = getcwd( cwd_buf, sizeof( cwd_buf ) );
rtems_test_assert( cwd != NULL );
rtems_test_assert( strcmp( cwd, dir_path ) == 0 );
rc = chdir( "/" );
rtems_test_assert( rc == 0 );
rc = unlink( dir_path );
rtems_test_assert( rc == 0 );
cwd = getcwd( cwd_buf, sizeof( cwd_buf ) );
rtems_test_assert( cwd != NULL );
rtems_test_assert( strcmp( cwd, "/" ) == 0 );
rtems_libio_use_global_env();
}
static void test_special_cases( void )
{
test_end_of_string_matches();
@@ -1150,6 +1189,7 @@ static void test_special_cases( void )
test_full_8_3_name();
test_file_with_same_name_as_volume_label();
test_dir_with_same_name_as_volume_label();
test_getcwd();
}
/*
@@ -1397,6 +1437,7 @@ size_t rtems_ramdisk_configuration_size = RTEMS_ARRAY_SIZE(rtems_ramdisk_configu
#define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER
#define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
#define CONFIGURE_MAXIMUM_SEMAPHORES (2 * RTEMS_DOSFS_SEMAPHORES_PER_INSTANCE)
#define CONFIGURE_MAXIMUM_POSIX_KEY_VALUE_PAIRS 2
#define CONFIGURE_APPLICATION_EXTRA_DRIVERS RAMDISK_DRIVER_TABLE_ENTRY
#define CONFIGURE_APPLICATION_NEEDS_LIBBLOCK