Fix problem with requireNative not exporting 'module' object

isaacs · ry · commit b52b4196ab22 · 2010-11-22T11:55:31.000-08:00
Broke require('constants'). Add unrelated test which breaks it.
diff --git a/src/node.js b/src/node.js
@@ -80,10 +80,10 @@ function requireNative (id) {
   if (!natives[id]) throw new Error('No such native module ' + id);
 
   var fn = evals.Script.runInThisContext(
-    "(function (exports, require) {" + natives[id] + "\n})",
+    "(function (module, exports, require) {" + natives[id] + "\n})",
     id + '.js');
   var m = {id: id, exports: {}};
-  fn(m.exports, requireNative);
+  fn(m, m.exports, requireNative);
   m.loaded = true;
   internalModuleCache[id] = m;
   return m.exports;
diff --git a/test/simple/test-fs-write.js b/test/simple/test-fs-write.js
@@ -1,11 +1,13 @@
-common = require("../common");
-assert = common.assert
+var common = require("../common");
+var assert = common.assert
 var path = require('path');
 var Buffer = require('buffer').Buffer;
 var fs = require('fs');
 var fn = path.join(common.tmpDir, "write.txt");
+var fn2 = path.join(common.tmpDir, "write2.txt");
 var expected = "ümlaut.";
-var found;
+var constants = require('constants');
+var found, found2;
 
 fs.open(fn, 'w', 0644, function (err, fd) {
   if (err) throw err;
@@ -25,7 +27,29 @@ fs.open(fn, 'w', 0644, function (err, fd) {
   });
 });
 
+
+fs.open(fn2, constants.O_CREAT | constants.O_WRONLY | constants.O_TRUNC,
+        0644, function (err, fd) {
+  if (err) throw err;
+  console.log('open done');
+  fs.write(fd, '', 0, 'utf8', function(err, written) {
+    assert.equal(0, written);
+  });
+  fs.write(fd, expected, 0, "utf8", function (err, written) {
+    console.log('write done');
+    if (err) throw err;
+    assert.equal(Buffer.byteLength(expected), written);
+    fs.closeSync(fd);
+    found2 = fs.readFileSync(fn2, 'utf8');
+    console.log('expected: ' + expected.toJSON());
+    console.log('found: ' + found2.toJSON());
+    fs.unlinkSync(fn2);
+  });
+});
+
+
 process.addListener("exit", function () {
   assert.equal(expected, found);
+  assert.equal(expected, found2);
 });
 
