Merge remote-tracking branch 'upstream/master'

2 files changed, 7 insertions, 2 deletions

diff --git a/src/library.js b/src/library.js
index 97f7f61e..c346dd41 100644
--- a/src/library.js
+++ b/src/library.js
@@ -466,6 +466,7 @@ var Library = {
     STDIO.write(stream, Module._fputc_ptr, 1);
   },
 
+  getc__deps: ['$STDIO'],
   getc: function(file) {
     if (!Module._getc_ptr) Module._getc_ptr = _malloc(1);
     var ret = STDIO.read(file, Module._getc_ptr, 1);
@@ -475,6 +476,11 @@ var Library = {
   getc_unlocked: 'getc',
   _IO_getc: 'getc',
 
+  getchar__deps: ['getc'],
+  getchar: function() {
+    return _getc(_stdin);
+  },
+
   ungetc: function(chr, stream) {
     return chr;
   },
diff --git a/src/preamble.js b/src/preamble.js
index e7cbcce6..8cf87bfd 100644
--- a/src/preamble.js
+++ b/src/preamble.js
@@ -588,11 +588,10 @@ if (!this['read']) {
 
 function readBinary(filename) {
   var stringy = read(filename);
-  var data = new Array(stringy.length+1);
+  var data = new Array(stringy.length);
   for (var i = 0; i < stringy.length; i++) {
     data[i] = stringy.charCodeAt(i) & 0xff;
   }
-  data[stringy.length] = 0;
   return data;
 }