sscanf

3 files changed, 169 insertions, 6 deletions

diff --git a/src/library.js b/src/library.js
index 075b53d9..ff87374c 100644
--- a/src/library.js
+++ b/src/library.js
@@ -16,6 +16,51 @@
 var Library = {
   // stdio.h
 
+  _scanString: function() {
+    // Supports %x, %4x, %d.%d
+    var str = Pointer_stringify(arguments[0]);
+    var stri = 0;
+    var fmt = Pointer_stringify(arguments[1]);
+    var fmti = 0;
+    var args = Array.prototype.slice.call(arguments, 2);
+    var argsi = 0;
+    var read = 0;
+    while (fmti < fmt.length) {
+      if (fmt[fmti] === '%') {
+        fmti++;
+        var max_ = parseInt(fmt[fmti]);
+        if (!isNaN(max_)) fmti++;
+        var type = fmt[fmti];
+        fmti++;
+        var curr = 0;
+        while ((curr < max_ || isNaN(max_)) && stri+curr < str.length) {
+          if ((type === 'd' && parseInt(str[stri+curr]) >= 0) ||
+              (type === 'x' && parseInt(str[stri+curr].replace(/[a-fA-F]/, 5)) >= 0)) {
+            curr++;
+          } else {
+            break;
+          }
+        }
+        if (curr === 0) { print("FAIL"); break; }
+        var text = str.substr(stri, curr);
+        stri += curr;
+        var value = type === 'd' ? parseInt(text) : eval('0x' + text);
+        {{{ makeSetValue('args[argsi]', '0', 'value', 'i32') }}}
+        argsi++;
+        read++;
+      } else { // not '%'
+        if (fmt[fmti] === str[stri]) {
+          fmti++;
+          stri++;
+        } else {
+          break;
+        }
+      }
+    }
+    return read; // XXX Possibly we should return EOF (-1) sometimes
+  },
+  sscanf: '_scanString',
+
   _formatString__deps: ['STDIO'],
   _formatString: function() {
     function isFloatArg(type) {
@@ -252,8 +297,8 @@ var Library = {
     filename = Pointer_stringify(filename);
     mode = Pointer_stringify(mode);
     if (mode.indexOf('r') >= 0) {
-      //assert(filename in this._STDIO.filenames, 'No information for file: ' + filename);
       var stream = this._STDIO.filenames[filename];
+      if (!stream) return 0; // assert(false, 'No information for file: ' + filename);
       var info = this._STDIO.streams[stream];
       info.position = info.error = info.eof = 0;
       return stream;
@@ -622,6 +667,9 @@ var Library = {
     return 0;
   },
 
+  // Compiled from newlib; for the original source and licensing, see library_strtok_r.c
+  strtok_r: function(b,j,f){var a;a=null;var c,e;b=b;var i=b!=0;a:do if(i)a=0;else{b=IHEAP[f];if(b!=0){a=0;break a}c=0;a=3;break a}while(0);if(a==0){a:for(;;){e=IHEAP[b];b+=1;a=j;var g=e;i=a;a=2;b:for(;;){d=a==5?d:0;a=IHEAP[i+d];if(a!=0==0){a=9;break a}var d=d+1;if(g==a)break b;else a=5}a=2}if(a==9)if(g==0)c=IHEAP[f]=0;else{c=b+-1;a:for(;;){e=IHEAP[b];b+=1;a=j;g=e;d=a;a=10;b:for(;;){h=a==13?h:0;a=IHEAP[d+h];if(a==g!=0)break a;var h=h+1;if(a!=0)a=13;else break b}}if(e==0)b=0;else IHEAP[b+-1]=0; IHEAP[f]=b;c=c}else if(a==7){IHEAP[f]=b;IHEAP[b+-1]=0;c=b+-1}}return c},
+
   // ctype.h
 
   isdigit: function(chr) {
diff --git a/src/library_strtok_r.c b/src/library_strtok_r.c
new file mode 100644
index 00000000..2fcdfc51
--- /dev/null
+++ b/src/library_strtok_r.c
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 1988 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
+ * Minor modifications made for Emscripten to get this to compile
+ * standalone. All changes under the same license as above.
+ */
+
+#include <string.h>
+
+char *
+strtok_r(
+	register char *s ,
+	register const char *delim ,
+	char **lasts
+)
+{
+	int skip_leading_delim = 1;
+	register char *spanp;
+	register int c, sc;
+	char *tok;
+
+
+	if (s == NULL && (s = *lasts) == NULL)
+		return (NULL);
+
+	/*
+	 * Skip (span) leading delimiters (s += strspn(s, delim), sort of).
+	 */
+cont:
+	c = *s++;
+	for (spanp = (char *)delim; (sc = *spanp++) != 0;) {
+		if (c == sc) {
+			if (skip_leading_delim) {
+				goto cont;
+			}
+			else {
+				*lasts = s;
+				s[-1] = 0;
+				return (s - 1);
+			}
+		}
+	}
+
+	if (c == 0) {		/* no non-delimiter characters */
+		*lasts = NULL;
+		return (NULL);
+	}
+	tok = s - 1;
+
+	/*
+	 * Scan token (scan for delimiters: s += strcspn(s, delim), sort of).
+	 * Note that delim must have one NUL; we stop if we see that, too.
+	 */
+	for (;;) {
+		c = *s++;
+		spanp = (char *)delim;
+		do {
+			if ((sc = *spanp++) == c) {
+				if (c == 0)
+					s = NULL;
+				else
+					s[-1] = 0;
+				*lasts = s;
+				return (tok);
+			}
+		} while (sc != 0);
+	}
+	/* NOTREACHED */
+}
+
diff --git a/tests/runner.py b/tests/runner.py
index 626cc027..f1898cff 100644
--- a/tests/runner.py
+++ b/tests/runner.py
@@ -191,7 +191,7 @@ if 'benchmark' not in sys.argv:
         #shutil.rmtree(dirname) # TODO: leave no trace in memory. But for now nice for debugging
 
     # No building - just process an existing .ll file (or .bc, which we turn into .ll)
-    def do_ll_test(self, ll_file, output, args=[], js_engines=None, output_nicerizer=None):
+    def do_ll_test(self, ll_file, output, args=[], js_engines=None, output_nicerizer=None, post_build=None):
       if COMPILER != LLVM_GCC: return # We use existing .ll, so which compiler is unimportant
 
       filename = os.path.join(self.get_dir(), 'src.cpp')
@@ -217,7 +217,8 @@ if 'benchmark' not in sys.argv:
                    args,
                    no_build=True,
                    js_engines=js_engines,
-                   output_nicerizer=output_nicerizer)
+                   output_nicerizer=output_nicerizer,
+                   post_build=post_build)
 
     def test_hello_world(self):
         src = '''
@@ -415,7 +416,11 @@ if 'benchmark' not in sys.argv:
             int x = 5, y = 9, magic = 7; // fool compiler with magic
             memmove(&x, &y, magic-7); // 0 should not crash us
 
-            printf("*%d\\n", argc);
+            int xx, yy, zz;
+            int cc = sscanf("abc_10.b1_xyz_543", "abc_%d.%2x_xyz_%3d", &xx, &yy, &zz);
+            printf("%d:%d,%d,%d\\n", cc, xx, yy, zz);
+
+            printf("%d\\n", argc);
             puts(argv[1]);
             puts(argv[2]);
             printf("%d\\n", atoi(argv[3])+2);
@@ -427,7 +432,7 @@ if 'benchmark' not in sys.argv:
             return 0;
           }
         '''
-        self.do_test(src, '*4*wowie*too*76*5*(null)*/* a comment */*// another', ['wowie', 'too', '74'], lambda x: x.replace('\n', '*'))
+        self.do_test(src, '3:10,177,543\n4\nwowie\ntoo\n76\n5\n(null)\n/* a comment */\n// another', ['wowie', 'too', '74'])
 
     def test_mainenv(self):
         src = '''
@@ -1346,6 +1351,9 @@ if 'benchmark' not in sys.argv:
         open(filename, 'w').write(src)
       self.do_test(path_from_root('tests', 'gl'), '*?*', main_file='sdl_ogl.c', post_build=post)
 
+    def zzztest_newlib(self):
+      self.do_test(path_from_root('tests', 'newlib'), '*waka*', main_file='main.c')
+
     def test_cubescript(self):
       # XXX Warning: Running this in SpiderMonkey can lead to an extreme amount of memory being
       #              used, see Mozilla bug 593659.
@@ -1386,9 +1394,19 @@ if 'benchmark' not in sys.argv:
       # Has 'Object', which has a big union with a value that can be of any type (like a dynamic value)
       global SAFE_HEAP; SAFE_HEAP = 0
 
+      def post(filename):
+        src = open(filename, 'r').read().replace(
+          '// {{PRE_RUN_ADDITIONS}}',
+          '''this._STDIO.prepare('paper.pdf', %s);''' % str(
+            map(ord, open(path_from_root('tests', 'poppler', 'paper.pdf'), 'rb').read())
+          )
+        )
+        open(filename, 'w').write(src)
+
       self.do_ll_test(path_from_root('tests', 'poppler', 'pdftoppm.bc'),
                       'halp',
-                      args='-png -l 1 -scale-to 512 ~/Dev/emscripten/docs/paper.pdf filename'.split(' '))
+                      args='-png -scale-to 512 paper.pdf filename'.split(' '),
+                      post_build=post)
 
     def test_python(self):
       # Overflows in string_hash