--- a/jdk/src/share/classes/sun/security/tools/jarsigner/Main.java Thu Aug 01 15:28:57 2013 +0100
+++ b/jdk/src/share/classes/sun/security/tools/jarsigner/Main.java Fri Aug 02 08:59:37 2013 +0800
@@ -291,7 +291,8 @@
String flags = args[n];
String modifier = null;
- if (flags.charAt(0) == '-') {
+
+ if (flags.startsWith("-")) {
int pos = flags.indexOf(':');
if (pos > 0) {
modifier = flags.substring(pos+1);
@@ -299,7 +300,14 @@
}
}
- if (collator.compare(flags, "-keystore") == 0) {
+ if (!flags.startsWith("-")) {
+ if (jarfile == null) {
+ jarfile = flags;
+ } else {
+ alias = flags;
+ ckaliases.add(alias);
+ }
+ } else if (collator.compare(flags, "-keystore") == 0) {
if (++n == args.length) usageNoArg();
keystore = args[n];
} else if (collator.compare(flags, "-storepass") ==0) {
@@ -380,18 +388,9 @@
collator.compare(flags, "-help") == 0) {
fullusage();
} else {
- if (!flags.startsWith("-")) {
- if (jarfile == null) {
- jarfile = flags;
- } else {
- alias = flags;
- ckaliases.add(alias);
- }
- } else {
- System.err.println(
- rb.getString("Illegal.option.") + flags);
- usage();
- }
+ System.err.println(
+ rb.getString("Illegal.option.") + flags);
+ usage();
}
}