src/java.security.jgss/windows/classes/sun/security/krb5/internal/tools/Klist.java

rev 48074 : 8189102: All tools should support -?, -h and --help
Reviewed-by: kvn, jjg, weijun, alanb, rfield, ksrini

*** 1,7 ****
  /*
!  * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  /*
!  * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
*** 131,140 ****
--- 131,146 ----
       * Parses the command line arguments.
       */
      void processArgs(String[] args) {
          Character arg;
          for (int i = 0; i < args.length; i++) {
+             if (args[i].equals("-?") ||
+                 args[i].equals("-h") ||
+                 args[i].equals("--help")) {
+                 printHelp();
+                 System.exit(0);
+             }
              if ((args[i].length() >= 2) && (args[i].startsWith("-"))) {
                  arg = Character.valueOf(args[i].charAt(1));
                  switch (arg.charValue()) {
                  case 'c':
                      action = 'c';
*** 348,356 ****
          System.out.println("\t  -n \t   do not reverse-resolve addresses");
          System.out.println("   options for keytabs:");
          System.out.println("\t-t \t shows keytab entry timestamps");
          System.out.println("\t-K \t shows keytab entry key value");
          System.out.println("\t-e \t shows keytab entry key type");
-         System.out.println("\nUsage: java sun.security.krb5.tools.Klist " +
-                            "-help for help.");
      }
  }
--- 354,360 ----