Add java/io/Console class and java/lang/System.console() method

This patch implements java/io/Console and adds a console() method to
java/lang/System. The implementation is lame but it works reasonably well.

2012-01-07  Pekka Enberg  <penberg@kernel.org>

        * include/Makefile.am:
        Add java_io_VMConsole.h.

        * java/io/Console:
        Add Java 1.6 java/io/Console API.

        * java/lang/System.java:
        (console): Add Java 1.6 console() API.

        * vm/reference/java/io/VMConsole:
        Add new class.

        * native/jni/java-io/Makefile.am:
        Add java_io_VMConsole.c.

        * native/jni/java-io/java_io_VMConsole.c:
        Add native helpers for java/io/Console.

Signed-off-by: Pekka Enberg <penberg@kernel.org>

7 files changed, 291 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 16d14faca..575dc0b1e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2012-01-07  Pekka Enberg  <penberg@kernel.org>
+
+	* include/Makefile.am:
+	Add java_io_VMConsole.h.
+
+	* java/io/Console:
+	Add Java 1.6 java/io/Console API.
+
+	* java/lang/System.java:
+	(console): Add Java 1.6 console() API.
+
+	* vm/reference/java/io/VMConsole:
+	Add new class.
+
+	* native/jni/java-io/Makefile.am:
+	Add java_io_VMConsole.c.
+
+	* native/jni/java-io/java_io_VMConsole.c:
+	Add native helpers for java/io/Console.
+
 2012-01-05  Pekka Enberg  <penberg@kernel.org>
 
 	* java/io/IOError:
diff --git a/include/Makefile.am b/include/Makefile.am
index 1656c5c3f..37be91df4 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -144,6 +144,7 @@ gnu_java_nio_VMSelector.h \
 gnu_java_nio_charset_iconv_IconvEncoder.h \
 gnu_java_nio_charset_iconv_IconvDecoder.h \
 gnu_java_lang_management_VMOperatingSystemMXBeanImpl.h \
+java_io_VMConsole.h \
 java_io_VMFile.h \
 java_io_VMObjectInputStream.h \
 java_io_VMObjectStreamClass.h \
@@ -384,6 +385,8 @@ gnu_java_nio_VMSelector.h: $(top_srcdir)/vm/reference/gnu/java/nio/VMSelector.ja
 	$(JAVAH) -o $@ gnu.java.nio.VMSelector
 gnu_java_lang_management_VMOperatingSystemMXBeanImpl.h: $(top_srcdir)/vm/reference/gnu/java/lang/management/VMOperatingSystemMXBeanImpl.java
 	$(JAVAH) -o $@ gnu.java.lang.management.VMOperatingSystemMXBeanImpl
+java_io_VMConsole.h: $(top_srcdir)/vm/reference/java/io/VMConsole.java
+	$(JAVAH) -o $@ java.io.VMConsole
 java_io_VMFile.h: $(top_srcdir)/vm/reference/java/io/VMFile.java
 	$(JAVAH) -o $@ java.io.VMFile
 java_io_VMObjectInputStream.h: $(top_srcdir)/vm/reference/java/io/VMObjectInputStream.java
diff --git a/java/io/Console.java b/java/io/Console.java
new file mode 100644
index 000000000..5434b0267
--- /dev/null
+++ b/java/io/Console.java
@@ -0,0 +1,122 @@
+/* Console.java -- A character-based console device
+   Copyright (C) 2012  Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package java.io;
+
+/**
+ * @since 1.6
+ */
+public final class Console implements Flushable
+{
+  private static Console console = new Console();
+
+  public static Console console()
+  {
+    return console;
+  }
+
+  private Console()
+  {
+  }
+
+  public PrintWriter writer()
+  {
+    return new PrintWriter(new OutputStreamWriter(System.out));
+  }
+
+  public Reader reader()
+  {
+    return new InputStreamReader(System.in);
+  }
+
+  public Console format(String fmt, Object... args)
+  {
+    System.out.printf(fmt, args);
+
+    return this;
+  }
+
+  public Console printf(String fmt, Object... args)
+  {
+    return format(fmt, args);
+  }
+
+  public String readLine(String fmt, Object... args)
+  {
+    format(fmt, args);
+    return readLine();
+  }
+
+  public String readLine()
+  {
+    String result = null;
+    try
+      {
+        result = new BufferedReader(reader()).readLine();
+      }
+    catch (IOException e)
+      {
+        throw new IOError(e);
+      }
+    return result;
+  }
+
+  public char[] readPassword(String fmt, Object... args)
+  {
+    format(fmt, args);
+    return readPassword();
+  }
+
+  public char[] readPassword()
+  {
+    String s = VMConsole.readPassword(this);
+
+    System.out.println();
+
+    if (s == null)
+      {
+        return null;
+      }
+    return s.toCharArray();
+  }
+
+  public void flush() throws IOException
+  {
+    System.out.flush();
+  }
+}
diff --git a/java/lang/System.java b/java/lang/System.java
index 39d6da229..51b3259fa 100644
--- a/java/lang/System.java
+++ b/java/lang/System.java
@@ -1,5 +1,5 @@
 /* System.java -- useful methods to interface with the system
-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2012
    Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -45,6 +45,7 @@ import gnu.classpath.VMStackWalker;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintStream;
+import java.io.Console;
 import java.nio.channels.Channel;
 import java.nio.channels.spi.SelectorProvider;
 import java.util.AbstractCollection;
@@ -703,6 +704,14 @@ public final class System
     return SelectorProvider.provider().inheritedChannel();
   }
 
+  /*
+   * @since 1.6
+   */
+  public static Console console()
+  {
+    return Console.console();
+  }
+
   /**
    * This is a specialised <code>Collection</code>, providing
    * the necessary provisions for the collections used by the
diff --git a/native/jni/java-io/Makefile.am b/native/jni/java-io/Makefile.am
index 58bd973e2..80edb32fa 100644
--- a/native/jni/java-io/Makefile.am
+++ b/native/jni/java-io/Makefile.am
@@ -1,6 +1,7 @@
 nativeexeclib_LTLIBRARIES = libjavaio.la 
 
-libjavaio_la_SOURCES = 	java_io_VMFile.c \
+libjavaio_la_SOURCES = 	java_io_VMConsole.c \
+			java_io_VMFile.c \
 			java_io_VMObjectInputStream.c \
 			java_io_VMObjectStreamClass.c
 
diff --git a/native/jni/java-io/java_io_VMConsole.c b/native/jni/java-io/java_io_VMConsole.c
new file mode 100644
index 000000000..2883f5f73
--- /dev/null
+++ b/native/jni/java-io/java_io_VMConsole.c
@@ -0,0 +1,90 @@
+/* java_io_VMConsole.c - Native methods for java.io.Console class
+   Copyright (C) 2012 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+/* do not move; needed here because of some macro definitions */
+#include <config.h>
+
+#include <termios.h>
+#include <unistd.h>
+
+#include <jni.h>
+
+#include "java_io_VMConsole.h"
+
+/*************************************************************************/
+
+#define TERMIOS_ECHO_IFLAGS (IUCLC|IXON|IXOFF|IXANY)
+#define TERMIOS_ECHO_LFLAGS (ECHO|ECHOE|ECHOK|ECHONL|TOSTOP)
+
+/*
+ * Class:     java_io_VMConsole
+ * Method:    echo
+ * Signature: (Z)Z
+ */
+JNIEXPORT jstring JNICALL
+Java_java_io_VMConsole_readPassword (JNIEnv * env,
+				     jclass clazz
+				     __attribute__ ((__unused__)),
+				     jobject con)
+{
+  struct termios old, new;
+  jmethodID readLineID;
+  jstring result;
+
+  readLineID =
+    (*env)->GetMethodID (env, (*env)->GetObjectClass (env, con), "readLine",
+			 "()Ljava/lang/String;");
+  if (!readLineID)
+    {
+      return NULL;
+    }
+
+  tcgetattr (STDIN_FILENO, &old);
+
+  tcgetattr (STDIN_FILENO, &new);
+
+  new.c_iflag &= ~TERMIOS_ECHO_IFLAGS;
+  new.c_lflag &= ~TERMIOS_ECHO_LFLAGS;
+
+  tcsetattr (STDIN_FILENO, TCSANOW, &new);
+
+  result = (*env)->CallObjectMethod (env, con, readLineID);
+
+  tcsetattr (STDIN_FILENO, TCSANOW, &old);
+
+  return result;
+}
diff --git a/vm/reference/java/io/VMConsole.java b/vm/reference/java/io/VMConsole.java
new file mode 100644
index 000000000..69c9df952
--- /dev/null
+++ b/vm/reference/java/io/VMConsole.java
@@ -0,0 +1,44 @@
+/* VMConsole.java -- helper for java.io.Console
+   Copyright (C) 2012  Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package java.io;
+
+public final class VMConsole
+{
+  static native String readPassword(Console con);
+}