Merge remote-tracking branch 'upstream/master'

1 files changed, 12 insertions, 4 deletions

diff --git a/src/library.js b/src/library.js
index c346dd41..704ba8a5 100644
--- a/src/library.js
+++ b/src/library.js
@@ -226,7 +226,7 @@ var Library = {
   },
 
   fileno: function(file) {
-    return 1; // TODO
+    return file;
   },
 
   isatty: function(file) {
@@ -274,10 +274,10 @@ var Library = {
       }
 
       _stdout = Pointer_make([0], null, ALLOC_STATIC, 'void*');
-      {{{ makeSetValue('_stdout', '0', "STDIO.prepare('<<stdin>>', null, true)", 'i32') }}};
+      {{{ makeSetValue('_stdout', '0', "STDIO.prepare('<<stdout>>', null, true)", 'i32') }}};
 
       _stderr = Pointer_make([0], null, ALLOC_STATIC, 'void*');
-      {{{ makeSetValue('_stderr', '0', "STDIO.prepare('<<stdin>>', null, true)", 'i32') }}};
+      {{{ makeSetValue('_stderr', '0', "STDIO.prepare('<<stderr>>', null, true)", 'i32') }}};
     },
     cleanFilename: function(filename) {
       return filename.replace('./', '');
@@ -456,7 +456,6 @@ var Library = {
   fputs__deps: ['$STDIO', 'fputc'],
   fputs: function(p, stream) {
     STDIO.write(stream, p, String_len(p));
-    _fputc('\n'.charCodeAt(0), stream);
   },
 
   fputc__deps: ['$STDIO'],
@@ -482,6 +481,11 @@ var Library = {
   },
 
   ungetc: function(chr, stream) {
+    var f = STDIO.streams[stream];
+    if (!f)
+      return -1; // EOF
+    if (!f.interactiveInput)
+      f.position--;
     return chr;
   },
 
@@ -1199,6 +1203,10 @@ var Library = {
     return 100;
   },
 
+  getgid: function() {
+    return 100;
+  },
+
   getpwuid: function(uid) {
     return 0; // NULL
   },