test/test-cat-noexist.js @@ -8,12 +8,13 @@ node.fs.cat = function (path, encoding, callback) { var file = new node.fs.File({encoding: encoding}); file.onError = function (method, errno, msg) { + //node.debug("cat error"); callback(-1); }; var content = (encoding == node.constants.UTF8 ? "" : []); var pos = 0; - var chunkSize = 10*1024; + var chunkSize = 16*1024; function readChunk () { file.read(chunkSize, pos, function (chunk) { @@ -32,10 +33,8 @@ node.fs.cat = function (path, encoding, callback) { }); } - file.open(path, "r", function () { - readChunk(); - }); -} + file.open(path, "r", function () { readChunk(); }); +}; node.fs.File = function (options) { var self = this; @@ -71,7 +70,11 @@ node.fs.File = function (options) { var errno = arguments[0]; - if (errno < 0) { + //node.debug("poll errno: " + JSON.stringify(errno)); + //node.debug("poll action: " + JSON.stringify(action)); + //node.debug("poll rest: " + JSON.stringify(rest)); + + if (errno !== 0) { if (self.onError) self.onError(action.method, errno, node.fs.strerror(errno)); actionQueue = []; // empty the queue. @@ -82,9 +85,6 @@ node.fs.File = function (options) { for (var i = 1; i < arguments.length; i++) rest.push(arguments[i]); - //node.debug("poll action: " + JSON.stringify(action)); - //node.debug("poll rest: " + JSON.stringify(rest)); - if (action.callback) action.callback.apply(this, rest); src/file.js @@ -136,7 +136,7 @@ clearInterval = clearTimeout; function loadScript (filename, target, callback) { node.fs.cat(filename, "utf8", function (status, content) { if (status != 0) { - stderr.puts("Error reading " + filename + ": " + node.fs.strerror(status)); + stderr.puts("Error reading " + filename); node.exit(1); } src/node.js 4fbe15f065dfcc8de997e5ed32632e5d23ed3e64 Ryan ry@tinyclouds.org http://github.com/KirinDave/node/commit/ed283dc28000f2dc6f881803aa44fc8e65147c24 ed283dc28000f2dc6f881803aa44fc8e65147c24 2009-06-01T03:56:28-07:00 2009-06-01T03:56:28-07:00 Fix bug: catting non-existent files d8c2ea6f085a5f68fe61cefc9a5d5d99e5a50477 Ryan ry@tinyclouds.org