diff options
| author | Tom Tromey <tromey@redhat.com> | 2002-03-25 22:08:27 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2002-03-25 22:08:27 +0000 |
| commit | f695acf69c0672e7b70075fb6f8c98119f332d9a (patch) | |
| tree | 869623da4ac682d82df3f56153d1aa3694858e91 /libjava/gnu/java/rmi | |
| parent | 355426abb3e43e662fc1144657f2c3038c9cf5f2 (diff) | |
| download | gcc-f695acf69c0672e7b70075fb6f8c98119f332d9a.zip gcc-f695acf69c0672e7b70075fb6f8c98119f332d9a.tar.gz gcc-f695acf69c0672e7b70075fb6f8c98119f332d9a.tar.bz2 | |
For PR libgcj/5303:
* gnu/java/rmi/registry/RegistryImpl.java (main): Recognize --help
and --version.
(help): New method.
(version): Likewise.
* gnu/gcj/convert/Convert.java (version): Removed extraneous
"GNU".
* gnu/java/rmi/rmic/RMIC.java (parseOptions): Removed extraneous
"GNU".
From-SVN: r51343
Diffstat (limited to 'libjava/gnu/java/rmi')
| -rw-r--r-- | libjava/gnu/java/rmi/registry/RegistryImpl.java | 28 | ||||
| -rw-r--r-- | libjava/gnu/java/rmi/rmic/RMIC.java | 2 |
2 files changed, 28 insertions, 2 deletions
diff --git a/libjava/gnu/java/rmi/registry/RegistryImpl.java b/libjava/gnu/java/rmi/registry/RegistryImpl.java index b38ee5c..fdf4506 100644 --- a/libjava/gnu/java/rmi/registry/RegistryImpl.java +++ b/libjava/gnu/java/rmi/registry/RegistryImpl.java @@ -1,5 +1,5 @@ /* - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. + Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -103,9 +103,35 @@ public String[] list() throws RemoteException, AccessException { return (strings); } +public static void version() { + System.out.println("rmiregistry (" + + System.getProperty("java.vm.name") + + ") " + + System.getProperty("java.vm.version")); + System.out.println("Copyright 2002 Free Software Foundation, Inc."); + System.out.println("This is free software; see the source for copying conditions. There is NO"); + System.out.println("warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."); + System.exit(0); +} + +public static void help() { + System.out.println( +"Usage: rmiregistry [OPTION | PORT]\n" + +"\n" + +" --help Print this help, then exit\n" + +" --version Print version number, then exit\n"); + System.exit(0); +} + public static void main(String[] args) { int port = Registry.REGISTRY_PORT; if (args.length > 0) { + if (args[0].equals("--version")) { + version(); + } + else if (args[0].equals("--help")) { + help(); + } try { port = Integer.parseInt(args[0]); } diff --git a/libjava/gnu/java/rmi/rmic/RMIC.java b/libjava/gnu/java/rmi/rmic/RMIC.java index f3ff128..ef44732 100644 --- a/libjava/gnu/java/rmi/rmic/RMIC.java +++ b/libjava/gnu/java/rmi/rmic/RMIC.java @@ -939,7 +939,7 @@ private void parseOptions() { usage(); } else if (arg.equals("-version")) { - System.out.println("rmic (GNU " + System.out.println("rmic (" + System.getProperty("java.vm.name") + ") " + System.getProperty("java.vm.version")); |