RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2010-12-28 Sebastian Huber <sebastian.huber@embedded-brains.de>

Browse Source 
* libfs/src/dosfs/msdos_misc.c: Create short file names acceptable for
	Windows.
This commit is contained in:
Sebastian Huber
2010-12-28 08:46:57 +00:00
parent 45edf78e36
commit 3ae59505d0
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cpukit/ChangeLog
View File

@@ -1,3 +1,8 @@
2010-12-28 Sebastian Huber <sebastian.huber@embedded-brains.de>
* libfs/src/dosfs/msdos_misc.c: Create short file names acceptable for
Windows.
2010-12-27 Sebastian Huber <sebastian.huber@embedded-brains.de> 2010-12-27 Sebastian Huber <sebastian.huber@embedded-brains.de>
* libfs/src/dosfs/msdos.h, libfs/src/dosfs/msdos_misc.c, * libfs/src/dosfs/msdos.h, libfs/src/dosfs/msdos_misc.c,

18
cpukit/libfs/src/dosfs/msdos_misc.c
View File

@@ -92,12 +92,13 @@ msdos_short_name_hex(char* sfn, int num)
static const char* hex = "0123456789ABCDEF"; static const char* hex = "0123456789ABCDEF";
char* c = MSDOS_DIR_NAME(sfn); char* c = MSDOS_DIR_NAME(sfn);
int i; int i;
for (i = 0; i < 3; i++, c++) for (i = 0; i < 2; i++, c++)
if ((*c == ' ') || (*c == '.')) if ((*c == ' ') || (*c == '.'))
*c = '~'; *c = '_';
*c++ = '~';
for (i = 0; i < 4; i++, c++) for (i = 0; i < 4; i++, c++)
*c = hex[(num >> ((3 - i) * 4)) & 0xf]; *c = hex[(num >> ((3 - i) * 4)) & 0xf];
*c++ = '~';
*c++ = '1';
} }
/* msdos_name_type -- /* msdos_name_type --
@@ -1535,6 +1536,7 @@ int msdos_find_name_in_fat_file(
char* p; char* p;
const char* n; const char* n;
int i; int i;
char fill = 0;
length += MSDOS_DIRECTORY_ENTRY_STRUCT_SIZE; length += MSDOS_DIRECTORY_ENTRY_STRUCT_SIZE;
lfn_entry++; lfn_entry++;
@@ -1600,9 +1602,17 @@ int msdos_find_name_in_fat_file(
for (i = 0; i < MSDOS_LFN_LEN_PER_ENTRY; i++) for (i = 0; i < MSDOS_LFN_LEN_PER_ENTRY; i++)
{ {
*p = *n;
if (*n != 0) if (*n != 0)
{
*p = *n;
n++; n++;
}
else
{
p [0] = fill;
p [1] = fill;
fill = 0xff;
}
switch (i) switch (i)
{ {