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

RaaA: Move directory related stuff from filesystem-unix.c into rbpaths.c.

Browse source 
Part of this change is to align sdlapp builds to other application targets
in that the sim_* wrappers are not used anymore (except for sim_read/write).
Path mangling is now done in rbpaths.c as well.

Change-Id: I9726da73b50a83d9e1a1840288de16ec01ea029d
This commit is contained in:
Thomas Martitz 2014-02-11 15:27:23 +01:00
parent cbc57af0f3
commit 0f928f8785
10 changed files with 216 additions and 357 deletions
Download patch file Download diff file Expand all files Collapse all files

103
firmware/target/hosted/filesystem-unix.c
View file

@ -19,17 +19,8 @@
*
****************************************************************************/
#include <stdlib.h>
#include <sys/stat.h> /* stat() */
#include <stdio.h> /* snprintf */
#include <string.h> /* size_t */
#include <dirent.h>
#include <time.h> /* localtime() */
#include "system-target.h"
#include "dir-target.h"
#include "file.h"
#include "dir.h"
#include "rbpaths.h"
#include "mv.h" /* stat() */
long filesize(int fd)
@ -48,95 +39,3 @@ void fat_size(IF_MV(int volume,) unsigned long* size, unsigned long* free)
IF_MV((void) volume);
*size = *free = 0;
}
#undef opendir
#undef closedir
#undef mkdir
#undef readdir
/* need to wrap around DIR* because we need to save the parent's
* directory path in order to determine dirinfo */
struct __dir {
DIR *dir;
char *path;
};
DIR* _opendir(const char *name)
{
char *buf = malloc(sizeof(struct __dir) + strlen(name)+1);
if (!buf)
return NULL;
struct __dir *this = (struct __dir*)buf;
this->path = buf+sizeof(struct __dir);
/* definitely fits due to strlen() */
strcpy(this->path, name);
this->dir = opendir(name);
if (!this->dir)
{
free(buf);
return NULL;
}
return (DIR*)this;
}
int _mkdir(const char *name)
{
return mkdir(name, 0777);
}
int _closedir(DIR *dir)
{
struct __dir *this = (struct __dir*)dir;
int ret = closedir(this->dir);
free(this);
return ret;
}
struct dirent* _readdir(DIR* dir)
{
struct __dir *d = (struct __dir*)dir;
return readdir(d->dir);
}
struct dirinfo dir_get_info(DIR* _parent, struct dirent *dir)
{
struct __dir *parent = (struct __dir*)_parent;
struct stat s;
struct tm *tm = NULL;
struct dirinfo ret;
char path[MAX_PATH];
snprintf(path, sizeof(path), "%s/%s", parent->path, dir->d_name);
memset(&ret, 0, sizeof(ret));
if (!stat(path, &s))
{
if (S_ISDIR(s.st_mode))
{
ret.attribute = ATTR_DIRECTORY;
}
ret.size = s.st_size;
tm = localtime(&(s.st_mtime));
}
if (!lstat(path, &s) && S_ISLNK(s.st_mode))
{
ret.attribute |= ATTR_LINK;
}
if (tm)
{
ret.wrtdate = ((tm->tm_year - 80) << 9) |
((tm->tm_mon + 1) << 5) |
tm->tm_mday;
ret.wrttime = (tm->tm_hour << 11) |
(tm->tm_min << 5) |
(tm->tm_sec >> 1);
}
return ret;
}