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

Multivolume: prevent file rename attempts across volumes.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5535 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jens Arnold 2005-01-04 23:20:02 +00:00
parent 50dba1fad0
commit 93660701e6
1 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

17
firmware/drivers/fat.c
View file

@ -1835,36 +1835,41 @@ int fat_rename(struct fat_file* file,
struct fat_file newfile = *file; struct fat_file newfile = *file;
#ifdef HAVE_MULTIVOLUME #ifdef HAVE_MULTIVOLUME
struct bpb* fat_bpb = &fat_bpbs[file->volume]; struct bpb* fat_bpb = &fat_bpbs[file->volume];
if (file->volume != dir->file.volume) {
DEBUGF("No rename across volumes!\n");
return -1;
}
#endif #endif
if ( !file->dircluster ) { if ( !file->dircluster ) {
DEBUGF("File has no dir cluster!\n"); DEBUGF("File has no dir cluster!\n");
return -1; return -2;
} }
/* create a temporary file handle */ /* create a temporary file handle */
rc = fat_opendir(IF_MV2(file->volume,) &olddir, file->dircluster, NULL); rc = fat_opendir(IF_MV2(file->volume,) &olddir, file->dircluster, NULL);
if (rc < 0) if (rc < 0)
return rc * 10 - 2; return rc * 10 - 3;
/* create new name */ /* create new name */
rc = add_dir_entry(dir, &newfile, newname, false, false); rc = add_dir_entry(dir, &newfile, newname, false, false);
if (rc < 0) if (rc < 0)
return rc * 10 - 3; return rc * 10 - 4;
/* write size and cluster link */ /* write size and cluster link */
rc = update_short_entry(&newfile, size, attr); rc = update_short_entry(&newfile, size, attr);
if (rc < 0) if (rc < 0)
return rc * 10 - 4; return rc * 10 - 5;
/* remove old name */ /* remove old name */
rc = free_direntries(file); rc = free_direntries(file);
if (rc < 0) if (rc < 0)
return rc * 10 - 5; return rc * 10 - 6;
rc = flush_fat(IF_MV(fat_bpb)); rc = flush_fat(IF_MV(fat_bpb));
if (rc < 0) if (rc < 0)
return rc * 10 - 6; return rc * 10 - 7;
return 0; return 0;
} }