mirror of
https://github.com/wiiu-env/libfat.git
synced 2024-11-01 08:15:05 +01:00
Directory support updated for DKP r20
This commit is contained in:
parent
6ea9f6b6c0
commit
0dc13f35a1
@ -45,6 +45,7 @@
|
|||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
#include <sys/dir.h>
|
||||||
|
|
||||||
#include "fatdir.h"
|
#include "fatdir.h"
|
||||||
|
|
||||||
@ -431,9 +432,9 @@ int _FAT_mkdir_r (struct _reent *r, const char *path, int mode) {
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
dir_iter_t* _FAT_diropen_r(struct _reent *r, dir_iter_t *dirState, const char *path) {
|
DIR_ITER* _FAT_diropen_r(struct _reent *r, DIR_ITER *dirState, const char *path) {
|
||||||
DIR_ENTRY dirEntry;
|
DIR_ENTRY dirEntry;
|
||||||
DIR_STATE_STRUCT* state = (DIR_STATE_STRUCT*) dirState;
|
DIR_STATE_STRUCT* state = (DIR_STATE_STRUCT*) (dirState->dirStruct);
|
||||||
bool fileExists;
|
bool fileExists;
|
||||||
|
|
||||||
state->partition = _FAT_partition_getPartitionFromPath (path);
|
state->partition = _FAT_partition_getPartitionFromPath (path);
|
||||||
@ -474,11 +475,11 @@ dir_iter_t* _FAT_diropen_r(struct _reent *r, dir_iter_t *dirState, const char *p
|
|||||||
|
|
||||||
// We are now using this entry
|
// We are now using this entry
|
||||||
state->inUse = true;
|
state->inUse = true;
|
||||||
return (dir_iter_t*) state;
|
return (DIR_ITER*) state;
|
||||||
}
|
}
|
||||||
|
|
||||||
int _FAT_dirreset_r (struct _reent *r, dir_iter_t *dirState) {
|
int _FAT_dirreset_r (struct _reent *r, DIR_ITER *dirState) {
|
||||||
DIR_STATE_STRUCT* state = (DIR_STATE_STRUCT*) dirState;
|
DIR_STATE_STRUCT* state = (DIR_STATE_STRUCT*) (dirState->dirStruct);
|
||||||
|
|
||||||
// Make sure we are still using this entry
|
// Make sure we are still using this entry
|
||||||
if (!state->inUse) {
|
if (!state->inUse) {
|
||||||
@ -493,8 +494,8 @@ int _FAT_dirreset_r (struct _reent *r, dir_iter_t *dirState) {
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int _FAT_dirnext_r (struct _reent *r, dir_iter_t *dirState, char *filename, struct stat *filestat) {
|
int _FAT_dirnext_r (struct _reent *r, DIR_ITER *dirState, char *filename, struct stat *filestat) {
|
||||||
DIR_STATE_STRUCT* state = (DIR_STATE_STRUCT*) dirState;
|
DIR_STATE_STRUCT* state = (DIR_STATE_STRUCT*) (dirState->dirStruct);
|
||||||
|
|
||||||
// Make sure we are still using this entry
|
// Make sure we are still using this entry
|
||||||
if (!state->inUse) {
|
if (!state->inUse) {
|
||||||
@ -521,8 +522,8 @@ int _FAT_dirnext_r (struct _reent *r, dir_iter_t *dirState, char *filename, stru
|
|||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
int _FAT_dirclose_r (struct _reent *r, dir_iter_t *dirState) {
|
int _FAT_dirclose_r (struct _reent *r, DIR_ITER *dirState) {
|
||||||
DIR_STATE_STRUCT* state = (DIR_STATE_STRUCT*) dirState;
|
DIR_STATE_STRUCT* state = (DIR_STATE_STRUCT*) (dirState->dirStruct);
|
||||||
|
|
||||||
// We are no longer using this entry
|
// We are no longer using this entry
|
||||||
state->inUse = false;
|
state->inUse = false;
|
||||||
|
@ -68,10 +68,10 @@ extern int _FAT_mkdir_r (struct _reent *r, const char *path, int mode);
|
|||||||
/*
|
/*
|
||||||
Directory iterator functions
|
Directory iterator functions
|
||||||
*/
|
*/
|
||||||
extern dir_iter_t* _FAT_diropen_r(struct _reent *r, dir_iter_t *dirState, const char *path);
|
extern DIR_ITER* _FAT_diropen_r(struct _reent *r, DIR_ITER *dirState, const char *path);
|
||||||
extern int _FAT_dirreset_r (struct _reent *r, dir_iter_t *dirState);
|
extern int _FAT_dirreset_r (struct _reent *r, DIR_ITER *dirState);
|
||||||
extern int _FAT_dirnext_r (struct _reent *r, dir_iter_t *dirState, char *filename, struct stat *filestat);
|
extern int _FAT_dirnext_r (struct _reent *r, DIR_ITER *dirState, char *filename, struct stat *filestat);
|
||||||
extern int _FAT_dirclose_r (struct _reent *r, dir_iter_t *dirState);
|
extern int _FAT_dirclose_r (struct _reent *r, DIR_ITER *dirState);
|
||||||
|
|
||||||
|
|
||||||
#endif // _FATDIR_H
|
#endif // _FATDIR_H
|
||||||
|
Loading…
Reference in New Issue
Block a user