1 files changed, 13 insertions, 87 deletions

diff --git a/src/library.js b/src/library.js
index d24f1f75..db9b891c 100644
--- a/src/library.js
+++ b/src/library.js
@@ -1642,8 +1642,8 @@ LibraryManager.library = {
             for (var i = 0; i < maxx; i++) {
               next = get();
               {{{ makeSetValue('argPtr++', 0, 'next', 'i8') }}};
+              if (next === 0) return i > 0 ? fields : fields-1; // we failed to read the full length of this field
             }
-            if (next === 0) return fields-1; // we failed to read this field
             formatIndex += nextC - formatIndex + 1;
             continue;
           }
@@ -3463,7 +3463,7 @@ LibraryManager.library = {
   rand_r: function(seedp) {
     seedp = seedp|0; 
     var val = 0;
-    val = ((Math_imul({{{ makeGetValueAsm('seedp', 0, 'i32') }}}, 31010991)|0) + 0x676e6177 ) & {{{ cDefine('RAND_MAX') }}};
+    val = ((Math_imul({{{ makeGetValueAsm('seedp', 0, 'i32') }}}, 31010991)|0) + 0x676e6177 ) & {{{ cDefine('RAND_MAX') }}}; // assumes RAND_MAX is in bit mask form (power of 2 minus 1)
     {{{ makeSetValueAsm('seedp', 0, 'val', 'i32') }}};
     return val|0;
   },
@@ -3515,11 +3515,18 @@ LibraryManager.library = {
     return ret;
   },
 
+  emscripten_memcpy_big: function(dest, src, num) {
+    HEAPU8.set(HEAPU8.subarray(src, src+num), dest);
+    return dest;
+  },
+
   memcpy__asm: true,
   memcpy__sig: 'iiii',
+  memcpy__deps: ['emscripten_memcpy_big'],
   memcpy: function(dest, src, num) {
     dest = dest|0; src = src|0; num = num|0;
     var ret = 0;
+    if ((num|0) >= 4096) return _emscripten_memcpy_big(dest|0, src|0, num|0)|0;
     ret = dest|0;
     if ((dest&3) == (src&3)) {
       while (dest & 3) {
@@ -3759,79 +3766,6 @@ LibraryManager.library = {
     return pdest;
   },
 
-  strcmp__deps: ['strncmp'],
-  strcmp: function(px, py) {
-    return _strncmp(px, py, TOTAL_MEMORY);
-  },
-  // We always assume ASCII locale.
-  strcoll: 'strcmp',
-  strcoll_l__deps: ['strcoll'],
-  strcoll_l: function(px, py) {
-    return _strcoll(px, py); // no locale support yet
-  },
-
-  strcasecmp__asm: true,
-  strcasecmp__sig: 'iii',
-  strcasecmp__deps: ['strncasecmp'],
-  strcasecmp: function(px, py) {
-    px = px|0; py = py|0;
-    return _strncasecmp(px, py, -1)|0;
-  },
-
-  strncmp: function(px, py, n) {
-    var i = 0;
-    while (i < n) {
-      var x = {{{ makeGetValue('px', 'i', 'i8', 0, 1) }}};
-      var y = {{{ makeGetValue('py', 'i', 'i8', 0, 1) }}};
-      if (x == y && x == 0) return 0;
-      if (x == 0) return -1;
-      if (y == 0) return 1;
-      if (x == y) {
-        i ++;
-        continue;
-      } else {
-        return x > y ? 1 : -1;
-      }
-    }
-    return 0;
-  },
-
-  strncasecmp__asm: true,
-  strncasecmp__sig: 'iiii',
-  strncasecmp__deps: ['tolower'],
-  strncasecmp: function(px, py, n) {
-    px = px|0; py = py|0; n = n|0;
-    var i = 0, x = 0, y = 0;
-    while ((i>>>0) < (n>>>0)) {
-      x = _tolower({{{ makeGetValueAsm('px', 'i', 'i8', 0, 1) }}})|0;
-      y = _tolower({{{ makeGetValueAsm('py', 'i', 'i8', 0, 1) }}})|0;
-      if (((x|0) == (y|0)) & ((x|0) == 0)) return 0;
-      if ((x|0) == 0) return -1;
-      if ((y|0) == 0) return 1;
-      if ((x|0) == (y|0)) {
-        i = (i + 1)|0;
-        continue;
-      } else {
-        return ((x>>>0) > (y>>>0) ? 1 : -1)|0;
-      }
-    }
-    return 0;
-  },
-
-  memcmp__asm: true,
-  memcmp__sig: 'iiii',
-  memcmp: function(p1, p2, num) {
-    p1 = p1|0; p2 = p2|0; num = num|0;
-    var i = 0, v1 = 0, v2 = 0;
-    while ((i|0) < (num|0)) {
-      v1 = {{{ makeGetValueAsm('p1', 'i', 'i8', true) }}};
-      v2 = {{{ makeGetValueAsm('p2', 'i', 'i8', true) }}};
-      if ((v1|0) != (v2|0)) return ((v1|0) > (v2|0) ? 1 : -1)|0;
-      i = (i+1)|0;
-    }
-    return 0;
-  },
-
   memchr: function(ptr, chr, num) {
     chr = unSign(chr);
     for (var i = 0; i < num; i++) {
@@ -4684,6 +4618,8 @@ LibraryManager.library = {
   _ZTIv: [0], // void
   _ZTIPv: [0], // void*
 
+  _ZTISt9exception: [0], // typeinfo for std::exception
+
   llvm_uadd_with_overflow_i8: function(x, y) {
     x = x & 0xff;
     y = y & 0xff;
@@ -7423,20 +7359,10 @@ LibraryManager.library = {
   // netinet/in.h
   // ==========================================================================
 
-  _in6addr_any:
+  in6addr_any:
     'allocate([0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0], "i8", ALLOC_STATIC)',
-  _in6addr_loopback:
+  in6addr_loopback:
     'allocate([0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1], "i8", ALLOC_STATIC)',
-  _in6addr_linklocal_allnodes:
-    'allocate([255,2,0,0,0,0,0,0,0,0,0,0,0,0,0,1], "i8", ALLOC_STATIC)',
-  _in6addr_linklocal_allrouters:
-    'allocate([255,2,0,0,0,0,0,0,0,0,0,0,0,0,0,2], "i8", ALLOC_STATIC)',
-  _in6addr_interfacelocal_allnodes:
-    'allocate([255,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1], "i8", ALLOC_STATIC)',
-  _in6addr_interfacelocal_allrouters:
-    'allocate([255,1,0,0,0,0,0,0,0,0,0,0,0,0,0,2], "i8", ALLOC_STATIC)',
-  _in6addr_sitelocal_allrouters:
-    'allocate([255,5,0,0,0,0,0,0,0,0,0,0,0,0,0,2], "i8", ALLOC_STATIC)',
 
   // ==========================================================================
   // netdb.h