mirror of https://github.com/noisymime/Arduino.git
Merge branch 'master' of https://github.com/Ivan-Perez/Arduino
This commit is contained in:
commit
727b0bbd85
|
@ -58,7 +58,7 @@ namespace SDLib {
|
||||||
#define MAX_COMPONENT_LEN 12 // What is max length?
|
#define MAX_COMPONENT_LEN 12 // What is max length?
|
||||||
#define PATH_COMPONENT_BUFFER_LEN MAX_COMPONENT_LEN+1
|
#define PATH_COMPONENT_BUFFER_LEN MAX_COMPONENT_LEN+1
|
||||||
|
|
||||||
bool getNextPathComponent(char *path, unsigned int *p_offset,
|
bool getNextPathComponent(const char *path, unsigned int *p_offset,
|
||||||
char *buffer) {
|
char *buffer) {
|
||||||
/*
|
/*
|
||||||
|
|
||||||
|
@ -117,9 +117,9 @@ bool getNextPathComponent(char *path, unsigned int *p_offset,
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
boolean walkPath(char *filepath, SdFile& parentDir,
|
boolean walkPath(const char *filepath, SdFile& parentDir,
|
||||||
boolean (*callback)(SdFile& parentDir,
|
boolean (*callback)(SdFile& parentDir,
|
||||||
char *filePathComponent,
|
const char *filePathComponent,
|
||||||
boolean isLastComponent,
|
boolean isLastComponent,
|
||||||
void *object),
|
void *object),
|
||||||
void *object = NULL) {
|
void *object = NULL) {
|
||||||
|
@ -232,7 +232,7 @@ boolean walkPath(char *filepath, SdFile& parentDir,
|
||||||
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
boolean callback_pathExists(SdFile& parentDir, char *filePathComponent,
|
boolean callback_pathExists(SdFile& parentDir, const char *filePathComponent,
|
||||||
boolean isLastComponent, void *object) {
|
boolean isLastComponent, void *object) {
|
||||||
/*
|
/*
|
||||||
|
|
||||||
|
@ -255,7 +255,7 @@ boolean callback_pathExists(SdFile& parentDir, char *filePathComponent,
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
boolean callback_makeDirPath(SdFile& parentDir, char *filePathComponent,
|
boolean callback_makeDirPath(SdFile& parentDir, const char *filePathComponent,
|
||||||
boolean isLastComponent, void *object) {
|
boolean isLastComponent, void *object) {
|
||||||
/*
|
/*
|
||||||
|
|
||||||
|
@ -310,7 +310,7 @@ boolean callback_openPath(SdFile& parentDir, char *filePathComponent,
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
boolean callback_remove(SdFile& parentDir, char *filePathComponent,
|
boolean callback_remove(SdFile& parentDir, const char *filePathComponent,
|
||||||
boolean isLastComponent, void *object) {
|
boolean isLastComponent, void *object) {
|
||||||
if (isLastComponent) {
|
if (isLastComponent) {
|
||||||
return SdFile::remove(parentDir, filePathComponent);
|
return SdFile::remove(parentDir, filePathComponent);
|
||||||
|
@ -318,7 +318,7 @@ boolean callback_remove(SdFile& parentDir, char *filePathComponent,
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
boolean callback_rmdir(SdFile& parentDir, char *filePathComponent,
|
boolean callback_rmdir(SdFile& parentDir, const char *filePathComponent,
|
||||||
boolean isLastComponent, void *object) {
|
boolean isLastComponent, void *object) {
|
||||||
if (isLastComponent) {
|
if (isLastComponent) {
|
||||||
SdFile f;
|
SdFile f;
|
||||||
|
@ -517,7 +517,7 @@ File SDClass::open(char *filepath, uint8_t mode) {
|
||||||
//}
|
//}
|
||||||
|
|
||||||
|
|
||||||
boolean SDClass::exists(char *filepath) {
|
boolean SDClass::exists(const char *filepath) {
|
||||||
/*
|
/*
|
||||||
|
|
||||||
Returns true if the supplied file path exists.
|
Returns true if the supplied file path exists.
|
||||||
|
@ -538,7 +538,7 @@ boolean SDClass::exists(char *filepath) {
|
||||||
//}
|
//}
|
||||||
|
|
||||||
|
|
||||||
boolean SDClass::mkdir(char *filepath) {
|
boolean SDClass::mkdir(const char *filepath) {
|
||||||
/*
|
/*
|
||||||
|
|
||||||
Makes a single directory or a heirarchy of directories.
|
Makes a single directory or a heirarchy of directories.
|
||||||
|
@ -549,7 +549,7 @@ boolean SDClass::mkdir(char *filepath) {
|
||||||
return walkPath(filepath, root, callback_makeDirPath);
|
return walkPath(filepath, root, callback_makeDirPath);
|
||||||
}
|
}
|
||||||
|
|
||||||
boolean SDClass::rmdir(char *filepath) {
|
boolean SDClass::rmdir(const char *filepath) {
|
||||||
/*
|
/*
|
||||||
|
|
||||||
Remove a single directory or a heirarchy of directories.
|
Remove a single directory or a heirarchy of directories.
|
||||||
|
@ -560,7 +560,7 @@ boolean SDClass::rmdir(char *filepath) {
|
||||||
return walkPath(filepath, root, callback_rmdir);
|
return walkPath(filepath, root, callback_rmdir);
|
||||||
}
|
}
|
||||||
|
|
||||||
boolean SDClass::remove(char *filepath) {
|
boolean SDClass::remove(const char *filepath) {
|
||||||
return walkPath(filepath, root, callback_remove);
|
return walkPath(filepath, root, callback_remove);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -76,19 +76,19 @@ public:
|
||||||
File open(const String &filename, uint8_t mode = FILE_READ) { return open( filename.c_str(), mode ); }
|
File open(const String &filename, uint8_t mode = FILE_READ) { return open( filename.c_str(), mode ); }
|
||||||
|
|
||||||
// Methods to determine if the requested file path exists.
|
// Methods to determine if the requested file path exists.
|
||||||
boolean exists(char *filepath);
|
boolean exists(const char *filepath);
|
||||||
boolean exists(const String &filepath) { return exists(filepath.c_str()); }
|
boolean exists(const String &filepath) { return exists(filepath.c_str()); }
|
||||||
|
|
||||||
// Create the requested directory heirarchy--if intermediate directories
|
// Create the requested directory heirarchy--if intermediate directories
|
||||||
// do not exist they will be created.
|
// do not exist they will be created.
|
||||||
boolean mkdir(char *filepath);
|
boolean mkdir(const char *filepath);
|
||||||
boolean mkdir(const String &filepath) { return mkdir(filepath.c_str()); }
|
boolean mkdir(const String &filepath) { return mkdir(filepath.c_str()); }
|
||||||
|
|
||||||
// Delete the file.
|
// Delete the file.
|
||||||
boolean remove(char *filepath);
|
boolean remove(const char *filepath);
|
||||||
boolean remove(const String &filepath) { return remove(filepath.c_str()); }
|
boolean remove(const String &filepath) { return remove(filepath.c_str()); }
|
||||||
|
|
||||||
boolean rmdir(char *filepath);
|
boolean rmdir(const char *filepath);
|
||||||
boolean rmdir(const String &filepath) { return rmdir(filepath.c_str()); }
|
boolean rmdir(const String &filepath) { return rmdir(filepath.c_str()); }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
@ -101,7 +101,7 @@ private:
|
||||||
int fileOpenMode;
|
int fileOpenMode;
|
||||||
|
|
||||||
friend class File;
|
friend class File;
|
||||||
friend boolean callback_openPath(SdFile&, char *, boolean, void *);
|
friend boolean callback_openPath(SdFile&, const char *, boolean, void *);
|
||||||
};
|
};
|
||||||
|
|
||||||
extern SDClass SD;
|
extern SDClass SD;
|
||||||
|
|
Loading…
Reference in New Issue