diff options
Diffstat (limited to 'base/java-tools/src/com/netscape/cmstools/key/KeyFindCLI.java')
-rw-r--r-- | base/java-tools/src/com/netscape/cmstools/key/KeyFindCLI.java | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/base/java-tools/src/com/netscape/cmstools/key/KeyFindCLI.java b/base/java-tools/src/com/netscape/cmstools/key/KeyFindCLI.java index 43310aa1d..73bad6b58 100644 --- a/base/java-tools/src/com/netscape/cmstools/key/KeyFindCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/key/KeyFindCLI.java @@ -18,6 +18,7 @@ package com.netscape.cmstools.key; +import java.util.Arrays; import java.util.Collection; import org.apache.commons.cli.CommandLine; @@ -39,14 +40,15 @@ public class KeyFindCLI extends CLI { public KeyFindCLI(KeyCLI keyCLI) { super("find", "Find keys", keyCLI); this.keyCLI = keyCLI; + + createOptions(); } public void printHelp() { formatter.printHelp(getFullName() + " [OPTIONS...]", options); } - public void execute(String[] args) { - + public void createOptions() { Option option = new Option(null, "client", true, "Client ID"); option.setArgName("client ID"); options.addOption(option); @@ -70,6 +72,15 @@ public class KeyFindCLI extends CLI { option = new Option(null, "size", true, "Page size"); option.setArgName("size"); options.addOption(option); + } + + public void execute(String[] args) { + // Always check for "--help" prior to parsing + if (Arrays.asList(args).contains("--help")) { + // Display usage + printHelp(); + System.exit(0); + } CommandLine cmd = null; @@ -79,13 +90,15 @@ public class KeyFindCLI extends CLI { } catch (ParseException e) { System.err.println("Error: " + e.getMessage()); printHelp(); - System.exit(1); + System.exit(-1); } - if (cmd.hasOption("help")) { - // Display usage + String[] cmdArgs = cmd.getArgs(); + + if (cmdArgs.length != 0) { + System.err.println("Error: Too many arguments specified."); printHelp(); - System.exit(0); + System.exit(-1); } String clientKeyID = cmd.getOptionValue("client"); |