From 3bcfc12581ee6fd9a746e485d61cd813fdd7ad73 Mon Sep 17 00:00:00 2001
From: Bruno Jouhier <bjouhier@gmail.com>
Date: Sat, 7 Feb 2015 19:27:20 +0100
Subject: [PATCH] fix fs.truncate when first arg is an int fd added unit test
added note to the doc improved makeCallback arg checking
---
doc/api/fs.markdown | 2 ++
lib/fs.js | 9 +++---
test/simple/test-regress-GH-9161.js | 45 +++++++++++++++++++++++++++++
3 files changed, 52 insertions(+), 4 deletions(-)
create mode 100644 test/simple/test-regress-GH-9161.js
diff --git a/doc/api/fs.markdown b/doc/api/fs.markdown
index 5d3ef3bd1ce..ca30fb9af52 100644
--- a/doc/api/fs.markdown
+++ b/doc/api/fs.markdown
@@ -107,6 +107,8 @@ Synchronous ftruncate(2).
Asynchronous truncate(2). No arguments other than a possible exception are
given to the completion callback.
+Currently, fs.truncate also accepts a file descriptor as first argument but
+you should use fs.ftruncate in this case as this fallback may go away.
## fs.truncateSync(path, len)
diff --git a/lib/fs.js b/lib/fs.js
index a5eb5351acf..f89b597224e 100644
--- a/lib/fs.js
+++ b/lib/fs.js
@@ -91,9 +91,12 @@ function maybeCallback(cb) {
// for callbacks that are passed to the binding layer, callbacks that are
// invoked from JS already run in the proper scope.
function makeCallback(cb) {
- if (!util.isFunction(cb)) {
+ if (util.ifNullOrUndefined(cb)) {
return rethrow();
}
+ if (!util.isFunction(cb)) {
+ throw new Error('callback must be a function');
+ }
return function() {
return cb.apply(null, arguments);
@@ -641,9 +644,7 @@ fs.renameSync = function(oldPath, newPath) {
fs.truncate = function(path, len, callback) {
if (util.isNumber(path)) {
- var req = new FSReqWrap();
- req.oncomplete = callback;
- return fs.ftruncate(path, len, req);
+ return fs.ftruncate(path, len, callback);
}
if (util.isFunction(len)) {
callback = len;
diff --git a/test/simple/test-regress-GH-9161.js b/test/simple/test-regress-GH-9161.js
new file mode 100644
index 00000000000..126ad829417
--- /dev/null
+++ b/test/simple/test-regress-GH-9161.js
@@ -0,0 +1,45 @@
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+var common = require('../common');
+var assert = require('assert');
+var path = require('path');
+var fs = require('fs');
+var tmp = common.tmpDir;
+if (!fs.existsSync(tmp))
+ fs.mkdirSync(tmp);
+var filename = path.resolve(tmp, 'truncate-file.txt');
+
+var success = 0;
+
+fs.writeFileSync(filename, 'hello world', 'utf8');
+var fd = fs.openSync(filename, 'r+');
+fs.truncate(fd, 5, function(err) {
+ assert.ok(!err);
+ success++;
+});
+
+process.on('exit', function() {
+ fs.closeSync(fd);
+ fs.unlinkSync(filename);
+ assert.equal(success, 1);
+ console.log('ok');
+});