CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge Reduce IsDive memory usage (PR#2455)

Browse Source
This commit is contained in:
Richard Wackerbarth 2015-07-19 10:14:42 -05:00
commit c2760c3cac
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Marlin/cardreader.cpp
View File

@ -56,22 +56,21 @@ void CardReader::lsDive(const char *prepend, SdFile parent, const char * const m
// If the entry is a directory and the action is LS_SerialPrint // If the entry is a directory and the action is LS_SerialPrint
if (DIR_IS_SUBDIR(&p) && lsAction != LS_Count && lsAction != LS_GetFilename) { if (DIR_IS_SUBDIR(&p) && lsAction != LS_Count && lsAction != LS_GetFilename) {
// Allocate enough stack space for the full path to a folder, trailing slash, and nul
int len = strlen(prepend) + FILENAME_LENGTH + 1 + 1;
char path[len];
// Get the short name for the item, which we know is a folder // Get the short name for the item, which we know is a folder
char lfilename[FILENAME_LENGTH]; char lfilename[FILENAME_LENGTH];
createFilename(lfilename, p); createFilename(lfilename, p);
// Allocate enough stack space for the full path to a folder, trailing slash, and nul
boolean prepend_is_empty = (prepend[0] == '\0');
int len = (prepend_is_empty ? 1 : strlen(prepend)) + strlen(lfilename) + 1 + 1;
char path[len];
// Append the FOLDERNAME12/ to the passed string. // Append the FOLDERNAME12/ to the passed string.
// It contains the full path to the "parent" argument. // It contains the full path to the "parent" argument.
// We now have the full path to the item in this folder. // We now have the full path to the item in this folder.
path[0] = '\0'; strcpy(path, prepend_is_empty ? "/" : prepend); // root slash if prepend is empty
if (prepend[0] == '\0') strcat(path, "/"); // a root slash if prepend is empty strcat(path, lfilename); // FILENAME_LENGTH-1 characters maximum
strcat(path, prepend); strcat(path, "/"); // 1 character
strcat(path, lfilename);
strcat(path, "/");
// Serial.print(path); // Serial.print(path);