1 files changed, 34 insertions, 51 deletions
diff --git a/src/library.js b/src/library.js
index 2aace0fb..5a429131 100644
--- a/src/library.js
+++ b/src/library.js
@@ -3683,6 +3683,32 @@ LibraryManager.library = {
     }
   },
 
+  mbtowc: function(pwc, pmb, maxx) {
+    // XXX doesn't really handle multibyte at all
+    if (!pmb) return 0;
+    maxx = Math.min({{{ cDefine('_NL_CTYPE_MB_CUR_MAX') }}}, maxx);
+    var i;
+    for (i = 0; i < maxx; i++) {
+      var curr = {{{ makeGetValue('pmb', 0, 'i8') }}};
+      if (pwc) {
+        {{{ makeSetValue('pwc', '0', 'curr', 'i8') }}};
+        {{{ makeSetValue('pwc', '1', '0', 'i8') }}};
+        pwc += 2;
+      }
+      pmb++;
+      if (!curr) break;
+    }
+    return i;
+  },
+
+  wcrtomb: function(s, wc, ps) {
+    // XXX doesn't really handle multibyte at all
+    if (s) {
+      {{{ makeSetValue('s', '0', 'wc', 'i8') }}};
+    }
+    return 1;
+  },
+
   // ==========================================================================
   // string.h
   // ==========================================================================
@@ -4465,57 +4491,6 @@ LibraryManager.library = {
   llvm_lifetime_end: function() {},
 
   // ==========================================================================
-  // iostream.h
-  // ==========================================================================
-
-  // libc++
-
-  $libcxx__postset: 'try { __ZNSt3__14coutE = 1 } catch(e){}; try { __ZNSt3__14cerrE = 2 } catch(e){};',
-  $libcxx: {},
-
-  _ZNSt3__113basic_ostreamIcNS_11char_traitsIcEEElsEPKv__deps: ['fputs', '$libcxx'],
-  _ZNSt3__113basic_ostreamIcNS_11char_traitsIcEEElsEPKv: function(stream, str) {
-    _fputs(str, _stdout); // XXX stderr etc.
-  },
-
-  _ZNSt3__113basic_ostreamIcNS_11char_traitsIcEEElsEi__deps: ['fputs', '$libcxx'],
-  _ZNSt3__113basic_ostreamIcNS_11char_traitsIcEEElsEi: function(stream, num) {
-    _fputs(allocate(intArrayFromString(num.toString()), 'i8', ALLOC_STACK), _stdout);
-  },
-
-  _ZNSt3__113basic_ostreamIcNS_11char_traitsIcEEElsEPFRS3_S4_E__deps: ['fputc', '$libcxx'],
-  _ZNSt3__113basic_ostreamIcNS_11char_traitsIcEEElsEPFRS3_S4_E: function(stream, x) {
-    _fputc('\n'.charCodeAt(0), _stdout);
-  },
-
-  // glibc
-
-  _ZNSt8ios_base4InitC1Ev: function() {
-    // need valid 'file descriptors' for glibc
-    //__ZSt4cout = 1;
-    //__ZSt4cerr = 2;
-  },
-  _ZNSt8ios_base4InitD1Ev: '_ZNSt8ios_base4InitC1Ev',
-  _ZSt4endlIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_: 0, // endl
-  _ZNSolsEd__deps: ['putchar'],
-  _ZNSolsEd: function(undefined_stream, data) {
-    _putchar('\n'.charCodeAt(0));
-  },
-  _ZNSolsEPFRSoS_E: '_ZNSolsEd',
-  _ZNSolsEi__deps: ['putchar'],
-  _ZNSolsEi: function(undefined_stream, data) {
-    var str = String(data);
-    for (var i = 0; i < str.length; i++) {
-      _putchar(str.charCodeAt(i));
-    }
-  },
-  _ZStlsISt11char_traitsIcEERSt13basic_ostreamIcT_ES5_PKc__deps: ['fputs', 'stdout'],
-  _ZStlsISt11char_traitsIcEERSt13basic_ostreamIcT_ES5_PKc: function(undefined_stream, data) {
-    _fputs(data, {{{ makeGetValue('_stdout', '0', 'void*') }}});
-  },
-  _ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_i: '_ZStlsISt11char_traitsIcEERSt13basic_ostreamIcT_ES5_PKc',
-
-  // ==========================================================================
   // math.h
   // ==========================================================================
 
@@ -5265,6 +5240,14 @@ LibraryManager.library = {
   // locale.h
   // ==========================================================================
 
+  newlocale: function(mask, locale, base) {
+    return 0;
+  },
+
+  uselocale: function(locale) {
+    return 0;
+  },
+
   setlocale: function(category, locale) {
     if (!_setlocale.ret) _setlocale.ret = allocate([0], 'i8', ALLOC_NORMAL);
     return _setlocale.ret;