Security-58286.1.32.tar.gz

[apple/security.git] / OSX / utilities / src / SecFileLocations.c

diff --git a/OSX/utilities/src/SecFileLocations.c b/OSX/utilities/src/SecFileLocations.c
index 29ab3a3e1c0ee22e320c1669cf136955cba09f91..65ff60b462a571a009840bc80cc5cbad72ff22d2 100644 (file)
--- a/OSX/utilities/src/SecFileLocations.c
+++ b/OSX/utilities/src/SecFileLocations.c
@@ -39,6 +39,8 @@
 #include <utilities/SecCFWrappers.h>
 #include <utilities/SecCFRelease.h>
 #include <sys/stat.h>
+#include <sys/param.h>
+#include <sys/errno.h>
 #include <uuid/uuid.h>
 #include <copyfile.h>
 #include <syslog.h>
@@ -47,7 +49,7 @@
 
 static CFURLRef sCustomHomeURL = NULL;
 
-static CFURLRef SecCopyHomeURL(void)
+CFURLRef SecCopyHomeURL(void)
 {
     // This returns a CFURLRef so that it can be passed as the second parameter
     // to CFURLCreateCopyAppendingPathComponent
@@ -204,14 +206,14 @@ done:
 
 CFURLRef SecCopyURLForFileInUserCacheDirectory(CFStringRef fileName)
 {
-#if (TARGET_OS_MAC && !(TARGET_OS_EMBEDDED || TARGET_OS_IPHONE))
+#if TARGET_OS_OSX
     Boolean isDirectory = (fileName == NULL);
     CFURLRef resultURL = NULL;
     CFStringRef cacheDirStr = NULL;
     char strBuffer[PATH_MAX + 1];
     size_t result = confstr(_CS_DARWIN_USER_CACHE_DIR, strBuffer, sizeof(strBuffer));
     if (result == 0) {
-        syslog(LOG_CRIT, "SecOCSPCacheCopyPath: confstr on _CS_DARWIN_USER_CACHE_DIR failed");
+        syslog(LOG_CRIT, "SecCopyURLForFileInUserCacheDirectory: confstr on _CS_DARWIN_USER_CACHE_DIR failed: %d", errno);
         return resultURL;
     }
     cacheDirStr = CFStringCreateWithFormat(kCFAllocatorDefault, NULL, CFSTR("%s/%@"), strBuffer, fileName);
@@ -268,7 +270,7 @@ static void WithPathInDirectory(CFURLRef fileURL, void(^operation)(const char *u
 {
     /* Ownership of fileURL is taken by this function and so we release it. */
     if (fileURL) {
-        UInt8 buffer[MAXPATHLEN];
+        UInt8 buffer[PATH_MAX];
         CFURLGetFileSystemRepresentation(fileURL, false, buffer, sizeof(buffer));
 
         operation((const char*)buffer);
@@ -286,6 +288,11 @@ void WithPathInKeychainDirectory(CFStringRef fileName, void(^operation)(const ch
     WithPathInDirectory(SecCopyURLForFileInKeychainDirectory(fileName), operation);
 }
 
+void WithPathInUserCacheDirectory(CFStringRef fileName, void(^operation)(const char *utf8String))
+{
+    WithPathInDirectory(SecCopyURLForFileInUserCacheDirectory(fileName), operation);
+}
+
 void SetCustomHomeURL(CFURLRef url)
 {
     sCustomHomeURL = CFRetainSafe(url);