Handle new binary efile ABI

gburd · Aug 15, 2013 · 075ff45 · 075ff45
1 parent e4418ba
commit 075ff45
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/main/java/erjang/driver/IO.java b/src/main/java/erjang/driver/IO.java
@@ -206,9 +206,10 @@ public static void putstr(ByteBuffer buf, String err, boolean term) {
 
 	public static String getstr(ByteBuffer buf, boolean term) {
 		if (term) {
+                    /* TODO: charset! */
 			StringBuilder sb = new StringBuilder();
 			byte b;
-			while ((b=buf.get()) != 0) {
+			while (buf.hasRemaining() && (b=buf.get()) != 0) {
 				sb.append((char)(0xff & b));
 			}
 			return sb.toString();

diff --git a/src/main/java/erjang/driver/efile/EFile.java b/src/main/java/erjang/driver/efile/EFile.java
@@ -789,7 +789,7 @@ public void ready() throws Pausable {
 			}
 
 			ByteBuffer last = ev[ev.length - 1];
-			final String name = IO.getstr(last, false);
+			final String name = IO.getstr(last, true);
 
 			if (name.length() == 0) {
 				reply_posix_error(Posix.ENOENT);
@@ -801,7 +801,12 @@ public void ready() throws Pausable {
 				if (data == null) {
 					reply_posix_error(Posix.ENOENT);
 				} else {
+                                    if (isUnicodeDriverInterface()) {
+
+					task.output_from_driver(new EBinList(FILE_RESP_ALL_DATA_HEADER, data));
+                                    } else {
 					task.output_from_driver(new EBinList(FILE_RESP_OK_HEADER, data));
+                                    }
 				}
 
 				return;