Changeset 1258

Timestamp:

01/31/10 18:42:24 (7 months ago)

Author:

astrange

Message:

Cleanup install/remove methods.

- Remove malloc and copy of a constant string.
- Use NSFileManager instead of stat().
- Properly unset some variables.

Files:

• trunk/CPFPerianPrefPaneController.m (modified) (8 diffs)

trunk/CPFPerianPrefPaneController.m

@@ -21 +21 @@
 #import "CPFPerianPrefPaneController.h"
 #import "UpdateCheckerAppDelegate.h"
-#include <sys/stat.h>
 
 #define AC3DynamicRangeKey CFSTR("dynamicRange")
@@ -455 +454 @@
 #pragma mark Install/Uninstall
 
-/* Shamelessly ripped from Sparkle */
+/* Shamelessly ripped from Sparkle (and now different) */
 - (BOOL)_extractArchivePath:archivePath toDestination:(NSString *)destination finalPath:(NSString *)finalPath
 {
-        BOOL ret = NO, oldExist = NO;
-        struct stat sb;
-        
-        if(stat([finalPath fileSystemRepresentation], &sb) == 0)
-                oldExist = YES;
-        
-        char *buf = NULL;
+        BOOL ret = NO, oldExist;
+        NSFileManager *defaultFileManager = [NSFileManager defaultManager];
+        char *cmd;
+        
+        oldExist = [defaultFileManager fileExistsAtPath:finalPath];
+        
         if(oldExist)
-                asprintf(&buf,
-                                 "mv -f \"$DST_COMPONENT\" \"$TMP_PATH\" && "
-                                 "ditto -x -k --rsrc \"$SRC_ARCHIVE\" \"$DST_PATH\" && "
-                                 "rm -rf \"$TMP_PATH\"");
-        else
-                asprintf(&buf,
-                                 "mkdir -p \"$DST_PATH\" && "
-                                 "ditto -x -k --rsrc \"$SRC_ARCHIVE\" \"$DST_PATH\"");
-        if(!buf)
-        {
-                [errorString appendFormat:NSLocalizedString(@"Could not allocate memory for extraction command\n", @"")];
-                return FALSE;
-        }
+                cmd = "mv -f \"$DST_COMPONENT\" \"$TMP_PATH\" && "
+                "ditto -x -k --rsrc \"$SRC_ARCHIVE\" \"$DST_PATH\" && "
+                "rm -rf \"$TMP_PATH\"";
+        else
+                cmd = "mkdir -p \"$DST_PATH\" && "
+                "ditto -x -k --rsrc \"$SRC_ARCHIVE\" \"$DST_PATH\"";
         
         setenv("SRC_ARCHIVE", [archivePath fileSystemRepresentation], 1);
@@ -484 +475 @@
         setenv("DST_COMPONENT", [finalPath fileSystemRepresentation], 1);
         setenv("TMP_PATH", [[finalPath stringByAppendingPathExtension:@"old"] fileSystemRepresentation], 1);
-
-        int status = system(buf);
+        
+        int status = system(cmd);
         if(WIFEXITED(status) && WEXITSTATUS(status) == 0)
                 ret = YES;
         else
                 [errorString appendFormat:NSLocalizedString(@"Extraction for %@ failed\n", @""), archivePath];
-
-        free(buf);
+        
         unsetenv("SRC_ARCHIVE");
-        unsetenv("$DST_COMPONENT");
+        unsetenv("DST_COMPONENT");
         unsetenv("TMP_PATH");
         unsetenv("DST_PATH");
@@ -501 +491 @@
 - (BOOL)_authenticatedExtractArchivePath:(NSString *)archivePath toDestination:(NSString *)destination finalPath:(NSString *)finalPath
 {
-        BOOL ret = NO, oldExist = NO;
-        struct stat sb;
-        if(stat([finalPath fileSystemRepresentation], &sb) == 0)
-                oldExist = YES;
-        
-        char *buf = NULL;
+        BOOL ret = NO, oldExist;
+        NSFileManager *defaultFileManager = [NSFileManager defaultManager];
+        char *cmd;
+        
+        oldExist = [defaultFileManager fileExistsAtPath:finalPath];
+        
         if(oldExist)
-                asprintf(&buf,
-                                 "mv -f \"$DST_COMPONENT\" \"$TMP_PATH\" && "
-                                 "ditto -x -k --rsrc \"$SRC_ARCHIVE\" \"$DST_PATH\" && "
-                                 "rm -rf \"$TMP_PATH\" && "
-                                 "chown -R root:admin \"$DST_COMPONENT\"");
-        else
-                asprintf(&buf,
-                                 "mkdir -p \"$DST_PATH\" && "
-                                 "ditto -x -k --rsrc \"$SRC_ARCHIVE\" \"$DST_PATH\" && "
-                                 "chown -R root:admin \"$DST_COMPONENT\"");
-        if(!buf)
-        {
-                [errorString appendFormat:NSLocalizedString(@"Could not allocate memory for extraction command\n", @"")];
-                return FALSE;
-        }
+                cmd = "mv -f \"$DST_COMPONENT\" \"$TMP_PATH\" && "
+                "ditto -x -k --rsrc \"$SRC_ARCHIVE\" \"$DST_PATH\" && "
+                "rm -rf \"$TMP_PATH\" && "
+                "chown -R root:admin \"$DST_COMPONENT\"";
+        else
+                cmd = "mkdir -p \"$DST_PATH\" && "
+                "ditto -x -k --rsrc \"$SRC_ARCHIVE\" \"$DST_PATH\" && "
+                "chown -R root:admin \"$DST_COMPONENT\"";
         
         setenv("SRC_ARCHIVE", [archivePath fileSystemRepresentation], 1);
@@ -529 +512 @@
         setenv("DST_PATH", [destination fileSystemRepresentation], 1);
         
-        char* arguments[] = { "-c", buf, NULL };
+        char* const arguments[] = { "-c", cmd, NULL };
         if(AuthorizationExecuteWithPrivileges(auth, "/bin/sh", kAuthorizationFlagDefaults, arguments, NULL) == errAuthorizationSuccess)
         {
@@ -542 +525 @@
                 [errorString appendFormat:NSLocalizedString(@"Authentication failed for extraction for %@\n", @""), archivePath];
         
-        free(buf);
         unsetenv("SRC_ARCHIVE");
-        unsetenv("$DST_COMPONENT");
+        unsetenv("DST_COMPONENT");
         unsetenv("TMP_PATH");
         unsetenv("DST_PATH");
@@ -553 +535 @@
 {
         BOOL ret = NO;
-        struct stat sb;
-        if(stat([componentPath fileSystemRepresentation], &sb) != 0)
-                /* No error, just forget it */
+        NSFileManager *defaultFileManager = [NSFileManager defaultManager];
+        
+        if(![defaultFileManager fileExistsAtPath:componentPath])
+        /* No error, just forget it */
                 return FALSE;
         
-        char *buf = NULL;
-        asprintf(&buf,
-                         "rm -rf \"$COMP_PATH\"");
-        if(!buf)
-        {
-                [errorString appendFormat:NSLocalizedString(@"Could not allocate memory for removal command\n", @"")];
-                return FALSE;
-        }
+        char *cmd = "rm -rf \"$COMP_PATH\"";
         
         setenv("COMP_PATH", [componentPath fileSystemRepresentation], 1);
         
-        char* arguments[] = { "-c", buf, NULL };
+        char* const arguments[] = { "-c", cmd, NULL };
         if(AuthorizationExecuteWithPrivileges(auth, "/bin/sh", kAuthorizationFlagDefaults, arguments, NULL) == errAuthorizationSuccess)
         {
@@ -581 +557 @@
         else
                 [errorString appendFormat:NSLocalizedString(@"Authentication failed for removal for %@\n", @""), componentPath];
-        free(buf);
+        
         unsetenv("COMP_PATH");
         return ret;
 }
-
 
 - (BOOL)installArchive:(NSString *)archivePath forPiece:(NSString *)component type:(ComponentType)type withMyVersion:(NSString *)myVersion