Ticket #21718: patch-main.c.diff

main.c

@@ -70 +70 @@
 
 OSErr LoadMenuBar(char *appName);
 
-static OSStatus FSMakePath(FSSpec file, char *path, long maxPathSize);
 static void RedFatalAlert(Str255 errorString, Str255 expStr);
 static short DoesFileExist(char *path);
 
@@ -233 +232 @@
     CFBundleRef appBundle;
     CFURLRef scriptFileURL;
     FSRef fileRef;
-    FSSpec fileSpec;
     char *path;
 
     //get CF URL for script
@@ -250 +248 @@
     //dispose of the CF variables
     CFRelease(scriptFileURL);
     CFRelease(fileName);
-    
-    //convert FSRef to FSSpec
-    if (FSGetCatalogInfo(&fileRef, kFSCatInfoNone, NULL, NULL, &fileSpec,
-                         NULL)) return NULL;
-        
+
     //create path string
     if (! (path = malloc(kMaxPathLength))) return NULL;
-    if (FSMakePath(fileSpec, path, kMaxPathLength)) return NULL;
+    if (FSRefMakePath(&fileRef, path, kMaxPathLength)) return NULL;
     if (! DoesFileExist(path)) return NULL;
     
     return path;
@@ -272 +266 @@
     CFBundleRef appBundle;
     CFURLRef openDocFileURL;
     FSRef fileRef;
-    FSSpec fileSpec;
     char *path;
     
     //get CF URL for openDoc
@@ -290 +283 @@
     CFRelease(openDocFileURL);
     CFRelease(fileName);
         
-    //convert FSRef to FSSpec
-    if (FSGetCatalogInfo(&fileRef, kFSCatInfoNone, NULL, NULL, &fileSpec,
-                         NULL)) return NULL;
-
     //create path string
     if (! (path = malloc(kMaxPathLength))) return NULL;
-    if (FSMakePath(fileSpec, path, kMaxPathLength)) return NULL;
+    if (FSRefMakePath(&fileRef, path, kMaxPathLength)) return NULL;
     if (! DoesFileExist(path)) return NULL;
     
     return path;
@@ -321 +310 @@
 
 #pragma mark -
 
-///////////////////////////////////////
-// Generate path string from FSSpec record
-///////////////////////////////////////
-static OSStatus FSMakePath(FSSpec file, char *path, long maxPathSize)
-{
-    OSErr err = noErr;
-    FSRef fileRef;
-
-    //create file reference from file spec
-    if (err = FSpMakeFSRef(&file, &fileRef)) return err;
-
-    // and then convert the FSRef to a path
-    return FSRefMakePath(&fileRef, path, maxPathSize);
-}
-
 ////////////////////////////////////////
 // Standard red error alert, then exit application
 ////////////////////////////////////////
 static void RedFatalAlert (Str255 errorString, Str255 expStr)
 {
-    StandardAlert(kAlertStopAlert, errorString,  expStr, NULL, NULL);
+//    StandardAlert(kAlertStopAlert, errorString,  expStr, NULL, NULL);
     ExitToShell();
 }
 
@@ -396 +370 @@
     short i;
     long count, actualSize;
         
-    FSSpec fileSpec;
+    FSRef fileRef;
     char path[kMaxPathLength];
     
     while (numArgs > 0) free(fileArgs[numArgs--]);
@@ -408 +382 @@
     err = AECountItems(&fileSpecList, &count); //Count number of files
                 
     for (i = 1; i <= count; i++) { //iteratively process each file
-        //get fsspec from apple event
-        if (! (err = AEGetNthPtr(&fileSpecList, i, typeFSS, &keyword, &type,
-                                 (Ptr)&fileSpec, sizeof(FSSpec), &actualSize)))
+        //get fsref from apple event
+        if (! (err = AEGetNthPtr(&fileSpecList, i, typeFSRef, &keyword, &type,
+                                 (Ptr)&fileRef, sizeof(FSRef), &actualSize)))
         {
             //get path from file spec
-            if ((err = FSMakePath(fileSpec, (unsigned char *)&path,
+            if ((err = FSRefMakePath(&fileRef, (unsigned char *)&path,
                                   kMaxPathLength))) return err;
                             
             if (numArgs == kMaxArgumentsToScript) break;