Skip to content
This repository has been archived by the owner on Jun 14, 2018. It is now read-only.

Fix issue16, proper handling of special charaters in file names #18

Merged
merged 5 commits into from
Dec 20, 2011
Merged

Fix issue16, proper handling of special charaters in file names #18

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f5b22a1
remove escaping code in brackets.fs.readdir. It will be moved to nati…
tvoliter Dec 20, 2011
10f5cb6
Added EscapeJSONString to escape chars for NSArrayToJSONString
tvoliter Dec 20, 2011
bc6f3c4
remove old escaping code in brackets.fs.readir
tvoliter Dec 20, 2011
252f202
Merge branch 'master' of github.com:adobe/brackets-app into fixIssue16
tvoliter Dec 20, 2011
0cf43a5
fixing typo in comments of EscapeJSONString function. Resubmitting a…
tvoliter Dec 20, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions bin/mac/Brackets.app/Contents/Resources/brackets_extensions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,16 +118,6 @@ if (!brackets.fs)
brackets.fs.readdir = function(path, callback) {
native function ReadDir();
var resultString = ReadDir(path);

// File paths can have special characters, so escape them before parsing to JSON
resultString = resultString.replace(/\r/g, "\\r")
.replace(/\n/g, "\\n")
.replace(/\&/g, "\\&")
.replace(/\'/g, "\\'")
.replace(/\t/g, "\\t")
//.replace(/\b/g, "\\b") \\ TODO: leaving this in screws up Brackets launch. I don't know why
.replace(/\f/g, "\\f");

var result = JSON.parse(resultString || '[]');
callback(getLastError(), result);
};
Expand Down
10 changes: 0 additions & 10 deletions src/mac/Resources/brackets_extensions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,16 +118,6 @@ if (!brackets.fs)
brackets.fs.readdir = function(path, callback) {
native function ReadDir();
var resultString = ReadDir(path);

// File paths can have special characters, so escape them before parsing to JSON
resultString = resultString.replace(/\r/g, "\\r")
.replace(/\n/g, "\\n")
.replace(/\&/g, "\\&")
.replace(/\'/g, "\\'")
.replace(/\t/g, "\\t")
//.replace(/\b/g, "\\b") \\ TODO: leaving this in screws up Brackets launch. I don't know why
.replace(/\f/g, "\\f");

var result = JSON.parse(resultString || '[]');
callback(getLastError(), result);
};
Expand Down
36 changes: 33 additions & 3 deletions src/mac/cefclient/brackets_extensions.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,17 +380,47 @@ int ExecuteDeleteFileOrDirectory(const CefV8ValueList& arguments,

return ConvertNSErrorCode(error);
}

// Escapes characters that have special meaning in JSON
void EscapeJSONString(const std::string& str, std::string& result) {
result = "";

for(size_t pos = 0; pos != str.size(); ++pos) {
switch(str[pos]) {
case '\a': result.append("\\a"); break;
case '\b': result.append("\\b"); break;
case '\f': result.append("\\f"); break;
case '\n': result.append("\\n"); break;
case '\r': result.append("\\r"); break;
case '\t': result.append("\\t"); break;
case '\v': result.append("\\v"); break;
// Note: single quotes are OK for JSON
case '\"': result.append("\\\""); break; // double quote
case '\\': result.append("\\\\"); break; // backsplash
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typo: backsplash



default: result.append( 1, str[pos]); break;

}
}
}


void NSArrayToJSONString(NSArray* array, std::string& result)
{
{
int numItems = [array count];
std::string escapedStr = "";

result = "[";
std::string item;
for (int i = 0; i < numItems; i++)
{
result += "\"";
result += [[array objectAtIndex:i] UTF8String];
result += "\"";

item = [[array objectAtIndex:i] UTF8String];
EscapeJSONString(item, escapedStr);

result += escapedStr + "\"";

if (i < numItems - 1)
result += ", ";
Expand Down