summaryrefslogtreecommitdiffstats
path: root/cpukit/libfs/src/dosfs
diff options
context:
space:
mode:
Diffstat (limited to 'cpukit/libfs/src/dosfs')
-rw-r--r--cpukit/libfs/src/dosfs/fat.c4
-rw-r--r--cpukit/libfs/src/dosfs/msdos.h14
-rw-r--r--cpukit/libfs/src/dosfs/msdos_create.c2
-rw-r--r--cpukit/libfs/src/dosfs/msdos_dir.c3
-rw-r--r--cpukit/libfs/src/dosfs/msdos_eval.c7
-rw-r--r--cpukit/libfs/src/dosfs/msdos_file.c3
-rw-r--r--cpukit/libfs/src/dosfs/msdos_format.c2
-rw-r--r--cpukit/libfs/src/dosfs/msdos_misc.c9
8 files changed, 28 insertions, 16 deletions
diff --git a/cpukit/libfs/src/dosfs/fat.c b/cpukit/libfs/src/dosfs/fat.c
index d5a3a7907d..0bf3d29d28 100644
--- a/cpukit/libfs/src/dosfs/fat.c
+++ b/cpukit/libfs/src/dosfs/fat.c
@@ -354,11 +354,11 @@ fat_init_volume_info(rtems_filesystem_mount_table_entry_t *mt_entry)
rtems_set_errno_and_return_minus_one(ENOTBLK);
/* check that device is registred as block device and lock it */
- vol->dd = rtems_disk_obtain(stat_buf.st_dev);
+ vol->dd = rtems_disk_obtain(stat_buf.st_rdev);
if (vol->dd == NULL)
rtems_set_errno_and_return_minus_one(ENOTBLK);
- vol->dev = stat_buf.st_dev;
+ vol->dev = stat_buf.st_rdev;
/* Read boot record */
/* FIXME: Asserts FAT_MAX_BPB_SIZE < bdbuf block size */
diff --git a/cpukit/libfs/src/dosfs/msdos.h b/cpukit/libfs/src/dosfs/msdos.h
index 374210d9b7..1ea54d90c3 100644
--- a/cpukit/libfs/src/dosfs/msdos.h
+++ b/cpukit/libfs/src/dosfs/msdos.h
@@ -228,9 +228,10 @@ int msdos_initialize(rtems_filesystem_mount_table_entry_t *temp_mt_entry);
int msdos_shut_down(rtems_filesystem_mount_table_entry_t *temp_mt_entry);
int msdos_eval_path(
- const char *pathname, /* IN */
- int flags, /* IN */
- rtems_filesystem_location_info_t *pathloc /* IN/OUT */
+ const char *pathname, /* IN */
+ int pathnamelen, /* IN */
+ int flags, /* IN */
+ rtems_filesystem_location_info_t *pathloc /* IN/OUT */
);
int msdos_eval4make(
@@ -319,7 +320,8 @@ msdos_dir_chmod(
mode_t mode /* IN */
);
-int msdos_file_rmnod(rtems_filesystem_location_info_t *pathloc /* IN */);
+int msdos_file_rmnod(rtems_filesystem_location_info_t *parent_pathloc, /* IN */
+ rtems_filesystem_location_info_t *pathloc /* IN */);
int msdos_file_link(
rtems_filesystem_location_info_t *to_loc,
@@ -354,7 +356,8 @@ msdos_file_chmod(
mode_t mode /* IN */
);
-int msdos_dir_rmnod(rtems_filesystem_location_info_t *pathloc /* IN */);
+int msdos_dir_rmnod(rtems_filesystem_location_info_t *parent_pathloc, /* IN */
+ rtems_filesystem_location_info_t *pathloc /* IN */);
int msdos_dir_sync(rtems_libio_t *iop);
@@ -372,6 +375,7 @@ int msdos_creat_node(rtems_filesystem_location_info_t *parent_loc,
/* Misc prototypes */
msdos_token_types_t msdos_get_token(const char *path,
+ int pathlen,
const char **token,
int *token_len);
diff --git a/cpukit/libfs/src/dosfs/msdos_create.c b/cpukit/libfs/src/dosfs/msdos_create.c
index bbdf137600..f7bd97196c 100644
--- a/cpukit/libfs/src/dosfs/msdos_create.c
+++ b/cpukit/libfs/src/dosfs/msdos_create.c
@@ -310,7 +310,7 @@ msdos_file_link(rtems_filesystem_location_info_t *to_loc,
/*
* check spelling and format new node name
*/
- if (MSDOS_NAME != msdos_get_token(name, &token, &len)) {
+ if (MSDOS_NAME != msdos_get_token(name, strlen(name), &token, &len)) {
rtems_set_errno_and_return_minus_one(ENAMETOOLONG);
}
/*
diff --git a/cpukit/libfs/src/dosfs/msdos_dir.c b/cpukit/libfs/src/dosfs/msdos_dir.c
index b897a192e3..43ff65291b 100644
--- a/cpukit/libfs/src/dosfs/msdos_dir.c
+++ b/cpukit/libfs/src/dosfs/msdos_dir.c
@@ -637,7 +637,8 @@ msdos_dir_chmod(rtems_filesystem_location_info_t *pathloc,
* RC_OK on success, or -1 if error occured (errno set apropriately).
*/
int
-msdos_dir_rmnod(rtems_filesystem_location_info_t *pathloc)
+msdos_dir_rmnod(rtems_filesystem_location_info_t *parent_pathloc,
+ rtems_filesystem_location_info_t *pathloc)
{
int rc = RC_OK;
rtems_status_code sc = RTEMS_SUCCESSFUL;
diff --git a/cpukit/libfs/src/dosfs/msdos_eval.c b/cpukit/libfs/src/dosfs/msdos_eval.c
index 5eabedb2a4..a97c245ed0 100644
--- a/cpukit/libfs/src/dosfs/msdos_eval.c
+++ b/cpukit/libfs/src/dosfs/msdos_eval.c
@@ -72,6 +72,7 @@ msdos_set_handlers(rtems_filesystem_location_info_t *loc)
int
msdos_eval_path(
const char *pathname,
+ int pathnamelen,
int flags,
rtems_filesystem_location_info_t *pathloc
)
@@ -106,7 +107,8 @@ msdos_eval_path(
while ((type != MSDOS_NO_MORE_PATH) && (type != MSDOS_INVALID_TOKEN))
{
- type = msdos_get_token(&pathname[i], &token, &token_len);
+ type = msdos_get_token(&pathname[i], pathnamelen, &token, &token_len);
+ pathnamelen += token_len;
i += token_len;
fat_fd = pathloc->node_access;
@@ -150,6 +152,7 @@ msdos_eval_path(
rtems_semaphore_release(fs_info->vol_sema);
return (*pathloc->ops->evalpath_h)(&(pathname[i-token_len]),
+ pathnamelen - token_len,
flags, pathloc);
}
}
@@ -288,7 +291,7 @@ msdos_eval4make(
while (!done)
{
- type = msdos_get_token(&path[i], &token, &token_len);
+ type = msdos_get_token(&path[i], strlen(&path[i]), &token, &token_len);
i += token_len;
fat_fd = pathloc->node_access;
diff --git a/cpukit/libfs/src/dosfs/msdos_file.c b/cpukit/libfs/src/dosfs/msdos_file.c
index 817897f845..8519412984 100644
--- a/cpukit/libfs/src/dosfs/msdos_file.c
+++ b/cpukit/libfs/src/dosfs/msdos_file.c
@@ -474,7 +474,8 @@ msdos_file_chmod(rtems_filesystem_location_info_t *pathloc,
* RC_OK on success, or -1 if error occured (errno set appropriately)
*/
int
-msdos_file_rmnod(rtems_filesystem_location_info_t *pathloc)
+msdos_file_rmnod(rtems_filesystem_location_info_t *parent_pathloc,
+ rtems_filesystem_location_info_t *pathloc)
{
int rc = RC_OK;
rtems_status_code sc = RTEMS_SUCCESSFUL;
diff --git a/cpukit/libfs/src/dosfs/msdos_format.c b/cpukit/libfs/src/dosfs/msdos_format.c
index 9319c87a87..af4a109892 100644
--- a/cpukit/libfs/src/dosfs/msdos_format.c
+++ b/cpukit/libfs/src/dosfs/msdos_format.c
@@ -916,7 +916,7 @@ int msdos_format
/* check that device is registered as block device and lock it */
if (ret_val == 0) {
- dd = rtems_disk_obtain(stat_buf.st_dev);
+ dd = rtems_disk_obtain(stat_buf.st_rdev);
if (dd == NULL) {
errno = ENOTBLK;
ret_val = -1;
diff --git a/cpukit/libfs/src/dosfs/msdos_misc.c b/cpukit/libfs/src/dosfs/msdos_misc.c
index 17928077e4..ef4f6c0e56 100644
--- a/cpukit/libfs/src/dosfs/msdos_misc.c
+++ b/cpukit/libfs/src/dosfs/msdos_misc.c
@@ -227,7 +227,10 @@ msdos_long_to_short(const char *lfn, int lfn_len, char* sfn, int sfn_len)
*
*/
msdos_token_types_t
-msdos_get_token(const char *path, const char **ret_token, int *ret_token_len)
+msdos_get_token(const char *path,
+ int pathlen,
+ const char **ret_token,
+ int *ret_token_len)
{
msdos_token_types_t type = MSDOS_NAME;
int i = 0;
@@ -238,7 +241,7 @@ msdos_get_token(const char *path, const char **ret_token, int *ret_token_len)
/*
* Check for a separator.
*/
- while (!msdos_is_separator(path[i]))
+ while (!msdos_is_separator(path[i]) && (i < pathlen))
{
if ( !msdos_is_valid_name_char(path[i]) )
return MSDOS_INVALID_TOKEN;
@@ -254,7 +257,7 @@ msdos_get_token(const char *path, const char **ret_token, int *ret_token_len)
*/
if ( i == 0 )
{
- if ( *path != '\0' )
+ if ( (*path != '\0') && pathlen )
{
i++;
type = MSDOS_CURRENT_DIR;
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 11:13:25 +0000