gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-22 16:33:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

New SSL bundle tidyups

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@11640 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-Macdonald 2001-12-06 11:59:29 +00:00
parent 135fac0c74
commit b21d3845de
3 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,4 +1,10 @@
Mon Dec 3 16:32:31 2001 Adam Fedor <fedor@yogi.doc.com>
2001-12-06 Richard Frith-Macdonald <rfm@gnu.org>
* Source/GNUmakefile: Add library dependencies for SSL bundle ...
it needs libobjc and libgnustep-base to be linked.
* Source/NSFileHandle.m: Only try to load SSL bundle if asked for.
Mon Dec 5 16:32:31 2001 Adam Fedor <fedor@yogi.doc.com>
* Source/GSHTTPURLHandle.m: Include sys/fcntl.h for O_WRONLY, etc
(on Solaris).

2
Source/GNUmakefile
View file

@ -51,7 +51,7 @@ SSL_OBJC_FILES = GSUnixSSLHandle.m
# The principal class in the bundle
SSL_PRINCIPAL_CLASS = GSUnixSSLHandle
SSL_BUNDLE_LIBS = $(SSLLIBS)
SSL_BUNDLE_LIBS = -lgnustep-base -lobjc $(SSLLIBS)
endif

23
Source/NSFileHandle.m
View file

@ -50,17 +50,6 @@ static Class NSFileHandle_ssl_class = nil;
NSFileHandle_concrete_class = [WindowsFileHandle class];
#else
NSFileHandle_concrete_class = [UnixFileHandle class];
{
NSBundle *bundle;
NSString *path;
path = [NSSearchPathForDirectoriesInDomains(NSLibraryDirectory,
NSSystemDomainMask, NO) lastObject];
path = [path stringByAppendingPathComponent: @"Bundles"];
path = [path stringByAppendingPathComponent: @"SSL.bundle"];
bundle = [NSBundle bundleWithPath: path];
NSFileHandle_ssl_class = [bundle principalClass];
}
#endif
}
}
@ -354,6 +343,18 @@ NSString* NSFileHandleOperationException =
+ (Class) sslClass
{
if (NSFileHandle_ssl_class == 0)
{
NSBundle *bundle;
NSString *path;
path = [NSSearchPathForDirectoriesInDomains(NSLibraryDirectory,
NSSystemDomainMask, NO) lastObject];
path = [path stringByAppendingPathComponent: @"Bundles"];
path = [path stringByAppendingPathComponent: @"SSL.bundle"];
bundle = [NSBundle bundleWithPath: path];
NSFileHandle_ssl_class = [bundle principalClass];
}
return NSFileHandle_ssl_class;
}