Skip to content

Commit b3aa876

Browse files
bjouhiercjihrig
authored andcommitted
fs: properly handle fd passed to truncate()
Currently, fs.truncate() silently fails when a file descriptor is passed as the first argument. This commit changes this behavior to properly call fs.ftruncate(). PR-URL: nodejs/node-v0.x-archive#9161 Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Timothy J Fontaine <[email protected]>
1 parent 7b55402 commit b3aa876

File tree

3 files changed

+48
-4
lines changed

3 files changed

+48
-4
lines changed

doc/api/fs.markdown

+2-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,8 @@ Synchronous ftruncate(2).
106106
## fs.truncate(path, len, callback)
107107

108108
Asynchronous truncate(2). No arguments other than a possible exception are
109-
given to the completion callback.
109+
given to the completion callback. A file descriptor can also be passed as the
110+
first argument. In this case, `fs.ftruncate()` is called.
110111

111112
## fs.truncateSync(path, len)
112113

lib/fs.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -639,9 +639,7 @@ fs.renameSync = function(oldPath, newPath) {
639639

640640
fs.truncate = function(path, len, callback) {
641641
if (util.isNumber(path)) {
642-
var req = new FSReqWrap();
643-
req.oncomplete = callback;
644-
return fs.ftruncate(path, len, req);
642+
return fs.ftruncate(path, len, callback);
645643
}
646644
if (util.isFunction(len)) {
647645
callback = len;

test/simple/test-regress-GH-9161.js

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
// Copyright Joyent, Inc. and other Node contributors.
2+
//
3+
// Permission is hereby granted, free of charge, to any person obtaining a
4+
// copy of this software and associated documentation files (the
5+
// "Software"), to deal in the Software without restriction, including
6+
// without limitation the rights to use, copy, modify, merge, publish,
7+
// distribute, sublicense, and/or sell copies of the Software, and to permit
8+
// persons to whom the Software is furnished to do so, subject to the
9+
// following conditions:
10+
//
11+
// The above copyright notice and this permission notice shall be included
12+
// in all copies or substantial portions of the Software.
13+
//
14+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
15+
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
16+
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
17+
// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
18+
// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
19+
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
20+
// USE OR OTHER DEALINGS IN THE SOFTWARE.
21+
22+
var common = require('../common');
23+
var assert = require('assert');
24+
var path = require('path');
25+
var fs = require('fs');
26+
var tmp = common.tmpDir;
27+
if (!fs.existsSync(tmp))
28+
fs.mkdirSync(tmp);
29+
var filename = path.resolve(tmp, 'truncate-file.txt');
30+
31+
var success = 0;
32+
33+
fs.writeFileSync(filename, 'hello world', 'utf8');
34+
var fd = fs.openSync(filename, 'r+');
35+
fs.truncate(fd, 5, function(err) {
36+
assert.ok(!err);
37+
success++;
38+
});
39+
40+
process.on('exit', function() {
41+
fs.closeSync(fd);
42+
fs.unlinkSync(filename);
43+
assert.equal(success, 1);
44+
console.log('ok');
45+
});

0 commit comments

Comments
 (0)