Imagelibrary/rt-thread
1
0
Fork 0
mirror of https://github.com/RT-Thread/rt-thread.git synced 2025-12-29 10:30:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4991 from mysterywolf/libc_dirent.h

Browse Source 
[rtlibc] remove libc_dirent.h
This commit is contained in:
Bernard Xiong
2021-09-02 09:55:16 +08:00
committed by GitHub
parent c68917175a dd9db58a86
commit ee2881fe7e
5 changed files with 23 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
components/dfs/include/dfs.h
View File

@@ -15,17 +15,20 @@
#include <stdint.h>
#include <stdlib.h>
#include <string.h>
#include <time.h>
#include <rtthread.h>
#include <dirent.h>
#include <sys/time.h>
#include <rtdevice.h>
#ifdef __cplusplus
extern "C" {
#endif
#ifndef DFS_FILESYSTEMS_MAX
#define DFS_FILESYSTEMS_MAX 2
#define DFS_FILESYSTEMS_MAX 4
#endif
#ifndef DFS_FD_MAX
#define DFS_FD_MAX 4
#define DFS_FD_MAX 16
#endif
/*
@@ -36,7 +39,7 @@
#endif
#ifndef DFS_PATH_MAX
#define DFS_PATH_MAX 256
#define DFS_PATH_MAX DIRENT_NAME_MAX
#endif
#ifndef SECTOR_SIZE
@@ -63,10 +66,6 @@
#define DFS_F_EOF 0x04000000
#define DFS_F_ERR 0x08000000
#ifdef __cplusplus
extern "C" {
#endif
struct statfs
{
size_t f_bsize; /* block size */
@@ -74,14 +73,6 @@ struct statfs
size_t f_bfree; /* free blocks in file system */
};
struct dirent
{
uint8_t d_type; /* The type of the file */
uint8_t d_namlen; /* The length of the not including the terminating null file name */
uint16_t d_reclen; /* length of this record */
char d_name[DFS_PATH_MAX]; /* The null-terminated file name */
};
struct dfs_fdtable
{
uint32_t maxfd;

8
components/dfs/include/dfs_posix.h
View File

@@ -21,14 +21,6 @@
extern "C" {
#endif
typedef struct
{
int fd; /* directory file */
char buf[512];
int num;
int cur;
} DIR;
/* directory api*/
int mkdir(const char *path, mode_t mode);
DIR *opendir(const char *name);

23
components/libc/compilers/common/dirent.h
View File

@@ -6,10 +6,14 @@
* Change Logs:
* Date Author Notes
*/
#ifndef __RTT_DIRENT_H__
#define __RTT_DIRENT_H__
#ifndef __DIRENT_H__
#define __DIRENT_H__
#include <rtthread.h>
#include <rtdef.h>
#ifdef __cplusplus
extern "C" {
#endif
/*
* dirent.h - format of directory entries
@@ -26,27 +30,28 @@
#define DT_REG 0x01
#define DT_DIR 0x02
#ifdef __cplusplus
extern "C" {
#endif
#ifndef HAVE_DIR_STRUCTURE
#define HAVE_DIR_STRUCTURE
typedef struct
{
int fd; /* directory file */
char buf[512];
int num;
int cur;
} DIR;
}DIR;
#endif
#ifndef HAVE_DIRENT_STRUCTURE
#define HAVE_DIRENT_STRUCTURE
#define DIRENT_NAME_MAX 256
struct dirent
{
rt_uint8_t d_type; /* The type of the file */
rt_uint8_t d_namlen; /* The length of the not including the terminating null file name */
rt_uint16_t d_reclen; /* length of this record */
char d_name[256]; /* The null-terminated file name */
char d_name[DIRENT_NAME_MAX]; /* The null-terminated file name */
};
#endif