consolidate Module.thisProgram

kripken · kripken · commit 768b56ca608e · 2014-07-22T14:47:56.000-07:00
diff --git a/src/library.js b/src/library.js
@@ -3187,7 +3187,7 @@ LibraryManager.library = {
       ENV['PWD'] = '/';
       ENV['HOME'] = '/home/web_user';
       ENV['LANG'] = 'C';
-      ENV['_'] = Module['thisProgram'] || './this.program';
+      ENV['_'] = Module['thisProgram'];
       // Allocate memory.
       poolPtr = allocate(TOTAL_ENV_SIZE, 'i8', ALLOC_STATIC);
       envPtr = allocate(MAX_ENV_VALUES * {{{ Runtime.QUANTUM_SIZE }}},
diff --git a/src/postamble.js b/src/postamble.js
@@ -64,7 +64,7 @@ Module['callMain'] = Module.callMain = function callMain(args) {
       argv.push(0);
     }
   }
-  var argv = [allocate(intArrayFromString(Module['thisProgram'] || './this.program'), 'i8', ALLOC_NORMAL) ];
+  var argv = [allocate(intArrayFromString(Module['thisProgram']), 'i8', ALLOC_NORMAL) ];
   pad();
   for (var i = 0; i < argc-1; i = i + 1) {
     argv.push(allocate(intArrayFromString(args[i]), 'i8', ALLOC_NORMAL));
diff --git a/src/shell.js b/src/shell.js
@@ -162,6 +162,10 @@ if (!Module['printErr']) {
 if (!Module['arguments']) {
   Module['arguments'] = [];
 }
+if (!Module['thisProgram']) {
+  Module['thisProgram'] = './this.program';
+}
+
 // *** Environment setup code ***
 
 // Closure helpers

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ Module['callMain'] = Module.callMain = function callMain(args) {`
`64`	`64`	`argv.push(0);`
`65`	`65`	`}`
`66`	`66`	`}`
`67`		`- var argv = [allocate(intArrayFromString(Module['thisProgram'] \|\| './this.program'), 'i8', ALLOC_NORMAL) ];`
	`67`	`+ var argv = [allocate(intArrayFromString(Module['thisProgram']), 'i8', ALLOC_NORMAL) ];`
`68`	`68`	`pad();`
`69`	`69`	`for (var i = 0; i < argc-1; i = i + 1) {`
`70`	`70`	`argv.push(allocate(intArrayFromString(args[i]), 'i8', ALLOC_NORMAL));`