Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8172422: jarsigner needs to understand -?
authorweijun
Thu, 13 Apr 2017 08:15:19 +0800
changeset 44597 98f0c39ce3a8
parent 44596 93455b97e669
child 44599 942f3546b679
8172422: jarsigner needs to understand -? Reviewed-by: mullan
jdk/src/java.base/share/classes/sun/security/tools/keytool/Main.java file | annotate | diff | comparison | revisions
jdk/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Main.java file | annotate | diff | comparison | revisions 
--- a/jdk/src/java.base/share/classes/sun/security/tools/keytool/Main.java	Wed Apr 12 05:14:51 2017 +0000
+++ b/jdk/src/java.base/share/classes/sun/security/tools/keytool/Main.java	Thu Apr 13 08:15:19 2017 +0800
@@ -485,7 +485,9 @@
 
             if (c != null) {
                 command = c;
-            } else if (collator.compare(flags, "-help") == 0) {
+            } else if (collator.compare(flags, "-help") == 0 ||
+                    collator.compare(flags, "-h") == 0 ||
+                    collator.compare(flags, "-?") == 0) {
                 help = true;
             } else if (collator.compare(flags, "-conf") == 0) {
                 i++;
--- a/jdk/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Main.java	Wed Apr 12 05:14:51 2017 +0000
+++ b/jdk/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Main.java	Thu Apr 13 08:15:19 2017 +0800
@@ -444,6 +444,7 @@
             } else if (collator.compare(flags, "-strict") ==0) {
                 strict = true;
             } else if (collator.compare(flags, "-h") == 0 ||
+                        collator.compare(flags, "-?") == 0 ||
                         collator.compare(flags, "-help") == 0) {
                 fullusage();
             } else {
jdk-sandbox