[Gnustep-cvs] r37932 - /libs/base/trunk/Source/GSTLS.m

[rfm]

Author: rfm
Date: Sat May 31 17:02:47 2014
New Revision: 37932

URL: http://svn.gna.org/viewcvs/gnustep?rev=37932&view=rev
Log:
record/use absolute paths

Modified:
    libs/base/trunk/Source/GSTLS.m

Modified: libs/base/trunk/Source/GSTLS.m
URL: 
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Source/GSTLS.m?rev=37932&r1=37931&r2=37932&view=diff
==============================================================================
--- libs/base/trunk/Source/GSTLS.m      (original)
+++ libs/base/trunk/Source/GSTLS.m      Sat May 31 17:02:47 2014
@@ -28,6 +28,7 @@
 #import "Foundation/NSData.h"
 #import "Foundation/NSDictionary.h"
 #import "Foundation/NSEnumerator.h"
+#import "Foundation/NSFileManager.h"
 #import "Foundation/NSHost.h"
 #import "Foundation/NSException.h"
 #import "Foundation/NSLock.h"
@@ -53,6 +54,16 @@
 NSString * const GSTLSRevokeFile = @"GSTLSRevokeFile";
 NSString * const GSTLSVerify = @"GSTLSVerify";
 
+static NSString *
+standardizedPath(NSString *path)
+{
+  if (NO == [path isAbsolutePath])
+    {
+      path = [[[NSFileManager defaultManager] currentDirectoryPath]
+        stringByAppendingPathComponent: path];
+    }
+  return [path stringByStandardizingPath];
+}
 
 #if     defined(HAVE_GNUTLS)
 
@@ -177,7 +188,7 @@
   str = [[NSUserDefaults standardUserDefaults] stringForKey: GSTLSCAFile];
   if (nil != str)
     {
-      str = [str stringByStandardizingPath];
+      str = standardizedPath(str);
       ASSIGN(caFile, str);
     }
 
@@ -187,7 +198,7 @@
   str = [[NSUserDefaults standardUserDefaults] stringForKey: GSTLSRevokeFile];
   if (nil != str)
     {
-      str = [str stringByStandardizingPath];
+      str = standardizedPath(str);
       ASSIGN(revokeFile, str);
     }
 
@@ -268,7 +279,7 @@
             }
           else
             {
-              str = [str stringByStandardizingPath];
+              str = standardizedPath(str);
             }
           ASSIGN(caFile, str);
 
@@ -285,7 +296,7 @@
             }
           else
             {
-              str = [str stringByStandardizingPath];
+              str = standardizedPath(str);
             }
           ASSIGN(revokeFile, str);
 
@@ -471,7 +482,7 @@
     {
       return nil;
     }
-  f = [f stringByStandardizingPath];
+  f = standardizedPath(f);
   [paramsLock lock];
   p = [[paramsCache objectForKey: f] retain];
   [paramsLock unlock];
@@ -658,7 +669,7 @@
     {
       return nil;
     }
-  f = [f stringByStandardizingPath];
+  f = standardizedPath(f);
   [certificateListLock lock];
   l = [[certificateListCache objectForKey: f] retain];
   [certificateListLock unlock];
@@ -845,7 +856,7 @@
     {
       return nil;
     }
-  f = [f stringByStandardizingPath];
+  f = standardizedPath(f);
   [privateKeyLock lock];
   if (nil == p)
     {
@@ -1009,12 +1020,12 @@
    * information (file names and password) used to build them.
    */
   k = [NSMutableString stringWithCapacity: 1024];
-  ca = [ca stringByStandardizingPath];
+  ca = standardizedPath(ca);
   if (nil != ca) [k appendString: ca];
   [k appendString: @":"];
   if (nil != dca) [k appendString: dca];
   [k appendString: @":"];
-  rv = [rv stringByStandardizingPath];
+  rv = standardizedPath(rv);
   if (nil != rv) [k appendString: rv];
   [k appendString: @":"];
   if (nil != drv) [k appendString: drv];


_______________________________________________
Gnustep-cvs mailing list
Gnustep-cvs@gna.org
https://mail.gna.org/listinfo/gnustep-cvs