devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Preserve the longname extension as much as possible for shortname creation. Randomise the last 4 chars of the name part instead, but only if there is a clash.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5988 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jens Arnold 2005-02-16 20:45:56 +00:00
parent 1c6b2513ea
commit dbf7f51cf2
1 changed files with 37 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

46
firmware/drivers/fat.c
View file

@ -234,6 +234,7 @@ static int flush_fat(IF_MV_NONVOID(struct bpb* fat_bpb));
static int bpb_is_sane(IF_MV_NONVOID(struct bpb* fat_bpb)); static int bpb_is_sane(IF_MV_NONVOID(struct bpb* fat_bpb));
static void *cache_fat_sector(IF_MV2(struct bpb* fat_bpb,) long secnum, bool dirty); static void *cache_fat_sector(IF_MV2(struct bpb* fat_bpb,) long secnum, bool dirty);
static int create_dos_name(const unsigned char *name, unsigned char *newname); static int create_dos_name(const unsigned char *name, unsigned char *newname);
static void randomize_dos_name(unsigned char *name);
static unsigned long find_free_cluster(IF_MV2(struct bpb* fat_bpb,) unsigned long start); static unsigned long find_free_cluster(IF_MV2(struct bpb* fat_bpb,) unsigned long start);
static int transfer(IF_MV2(struct bpb* fat_bpb,) unsigned long start, long count, char* buf, bool write ); static int transfer(IF_MV2(struct bpb* fat_bpb,) unsigned long start, long count, char* buf, bool write );
@ -1335,7 +1336,7 @@ static int add_dir_entry(struct fat_dir* dir,
/* check that our intended shortname doesn't already exist */ /* check that our intended shortname doesn't already exist */
if (!strncmp(shortname, buf + i * DIR_ENTRY_SIZE, 12)) { if (!strncmp(shortname, buf + i * DIR_ENTRY_SIZE, 12)) {
/* filename exists already. make a new one */ /* filename exists already. make a new one */
snprintf(shortname+8, 4, "%03X", (unsigned)rand() & 0xfff); randomize_dos_name(shortname);
LDEBUGF("Duplicate shortname, changing to %s\n", LDEBUGF("Duplicate shortname, changing to %s\n",
shortname); shortname);
@ -1464,24 +1465,51 @@ unsigned char char2dos(unsigned char c)
static int create_dos_name(const unsigned char *name, unsigned char *newname) static int create_dos_name(const unsigned char *name, unsigned char *newname)
{ {
int i,j; int i;
unsigned char *ext;
/* Find extension part */
ext = strrchr(name, '.');
if (ext == name) /* handle .dotnames */
ext = NULL;
/* Name part */ /* Name part */
for (i=0, j=0; name[i] && (j < 8); i++) for (i = 0; *name && (!ext || name < ext) && (i < 8); name++)
{ {
unsigned char c = char2dos(name[i]); unsigned char c = char2dos(*name);
if (c) if (c)
newname[j++] = toupper(c); newname[i++] = toupper(c);
} }
while (j < 8)
newname[j++] = ' ';
/* Extension part */ /* Pad both name and extension */
snprintf(newname+8, 4, "%03X", (unsigned)rand() & 0xfff); while (i < 11)
newname[i++] = ' ';
if (ext)
{ /* Extension part */
ext++;
for (i = 8; *ext && (i < 11); ext++)
{
unsigned char c = char2dos(*ext);
if (c)
newname[i++] = toupper(c);
}
}
return 0; return 0;
} }
static void randomize_dos_name(unsigned char *name)
{
int i;
unsigned char buf[5];
snprintf(buf, sizeof buf, "%04x", (unsigned)rand() & 0xffff);
for (i = 0; (i < 4) && (name[i] != ' '); i++);
/* account for possible shortname length < 4 */
memcpy(&name[i], buf, 4);
}
static int update_short_entry( struct fat_file* file, long size, int attr ) static int update_short_entry( struct fat_file* file, long size, int attr )
{ {
unsigned char buf[SECTOR_SIZE]; unsigned char buf[SECTOR_SIZE];