X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fcore%2Fgetopt.cpp;h=9040f5d43ec684ecd83d11113931051b4ab13876;hp=f88d4a92ac5a2c972eb0fba77cede64766d50126;hb=acafbe566fb6f6b5592a2ec3dec667ba7cd3e7e4;hpb=9be92503cda27dffd8c3219ec4cfadaee37b6369

diff --git a/source/core/getopt.cpp b/source/core/getopt.cpp
index f88d4a9..9040f5d 100644
--- a/source/core/getopt.cpp
+++ b/source/core/getopt.cpp
@@ -105,7 +105,7 @@ void GetOpt::operator()(unsigned argc, const char *const *argv)
 			else
 				args_raw.push_back(argv[i++]);
 		}
-		
+
 		for(; i<argc; ++i)
 			args_raw.push_back(argv[i]);
 
@@ -137,7 +137,8 @@ void GetOpt::operator()(unsigned argc, const char *const *argv)
 	}
 	catch(const usage_error &e)
 	{
-		throw usage_error(e.what(), "Usage: "+generate_usage(argv[0]));
+		if(!help)
+			throw usage_error(e.what(), "Usage: "+generate_usage(argv[0]));
 	}
 
 	if(help)
@@ -152,9 +153,9 @@ unsigned GetOpt::process_long(const char *const *argp)
 	// See if the argument contains an =
 	unsigned equals = 0;
 	for(; arg[equals] && arg[equals]!='='; ++equals) ;
-	
+
 	OptionImpl &opt = get_option(string(arg, equals));
-	
+
 	if(arg[equals])
 		// Process the part after the = as option argument
 		opt.process(arg+equals+1);
@@ -169,7 +170,7 @@ unsigned GetOpt::process_long(const char *const *argp)
 	}
 	else
 		opt.process();
-	
+
 	return 1;
 }
 
@@ -193,7 +194,7 @@ unsigned GetOpt::process_short(const char *const *argp)
 		{
 			if(!argp[1])
 				throw usage_error("-"+string(1, *arg)+" requires an argument");
-			
+
 			// Use the next argument as option argument
 			opt.process(argp[1]);
 			return 2;
@@ -309,7 +310,7 @@ string GetOpt::generate_help() const
 		for(ArgumentList::const_iterator i=args.begin(); i!=args.end(); ++i, ++j)
 			result += format("  %s%s%s\n", *j, string(maxw+2-j->size(), ' '), (*i)->get_help());
 	}
-	
+
 	return result;
 }