equal
deleted
inserted
replaced
1 /* |
1 /* |
2 * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved. |
2 * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved. |
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 * |
4 * |
5 * This code is free software; you can redistribute it and/or modify it |
5 * This code is free software; you can redistribute it and/or modify it |
6 * under the terms of the GNU General Public License version 2 only, as |
6 * under the terms of the GNU General Public License version 2 only, as |
7 * published by the Free Software Foundation. Oracle designates this |
7 * published by the Free Software Foundation. Oracle designates this |
521 */ |
521 */ |
522 Command c = Command.getCommand(flags); |
522 Command c = Command.getCommand(flags); |
523 |
523 |
524 if (c != null) { |
524 if (c != null) { |
525 command = c; |
525 command = c; |
526 } else if (collator.compare(flags, "-help") == 0 || |
526 } else if (collator.compare(flags, "--help") == 0 || |
527 collator.compare(flags, "-h") == 0 || |
527 collator.compare(flags, "-h") == 0 || |
528 collator.compare(flags, "-?") == 0) { |
528 collator.compare(flags, "-?") == 0 || |
|
529 // -help: legacy. |
|
530 collator.compare(flags, "-help") == 0) { |
529 help = true; |
531 help = true; |
530 } else if (collator.compare(flags, "-conf") == 0) { |
532 } else if (collator.compare(flags, "-conf") == 0) { |
531 i++; |
533 i++; |
532 } else if (collator.compare(flags, "-nowarn") == 0) { |
534 } else if (collator.compare(flags, "-nowarn") == 0) { |
533 nowarn = true; |
535 nowarn = true; |
4607 if (c == KEYCLONE) break; |
4609 if (c == KEYCLONE) break; |
4608 System.err.printf(" %-20s%s\n", c, rb.getString(c.description)); |
4610 System.err.printf(" %-20s%s\n", c, rb.getString(c.description)); |
4609 } |
4611 } |
4610 System.err.println(); |
4612 System.err.println(); |
4611 System.err.println(rb.getString( |
4613 System.err.println(rb.getString( |
|
4614 "Use.keytool.help.for.all.available.commands")); |
|
4615 System.err.println(rb.getString( |
4612 "Use.keytool.command.name.help.for.usage.of.command.name")); |
4616 "Use.keytool.command.name.help.for.usage.of.command.name")); |
4613 } |
4617 } |
4614 } |
4618 } |
4615 |
4619 |
4616 private void tinyHelp() { |
4620 private void tinyHelp() { |