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

New function: rmdir(). Also some changes in the fat code, to track the parent directory in opendir(), to be able to delete directories

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4509 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Linus Nielsen Feltzing 2004-04-16 08:58:29 +00:00
parent b8beff39e9
commit bc9397d1fa
4 changed files with 54 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

44
firmware/common/dir.c
View file

@ -55,7 +55,7 @@ DIR* opendir(char* name)
return NULL;
}
if ( fat_opendir(&(opendirs[dd].fatdir), 0) < 0 ) {
if ( fat_opendir(&(opendirs[dd].fatdir), 0, NULL) < 0 ) {
DEBUGF("Failed opening root dir\n");
opendirs[dd].busy = false;
return NULL;
@ -75,8 +75,10 @@ DIR* opendir(char* name)
}
if ( (entry.attr & FAT_ATTR_DIRECTORY) &&
(!strcasecmp(part, entry.name)) ) {
opendirs[dd].parent_dir = opendirs[dd].fatdir;
if ( fat_opendir(&(opendirs[dd].fatdir),
entry.firstcluster) < 0 ) {
entry.firstcluster,
&(opendirs[dd].parent_dir)) < 0 ) {
DEBUGF("Failed opening dir '%s' (%d)\n",
part, entry.firstcluster);
opendirs[dd].busy = false;
@ -179,3 +181,41 @@ int mkdir(char *name, int mode)
return rc;
}
int rmdir(char* name)
{
int rc;
DIR* dir;
struct dirent* entry;
dir = opendir(name);
if (!dir)
{
errno = ENOENT; /* open error */
return -1;
}
/* check if the directory is empty */
while ((entry = readdir(dir)))
{
if (strcmp(entry->d_name, ".") &&
strcmp(entry->d_name, ".."))
{
DEBUGF("rmdir error: not empty\n");
errno = ENOTEMPTY;
closedir(dir);
return -2;
}
}
rc = fat_remove(&(dir->fatdir.file));
if ( rc < 0 ) {
DEBUGF("Failed removing dir: %d\n", rc);
errno = EIO;
rc = rc * 10 - 3;
}
closedir(dir);
return rc;
}