[kaffe] CVS kaffe (robilad): Resynced with gnu inetlib: base64
endcoding fix
Kaffe CVS
cvs-commits at kaffe.org
Sat Feb 19 08:21:45 PST 2005
PatchSet 5567
Date: 2005/02/19 16:14:15
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Resynced with gnu inetlib: base64 endcoding fix
2005-02-19 Dalibor Topic <robilad at kaffe.org>
Resynced with GNU inetlib.
2005-02-17 Chris Burdess <dog at gnu.org>
* BASE64.java: Truncate encodedbyte array.
Members:
ChangeLog:1.3611->1.3612
libraries/javalib/gnu/inet/util/BASE64.java:1.6->1.7
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3611 kaffe/ChangeLog:1.3612
--- kaffe/ChangeLog:1.3611 Sat Feb 19 16:10:18 2005
+++ kaffe/ChangeLog Sat Feb 19 16:14:15 2005
@@ -1,5 +1,13 @@
2005-02-19 Dalibor Topic <robilad at kaffe.org>
+ Resynced with GNU inetlib.
+
+ 2005-02-17 Chris Burdess <dog at gnu.org>
+
+ * BASE64.java: Truncate encodedbyte array.
+
+2005-02-19 Dalibor Topic <robilad at kaffe.org>
+
Resynced with GNU Classpath.
2005-02-16 Andrew Haley <aph at redhat.com>
Index: kaffe/libraries/javalib/gnu/inet/util/BASE64.java
diff -u kaffe/libraries/javalib/gnu/inet/util/BASE64.java:1.6 kaffe/libraries/javalib/gnu/inet/util/BASE64.java:1.7
--- kaffe/libraries/javalib/gnu/inet/util/BASE64.java:1.6 Sat Oct 30 12:14:18 2004
+++ kaffe/libraries/javalib/gnu/inet/util/BASE64.java Sat Feb 19 16:14:21 2005
@@ -1,5 +1,5 @@
/*
- * $Id: BASE64.java,v 1.6 2004/10/30 12:14:18 robilad Exp $
+ * $Id: BASE64.java,v 1.7 2005/02/19 16:14:21 robilad Exp $
* Copyright (C) 2003 The Free Software Foundation
*
* This file is part of GNU inetlib, a library.
@@ -42,7 +42,7 @@
* Encodes and decodes text according to the BASE64 encoding.
*
* @author <a href="mailto:dog at gnu.org">Chris Burdess</a>
- * @version $Revision: 1.6 $ $Date: 2004/10/30 12:14:18 $
+ * @version $Revision: 1.7 $ $Date: 2005/02/19 16:14:21 $
*/
public final class BASE64
{
@@ -111,6 +111,12 @@
bt[ti++] = src[(b2 << 2 & 0x3c) + (b3 >>> 6 & 0x3)];
bt[ti++] = src[b3 & 0x3f];
}
+ }
+ if (ti < bt.length)
+ {
+ byte[] tmp = new byte[ti];
+ System.arraycopy(bt, 0, tmp, 0, ti);
+ bt = tmp;
}
/*while (ti < bt.length)
{
More information about the kaffe
mailing list