diff options
Diffstat (limited to 'base/java-tools/src/com/netscape/cmstools/logging/AuditShowCLI.java')
-rw-r--r-- | base/java-tools/src/com/netscape/cmstools/logging/AuditShowCLI.java | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/base/java-tools/src/com/netscape/cmstools/logging/AuditShowCLI.java b/base/java-tools/src/com/netscape/cmstools/logging/AuditShowCLI.java index f82510e42..34f708c72 100644 --- a/base/java-tools/src/com/netscape/cmstools/logging/AuditShowCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/logging/AuditShowCLI.java @@ -20,6 +20,7 @@ package com.netscape.cmstools.logging; import java.io.FileWriter; import java.io.PrintWriter; +import java.util.Arrays; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Option; @@ -38,17 +39,27 @@ public class AuditShowCLI extends CLI { public AuditShowCLI(AuditCLI auditCLI) { super("show", "Show audit configuration", auditCLI); this.auditCLI = auditCLI; + + createOptions(); } public void printHelp() { - formatter.printHelp(getFullName(), options); + formatter.printHelp(getFullName() + " [OPTIONS...]", options); } - public void execute(String[] args) throws Exception { - + public void createOptions() { Option option = new Option(null, "output", true, "Output file to store audit configuration."); option.setArgName("file"); options.addOption(option); + } + + public void execute(String[] args) throws Exception { + // Always check for "--help" prior to parsing + if (Arrays.asList(args).contains("--help")) { + // Display usage + printHelp(); + System.exit(0); + } CommandLine cmd = null; @@ -58,20 +69,15 @@ public class AuditShowCLI extends CLI { } catch (Exception e) { System.err.println("Error: " + e.getMessage()); printHelp(); - System.exit(1); - } - - if (cmd.hasOption("help")) { - // Display usage - printHelp(); - System.exit(0); + System.exit(-1); } String[] cmdArgs = cmd.getArgs(); if (cmdArgs.length != 0) { + System.err.println("Error: Too many arguments specified."); printHelp(); - System.exit(1); + System.exit(-1); } String output = cmd.getOptionValue("output"); |