averello/macvim-mirror
1
0
Fork 0
mirror of https://github.com/macvim-dev/macvim.git synced 2026-06-11 15:37:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix mvim:// not handling paths with spaces

Browse Source 
The file URI was being url decoded and then fed to NSURL.
A decoded URI doesn't conform to RFC 2396. NSURL wasn't happy with it.
We avoid decoding the url. The rest of queries (both fields and values)
are still decoded.
This commit is contained in:
Francisco Requena
2020-02-02 15:18:52 +01:00
parent edec8e7c47
commit 7686fe8b88
1 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/MacVim/MMAppController.m
+19 -8
View File
@@ -1744,19 +1744,30 @@ fsEventCallback(ConstFSEventStreamRef streamRef,
NSEnumerator *enumerator = [queries objectEnumerator];
NSString *param;
while ((param = [enumerator nextObject])) {
// query: <field>=<value>
NSArray *arr = [param componentsSeparatedByString:@"="];
if ([arr count] == 2) {
// parse field
NSString *f = [arr objectAtIndex:0];
#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_11
[dict setValue:[[arr lastObject] stringByRemovingPercentEncoding]
forKey:[[arr objectAtIndex:0] stringByRemovingPercentEncoding]];
f = [f stringByRemovingPercentEncoding];
#else
[dict setValue:[[arr lastObject]
stringByReplacingPercentEscapesUsingEncoding:
NSUTF8StringEncoding]
forKey:[[arr objectAtIndex:0]
stringByReplacingPercentEscapesUsingEncoding:
NSUTF8StringEncoding]];
f = [f stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
#endif
// parse value
NSString *v = [arr objectAtIndex:1];
// do not decode url, since it's a file URI
BOOL decode = ![f isEqualToString:@"url"];
if (decode)
{
#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_11
v = [f stringByRemovingPercentEncoding];
#else
v = [f stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
#endif
}
}
}