Imported GNU Classpath 0.90
Imported GNU Classpath 0.90 * scripts/makemake.tcl: Set gnu/java/awt/peer/swing to ignore. * gnu/classpath/jdwp/VMFrame.java (SIZE): New constant. * java/lang/VMCompiler.java: Use gnu.java.security.hash.MD5. * java/lang/Math.java: New override file. * java/lang/Character.java: Merged from Classpath. (start, end): Now 'int's. (canonicalName): New field. (CANONICAL_NAME, NO_SPACES_NAME, CONSTANT_NAME): New constants. (UnicodeBlock): Added argument. (of): New overload. (forName): New method. Updated unicode blocks. (sets): Updated. * sources.am: Regenerated. * Makefile.in: Likewise. From-SVN: r111942
This commit is contained in:
parent
27079765d0
commit
8aa540d2f7
1367 changed files with 188789 additions and 22762 deletions
|
@ -1,5 +1,5 @@
|
|||
/* CRLFInputStream.java --
|
||||
Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
|
||||
Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
|
||||
|
||||
This file is part of GNU Classpath.
|
||||
|
||||
|
@ -39,7 +39,6 @@ exception statement from your version. */
|
|||
package gnu.java.net;
|
||||
|
||||
import java.io.BufferedInputStream;
|
||||
import java.io.FilterInputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
|
||||
|
@ -49,7 +48,7 @@ import java.io.InputStream;
|
|||
* @author Chris Burdess (dog@gnu.org)
|
||||
*/
|
||||
public class CRLFInputStream
|
||||
extends FilterInputStream
|
||||
extends InputStream
|
||||
{
|
||||
/**
|
||||
* The CR octet.
|
||||
|
@ -61,6 +60,11 @@ public class CRLFInputStream
|
|||
*/
|
||||
public static final int LF = 10;
|
||||
|
||||
/**
|
||||
* The underlying input stream.
|
||||
*/
|
||||
protected InputStream in;
|
||||
|
||||
private boolean doReset;
|
||||
|
||||
/**
|
||||
|
@ -69,7 +73,7 @@ public class CRLFInputStream
|
|||
*/
|
||||
public CRLFInputStream(InputStream in)
|
||||
{
|
||||
super(in.markSupported() ? in : new BufferedInputStream(in));
|
||||
this.in = in.markSupported() ? in : new BufferedInputStream(in);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -145,13 +149,14 @@ public class CRLFInputStream
|
|||
throws IOException
|
||||
{
|
||||
doReset = false;
|
||||
int lm1 = len - 1;
|
||||
for (int i = off; i < len; i++)
|
||||
int end = off + len;
|
||||
int em1 = end - 1;
|
||||
for (int i = off; i < end; i++)
|
||||
{
|
||||
if (b[i] == CR)
|
||||
{
|
||||
int d;
|
||||
if (i == lm1)
|
||||
if (i == em1)
|
||||
{
|
||||
d = in.read();
|
||||
doReset = true;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue