Mirrors_Framework/rtems
1
0
Fork 0
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2026-09-21 11:08:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

2010-03-26 Chris Johns <chrisj@rtems.org>

Browse Source 
* libfs/src/dosfs/msdos_misc.c: Part fix to PR1491.
This commit is contained in:
Chris Johns
2010-03-26 01:19:51 +00:00
parent eff93d5ff0
commit 1b3f7e927d
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cpukit/ChangeLog
+4
View File
@@ -1,3 +1,7 @@
2010-03-26 Chris Johns <chrisj@rtems.org>
* libfs/src/dosfs/msdos_misc.c: Part fix to PR1491.
2010-03-22 Joel Sherrill <joel.sherrill@oarcorp.com>
* libfs/src/rfs/rtems-rfs-bitmaps-ut.c,
cpukit/libfs/src/dosfs/msdos_misc.c
+11 -11
View File
@@ -110,35 +110,32 @@ msdos_short_name_hex(char* sfn, int num)
static msdos_name_type_t
msdos_name_type(const char *name, int name_len)
{
bool dot = false;
bool lowercase = false;
bool uppercase = false;
int dot_at = 0;
int dot_at = -1;
int count = 0;
while (*name && (count < name_len))
{
bool is_dot = *name == '.';
msdos_name_type_t type = msdos_is_valid_name_char(*name);
if ((type == MSDOS_NAME_INVALID) || (type == MSDOS_NAME_LONG))
return type;
if (dot)
if (dot_at >= 0)
{
if ((*name == '.') || ((count - dot_at) > 3))
if (is_dot || ((count - dot_at) > 3))
return MSDOS_NAME_LONG;
}
else
{
if (count >= 8)
if (count == 8 && !is_dot)
return MSDOS_NAME_LONG;
}
if (*name == '.')
{
dot = true;
if (is_dot)
dot_at = count;
}
else if ((*name >= 'A') && (*name <= 'Z'))
uppercase = true;
else if ((*name >= 'a') && (*name <= 'z'))
@@ -194,10 +191,10 @@ msdos_long_to_short(const char *lfn, int lfn_len, char* sfn, int sfn_len)
* Filenames with only blanks and dots are not allowed!
*/
for (i = 0; i < lfn_len; i++)
if ((lfn[i] != ' ') && (lfn[i] == '.'))
if ((lfn[i] != ' ') && (lfn[i] != '.'))
break;
if (i > lfn_len)
if (i == lfn_len)
return MSDOS_NAME_INVALID;
/*
@@ -238,6 +235,9 @@ msdos_get_token(const char *path,
*ret_token = NULL;
*ret_token_len = 0;
if (pathlen == 0)
return MSDOS_NO_MORE_PATH;
/*
* Check for a separator.
*/