From 8d01261eb74533d85d478221ea998dcc92017c14 Mon Sep 17 00:00:00 2001 From: CaS Date: Fri, 29 Nov 2002 12:46:36 +0000 Subject: [PATCH] Return 1 on failure git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@15178 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 5 +++++ Tools/plparse.m | 6 ++++-- Tools/sfparse.m | 12 ++++++++---- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 49c41a02d..ef8b344a8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-11-29 Richard Frith-Macdonald + + * Tools/plparse.m: Stefan Urbaneks patch to return 1 on failure. + * Tools/sfparse.m: Similar code for this tool. + 2002-11-28 Richard Frith-Macdonald * Tools/AGSParser.m: Fix so we document static declarations made in diff --git a/Tools/plparse.m b/Tools/plparse.m index d856bcefe..b8c8b515f 100644 --- a/Tools/plparse.m +++ b/Tools/plparse.m @@ -36,6 +36,7 @@ main(int argc, char** argv, char **env) NSProcessInfo *proc; NSArray *args; unsigned i; + int retval = 0; #ifdef GS_PASS_ARGUMENTS [NSProcessInfo initializeWithArguments:argv count:argc environment:env]; @@ -46,7 +47,7 @@ main(int argc, char** argv, char **env) { NSLog(@"plparse: unable to get process information!\n"); [pool release]; - exit(0); + exit(1); } args = [proc arguments]; @@ -86,10 +87,11 @@ main(int argc, char** argv, char **env) { GSPrintf(stderr, @"Parsing '%@' - %@\n", file, [localException reason]); + retval = 1; } NS_ENDHANDLER } } [pool release]; - return 0; + return retval; } diff --git a/Tools/sfparse.m b/Tools/sfparse.m index 381d4976f..0c9071a4e 100644 --- a/Tools/sfparse.m +++ b/Tools/sfparse.m @@ -61,6 +61,7 @@ convert_unicode(NSArray *args) { GSPrintf(stderr, @"Converting '%@' - %@\n", file, [localException reason]); + return 1; } NS_ENDHANDLER } @@ -92,6 +93,7 @@ convert_utf8(NSArray *args) { GSPrintf(stderr, @"Converting '%@' - %@\n", file, [localException reason]); + return 1; } NS_ENDHANDLER } @@ -105,6 +107,7 @@ main(int argc, char** argv, char **env) NSProcessInfo *proc; NSArray *args; unsigned i; + int retval = 0; #ifdef GS_PASS_ARGUMENTS [NSProcessInfo initializeWithArguments:argv count:argc environment:env]; @@ -115,7 +118,7 @@ main(int argc, char** argv, char **env) { GSPrintf(stderr, @"defaults: unable to get process information!\n"); [pool release]; - exit(0); + exit(1); } args = [proc arguments]; @@ -129,11 +132,11 @@ main(int argc, char** argv, char **env) } else if ([[args objectAtIndex: 1] isEqual: @"--unicode"]) { - convert_unicode(args); + retval = convert_unicode(args); } else if ([[args objectAtIndex: 1] isEqual: @"--utf8"]) { - convert_utf8(args); + retval = convert_utf8(args); } else { @@ -160,10 +163,11 @@ main(int argc, char** argv, char **env) { GSPrintf(stderr, @"Parsing '%@' - %@\n", file, [localException reason]); + retval = 1; } NS_ENDHANDLER } } [pool release]; - return 0; + return retval; }