1 files changed, 43 insertions, 23 deletions

diff --git a/src/library.js b/src/library.js
index 5e58f011..22cc053e 100644
--- a/src/library.js
+++ b/src/library.js
@@ -1118,6 +1118,7 @@ LibraryManager.library = {
   },
   stat64: 'stat',
   fstat64: 'fstat',
+  lstat64: 'lstat',
   __01fstat64_: 'fstat',
   __01stat64_: 'stat',
   __01lstat64_: 'lstat',
@@ -1778,6 +1779,8 @@ LibraryManager.library = {
     } else if (nbyte < 0 || offset < 0) {
       ___setErrNo(ERRNO_CODES.EINVAL);
       return -1;
+    } else if (offset >= stream.object.contents.length) {
+      return 0;
     } else {
       var bytesRead = 0;
       while (stream.ungotten.length && nbyte > 0) {
@@ -1787,6 +1790,8 @@ LibraryManager.library = {
       }
       var contents = stream.object.contents;
       var size = Math.min(contents.length - offset, nbyte);
+      assert(size >= 0);
+      
 #if USE_TYPED_ARRAYS == 2
       if (contents.subarray) { // typed array
         HEAPU8.set(contents.subarray(offset, offset+size), buf);
@@ -1854,6 +1859,7 @@ LibraryManager.library = {
       } else {
         var ungotSize = stream.ungotten.length;
         bytesRead = _pread(fildes, buf, nbyte, stream.position);
+        assert(bytesRead >= -1);
         if (bytesRead != -1) {
           stream.position += (stream.ungotten.length - ungotSize) + bytesRead;
         }
@@ -1870,42 +1876,42 @@ LibraryManager.library = {
   rmdir: function(path) {
     // int rmdir(const char *path);
     // http://pubs.opengroup.org/onlinepubs/000095399/functions/rmdir.html
-    path = FS.analyzePath(Pointer_stringify(path));
+    path = Pointer_stringify(path);
+    path = FS.analyzePath(path, true);
     if (!path.parentExists || !path.exists) {
       ___setErrNo(path.error);
       return -1;
-    } else if (!path.object.write || path.isRoot) {
+    } else if (!path.parentObject.write) {
       ___setErrNo(ERRNO_CODES.EACCES);
       return -1;
     } else if (!path.object.isFolder) {
       ___setErrNo(ERRNO_CODES.ENOTDIR);
       return -1;
+    } else if (path.isRoot || path.path == FS.currentPath) {
+      ___setErrNo(ERRNO_CODES.EBUSY);
+      return -1;
     } else {
       for (var i in path.object.contents) {
         ___setErrNo(ERRNO_CODES.ENOTEMPTY);
         return -1;
       }
-      if (path.path == FS.currentPath) {
-        ___setErrNo(ERRNO_CODES.EBUSY);
-        return -1;
-      } else {
-        delete path.parentObject.contents[path.name];
-        return 0;
-      }
+      delete path.parentObject.contents[path.name];
+      return 0;
     }
   },
   unlink__deps: ['$FS', '__setErrNo', '$ERRNO_CODES'],
   unlink: function(path) {
     // int unlink(const char *path);
     // http://pubs.opengroup.org/onlinepubs/000095399/functions/unlink.html
-    path = FS.analyzePath(Pointer_stringify(path));
+    path = Pointer_stringify(path);
+    path = FS.analyzePath(path, true);
     if (!path.parentExists || !path.exists) {
       ___setErrNo(path.error);
       return -1;
     } else if (path.object.isFolder) {
-      ___setErrNo(ERRNO_CODES.EISDIR);
+      ___setErrNo(ERRNO_CODES.EPERM);
       return -1;
-    } else if (!path.object.write) {
+    } else if (!path.parentObject.write) {
       ___setErrNo(ERRNO_CODES.EACCES);
       return -1;
     } else {
@@ -2562,15 +2568,27 @@ LibraryManager.library = {
         continue;
       }
 
-      // TODO: Support strings like "%5c" etc.
-      if (format[formatIndex] === '%' && format[formatIndex+1] == 'c') {
-        var argPtr = {{{ makeGetValue('varargs', 'argIndex', 'void*') }}};
-        argIndex += Runtime.getAlignSize('void*', null, true);
-        fields++;
-        next = get();
-        {{{ makeSetValue('argPtr', 0, 'next', 'i8') }}}
-        formatIndex += 2;
-        continue;
+      if (format[formatIndex] === '%') {
+        var nextC = format.indexOf('c', formatIndex+1);
+        if (nextC > 0) {
+          var maxx = 1;
+          if (nextC > formatIndex+1) {
+            var sub = format.substring(formatIndex+1, nextC)
+            maxx = parseInt(sub);
+            if (maxx != sub) maxx = 0;
+          }
+          if (maxx) {
+            var argPtr = HEAP32[(varargs + argIndex)>>2];
+            argIndex += Runtime.getAlignSize('void*', null, true);
+            fields++;
+            for (var i = 0; i < maxx; i++) {
+              next = get();
+              {{{ makeSetValue('argPtr++', 0, 'next', 'i8') }}};
+            }
+            formatIndex += nextC - formatIndex + 1;
+            continue;
+          }
+        }
       }
 
       // remove whitespace
@@ -4901,7 +4919,9 @@ LibraryManager.library = {
   isprint: function(chr) {
     return 0x1F < chr && chr < 0x7F;
   },
-  isgraph: 'isprint',
+  isgraph: function(chr) {
+    return 0x20 < chr && chr < 0x7F;
+  },
   // Lookup tables for glibc ctype implementation.
   __ctype_b_loc: function() {
     // http://refspecs.freestandards.org/LSB_3.0.0/LSB-Core-generic/LSB-Core-generic/baselib---ctype-b-loc.html
@@ -5958,7 +5978,7 @@ LibraryManager.library = {
       return 1;
     } else {
       var lib_record = DLFCN_DATA.loadedLibs[handle];
-      if (lib_record.refcount-- == 0) {
+      if (--lib_record.refcount == 0) {
         delete DLFCN_DATA.loadedLibNames[lib_record.name];
         delete DLFCN_DATA.loadedLibs[handle];
       }