diff options
| author | Kevin Walzer <kw@codebykevin.com> | 2019-03-04 12:59:38 (GMT) |
|---|---|---|
| committer | Kevin Walzer <kw@codebykevin.com> | 2019-03-04 12:59:38 (GMT) |
| commit | 22fb3b5d6727a92a056dd8575580ed8026441ca8 (patch) | |
| tree | 788f52244e4ca1e82557521a9ffb4fb81256d658 /macosx | |
| parent | 2724788ac903c2f20fc594f5e62376ecb6dd2fa2 (diff) | |
| download | tk-22fb3b5d6727a92a056dd8575580ed8026441ca8.zip tk-22fb3b5d6727a92a056dd8575580ed8026441ca8.tar.gz tk-22fb3b5d6727a92a056dd8575580ed8026441ca8.tar.bz2 | |
Minor cleanup
Diffstat (limited to 'macosx')
| -rw-r--r-- | macosx/tkMacOSXLaunch.c | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/macosx/tkMacOSXLaunch.c b/macosx/tkMacOSXLaunch.c index bc5d932..764ff18 100644 --- a/macosx/tkMacOSXLaunch.c +++ b/macosx/tkMacOSXLaunch.c @@ -105,22 +105,22 @@ int TkMacOSXGetDefaultApp(ClientData cd, Tcl_Interp *ip, int objc, Tcl_Obj *CONS }
/* Get url string, convert to CFStringRef. */
- CFStringRef url = CFStringCreateWithCString(NULL, Tcl_GetString(objv[1]),
+ CFStringRef url = CFStringCreateWithCString(NULL, Tcl_GetString(objv[1]),
kCFStringEncodingUTF8);
- /*Ensure arg is well-formed.*/
- NSString *testString = (NSString*) url;
- if ([testString rangeOfString:@"://"].location == NSNotFound) {
- NSLog(@"Error: please provide well-formed URL in url:// format.");
- return TCL_OK;
- }
+ /*Ensure arg is well-formed.*/
+ NSString *testString = (NSString*) url;
+ if ([testString rangeOfString:@"://"].location == NSNotFound) {
+ NSLog(@"Error: please provide well-formed URL in url:// format.");
+ return TCL_OK;
+ }
- /*Get default app for URL.*/
- CFURLRef defaultApp = CFURLCreateWithString(kCFAllocatorDefault, url, NULL);
- CFStringRef appURL = LSCopyDefaultApplicationURLForURL(defaultApp, kLSRolesAll, nil);
+ /*Get default app for URL.*/
+ CFURLRef defaultApp = CFURLCreateWithString(kCFAllocatorDefault, url, NULL);
+ CFStringRef appURL = LSCopyDefaultApplicationURLForURL(defaultApp, kLSRolesAll, nil);
/* Convert the URL reference into a string reference. */
- CFStringRef appPath = CFURLCopyFileSystemPath(appURL, kCFURLPOSIXPathStyle);
+ CFStringRef appPath = CFURLCopyFileSystemPath(appURL, kCFURLPOSIXPathStyle);
/* Get the system encoding method. */
@@ -153,21 +153,22 @@ int TkMacOSXSetDefaultApp(ClientData cd, Tcl_Interp *ip, int objc, Tcl_Obj *CONS kCFStringEncodingUTF8);
- /*Ensure arg is well-formed.*/
+ /*Ensure arg is well-formed.*/
NSString *testString = (NSString*) url;
- if ([testString rangeOfString:@"://"].location == NSNotFound) {
- NSLog(@"Error: please provide well-formed URL in url:// format.");
- return TCL_OK;
- }
-
- NSString *setURL = [(NSString*)url stringByReplacingOccurrencesOfString:@"://" withString:@""];
+ if ([testString rangeOfString:@"://"].location == NSNotFound) {
+ NSLog(@"Error: please provide well-formed URL in url:// format.");
+ return TCL_OK;
+ }
+
+ /*Strip colon and slashes because the API to set default handlers does not use them.*/
+ NSString *setURL = [(NSString*)url stringByReplacingOccurrencesOfString:@"://" withString:@""];
CFURLRef appURL = NULL;
CFBundleRef bundle = NULL;
CFStringRef apppath = CFStringCreateWithCString(NULL, Tcl_GetString(objv[2]), kCFStringEncodingUTF8);
- /* Convert filepath to URL, create bundle object, get bundle ID. */
+ /* Convert filepath to URL, create bundle object, get bundle ID. */
appURL = CFURLCreateWithFileSystemPath(kCFAllocatorDefault, apppath, kCFURLPOSIXPathStyle, false);
bundle = CFBundleCreate(NULL, appURL);
|