gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-30 15:20:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

filter service fixes

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@34752 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2012-02-14 18:31:28 +00:00
parent b71be91d36
commit b18a55a842
3 changed files with 151 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

51
Tools/make_services.m
View file

@ -50,7 +50,7 @@ static NSMutableDictionary *validateService(NSDictionary *service, NSString* pat
static NSString *appsName = @".GNUstepAppList";
static NSString *cacheName = @".GNUstepServices";
static int verbose = 0;
static int verbose = 1;
static NSMutableDictionary *serviceMap;
static NSMutableArray *filterList;
static NSMutableSet *filterSet;
@ -162,7 +162,6 @@ main(int argc, char** argv, char **env_c)
}
if ([[args objectAtIndex: index] isEqual: @"--test"])
{
verbose = YES;
while (++index < [args count])
{
NSString *file = [args objectAtIndex: index];
@ -1080,17 +1079,47 @@ validateService(NSDictionary *service, NSString *path, unsigned pos)
NSArray *ret;
BOOL notPresent = NO;
snd = [result objectForKey: @"NSSendTypes"];
ret = [result objectForKey: @"NSReturnTypes"];
str = [result objectForKey: @"NSInputMechanism"];
if (str != nil)
{
if ([str isEqualToString: @"NSUnixStdio"] == NO
&& [str isEqualToString: @"NSMapFile"] == NO
&& [str isEqualToString: @"NSIdentity"] == NO)
{
if (verbose > 0)
NSLog(@"NSServices entry %u bad input mechanism - %@", pos, path);
return nil;
}
if ([str isEqualToString: @"NSUnixStdio"] == YES
|| [str isEqualToString: @"NSMapFile"] == YES)
{
unsigned i = [snd count];
while (i-- > 0)
{
NSString *type;
str = [snd objectAtIndex: i];
/* For UNIX I/O or file mapping, the send type must be a
* filename ... which means it must either be the generic
* filenames pasteboard type, or one of the pasteboard
* types corresponding to names for a particular file type.
*/
if (NO == [str isEqual: @"NSFilenamesPboardType"]
&& NO == [str hasPrefix: @"NSTypedFilenamesPboardType:"])
{
if (verbose > 0)
{
NSLog(@"NSServices entry %u bad NSSendTypes "
@"(must be file names types) - %@",
pos, path);
}
}
}
}
else if ([str isEqualToString: @"NSIdentity"] == NO)
{
if (verbose > 0)
{
NSLog(@"NSServices entry %u bad input mechanism - %@",
pos, path);
}
return nil;
}
}
else if ([result objectForKey: @"NSPortName"] == nil)
{
@ -1099,8 +1128,6 @@ validateService(NSDictionary *service, NSString *path, unsigned pos)
return nil;
}
snd = [result objectForKey: @"NSSendTypes"];
ret = [result objectForKey: @"NSReturnTypes"];
if ([snd count] == 0 || [ret count] == 0)
{
if (verbose > 0)