mirror of
https://github.com/espressif/esp-idf.git
synced 2024-10-05 20:47:46 -04:00
cbf207bfb8
Before newlib 3.3.0, <dirent.h> bundled in newlib did not include any
function declarations. Instead, the file included the platform-
specific <sys/dirent.h>. This inclusion was inside a C++ guard block.
ESP-IDF provided sys/dirent.h inside newlib component, and this file
contained all the necessary function and structure declarations.
Since da418955f5,
common function declarations have been added to <dirent.h> in newlib.
However, the inclusion of sys/dirent.h has been moved out of the C++
guard block. However we didn't notice this change and did not update
sys/dirent.h in ESP-IDF newlib component to and the now-required
C++ guards there.
This commit adds the missing C++ guards to the platform-specific
sys/dirent.h.
The declarations of common dirent.h functions are now present both in
<dirent.h> (provided by newlib) and in sys/dirent.h (provided by IDF).
We keep the declarations in sys/dirent.h for compatibility, since some
ESP-IDF files and applications may include <sys/dirent.h> directly,
rather than <dirent.h>.
Closes https://github.com/espressif/esp-idf/issues/7204
69 lines
1.9 KiB
C
69 lines
1.9 KiB
C
// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
#pragma once
|
|
|
|
#include <stddef.h>
|
|
#include <stdint.h>
|
|
|
|
/**
|
|
* This header file provides POSIX-compatible definitions of directory
|
|
* access data types. Starting with newlib 3.3, related functions are defined
|
|
* in 'dirent.h' bundled with newlib.
|
|
* See http://pubs.opengroup.org/onlinepubs/7908799/xsh/dirent.h.html
|
|
* for reference.
|
|
*/
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
/**
|
|
* @brief Opaque directory structure
|
|
*/
|
|
typedef struct {
|
|
uint16_t dd_vfs_idx; /*!< VFS index, not to be used by applications */
|
|
uint16_t dd_rsv; /*!< field reserved for future extension */
|
|
/* remaining fields are defined by VFS implementation */
|
|
} DIR;
|
|
|
|
/**
|
|
* @brief Directory entry structure
|
|
*/
|
|
struct dirent {
|
|
int d_ino; /*!< file number */
|
|
uint8_t d_type; /*!< not defined in POSIX, but present in BSD and Linux */
|
|
#define DT_UNKNOWN 0
|
|
#define DT_REG 1
|
|
#define DT_DIR 2
|
|
#if __BSD_VISIBLE
|
|
#define MAXNAMLEN 255
|
|
char d_name[MAXNAMLEN+1]; /*!< zero-terminated file name */
|
|
#else
|
|
char d_name[256];
|
|
#endif
|
|
};
|
|
|
|
DIR* opendir(const char* name);
|
|
struct dirent* readdir(DIR* pdir);
|
|
long telldir(DIR* pdir);
|
|
void seekdir(DIR* pdir, long loc);
|
|
void rewinddir(DIR* pdir);
|
|
int closedir(DIR* pdir);
|
|
int readdir_r(DIR* pdir, struct dirent* entry, struct dirent** out_dirent);
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|