1 files changed, 83 insertions, 20 deletions

diff --git a/src/library.js b/src/library.js
index fe6ae0fb..bb73c48a 100644
--- a/src/library.js
+++ b/src/library.js
@@ -28,7 +28,14 @@ LibraryManager.library = {
   $FS__deps: ['$ERRNO_CODES', '__setErrNo', 'stdin', 'stdout', 'stderr', '_impure_ptr'],
   $FS__postset: '__ATINIT__.unshift({ func: function() { if (!Module["noFSInit"] && !FS.init.initialized) FS.init() } });' +
                 '__ATMAIN__.push({ func: function() { FS.ignorePermissions = false } });' +
-                '__ATEXIT__.push({ func: function() { FS.quit() } });',
+                '__ATEXIT__.push({ func: function() { FS.quit() } });' +
+                // export some names through closure
+                'Module["FS_createFolder"] = FS.createFolder;' +
+                'Module["FS_createPath"] = FS.createPath;' +
+                'Module["FS_createDataFile"] = FS.createDataFile;' +
+                'Module["FS_createLazyFile"] = FS.createLazyFile;' +
+                'Module["FS_createLink"] = FS.createLink;' +
+                'Module["FS_createDevice"] = FS.createDevice;',
   $FS: {
     // The path to the current folder.
     currentPath: '/',
@@ -1488,7 +1495,7 @@ LibraryManager.library = {
   lseek: function(fildes, offset, whence) {
     // off_t lseek(int fildes, off_t offset, int whence);
     // http://pubs.opengroup.org/onlinepubs/000095399/functions/lseek.html
-    if (FS.streams[fildes] && !FS.streams[fildes].isDevice) {
+    if (FS.streams[fildes] && !FS.streams[fildes].object.isDevice) {
       var stream = FS.streams[fildes];
       var position = offset;
       if (whence === 1) {  // SEEK_CUR.
@@ -2710,24 +2717,19 @@ LibraryManager.library = {
           });
         } else if (next == 's'.charCodeAt(0)) {
           // String.
-          var arg = getNextArg('i8*');
-          var copiedString;
-          if (arg) {
-            copiedString = String_copy(arg);
-            if (precisionSet && copiedString.length > precision) {
-              copiedString = copiedString.slice(0, precision);
-            }
-          } else {
-            copiedString = intArrayFromString('(null)', true);
-          }
+          var arg = getNextArg('i8*') || 0; // 0 holds '(null)'
+          var argLength = String_len(arg);
+          if (precisionSet) argLength = Math.min(String_len(arg), precision);
           if (!flagLeftAlign) {
-            while (copiedString.length < width--) {
+            while (argLength < width--) {
               ret.push(' '.charCodeAt(0));
             }
           }
-          ret = ret.concat(copiedString);
+          for (var i = 0; i < argLength; i++) {
+            ret.push({{{ makeGetValue('arg++', 0, 'i8', null, true) }}});
+          }
           if (flagLeftAlign) {
-            while (copiedString.length < width--) {
+            while (argLength < width--) {
               ret.push(' '.charCodeAt(0));
             }
           }
@@ -4071,6 +4073,28 @@ LibraryManager.library = {
     }
     return pdest;
   },
+  
+  strlwr__deps:['tolower'],
+  strlwr: function(pstr){
+    var i = 0;
+    while(1) {
+      var x = {{{ makeGetValue('pstr', 'i', 'i8') }}};
+      if(x == 0) break;
+      {{{ makeSetValue('pstr', 'i', '_tolower(x)', 'i8') }}};
+      i++;
+    }
+  },
+  
+  strupr__deps:['toupper'],
+  strupr: function(pstr){
+    var i = 0;
+    while(1) {
+      var x = {{{ makeGetValue('pstr', 'i', 'i8') }}};
+      if(x == 0) break;
+      {{{ makeSetValue('pstr', 'i', '_toupper(x)', 'i8') }}};
+      i++;
+    }
+  },
 
   strcat__deps: ['strlen'],
   strcat: function(pdest, psrc) {
@@ -4220,9 +4244,17 @@ LibraryManager.library = {
   },
 
   strpbrk: function(ptr1, ptr2) {
-    var searchSet = Runtime.set.apply(null, String_copy(ptr2));
-    while ({{{ makeGetValue('ptr1', 0, 'i8') }}}) {
-      if ({{{ makeGetValue('ptr1', 0, 'i8') }}} in searchSet) return ptr1;
+    var curr;
+    var searchSet = {};
+    while (1) {
+      var curr = {{{ makeGetValue('ptr2++', 0, 'i8') }}};
+      if (!curr) break;
+      searchSet[curr] = 1;
+    }
+    while (1) {
+      curr = {{{ makeGetValue('ptr1', 0, 'i8') }}};
+      if (!curr) break;
+      if (curr in searchSet) return ptr1;
       ptr1++;
     }
     return 0;
@@ -4761,15 +4793,42 @@ LibraryManager.library = {
   // type_info for void*.
   _ZTIPv: [0],
 
+  llvm_uadd_with_overflow_i8: function(x, y) {
+    x = x & 0xff;
+    y = y & 0xff;
+    return {
+      f0: (x+y) & 0xff,
+      f1: x+y > 255
+    };
+  },
+
+  llvm_umul_with_overflow_i8: function(x, y) {
+    x = x & 0xff;
+    y = y & 0xff;
+    return {
+      f0: (x*y) & 0xff,
+      f1: x*y > 255
+    };
+  },
+
   llvm_uadd_with_overflow_i16: function(x, y) {
-    x = (x>>>0) & 0xffff;
-    y = (y>>>0) & 0xffff;
+    x = x & 0xffff;
+    y = y & 0xffff;
     return {
       f0: (x+y) & 0xffff,
       f1: x+y > 65535
     };
   },
 
+  llvm_umul_with_overflow_i16: function(x, y) {
+    x = x & 0xffff;
+    y = y & 0xffff;
+    return {
+      f0: (x*y) & 0xffff,
+      f1: x*y > 65535
+    };
+  },
+
   llvm_uadd_with_overflow_i32: function(x, y) {
     x = x>>>0;
     y = y>>>0;
@@ -6193,6 +6252,10 @@ LibraryManager.library = {
     return eval(Pointer_stringify(ptr));
   },
 
+  emscripten_random: function() {
+    return Math.random();
+  },
+
   $Profiling: {
     max_: 0,
     times: null,