Browse Source

fs: make write/appendFileSync correctly set file mode

v0.10.1-release
Raymond Feng 12 years ago
committed by Bert Belder
parent
commit
25eaacad9a
  1. 2
      lib/fs.js
  2. 98
      test/simple/test-fs-write-file-sync.js

2
lib/fs.js

@ -963,7 +963,7 @@ fs.writeFileSync = function(path, data, options) {
assertEncoding(options.encoding);
var flag = options.flag || 'w';
var fd = fs.openSync(path, flag);
var fd = fs.openSync(path, flag, options.mode);
if (!Buffer.isBuffer(data)) {
data = new Buffer('' + data, options.encoding || 'utf8');
}

98
test/simple/test-fs-write-file-sync.js

@ -0,0 +1,98 @@
// 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 isWindows = process.platform === 'win32';
var openCount = 0;
var mode;
var content;
// Need to hijack fs.open/close to make sure that things
// get closed once they're opened.
fs._openSync = fs.openSync;
fs.openSync = openSync;
fs._closeSync = fs.closeSync;
fs.closeSync = closeSync;
// Reset the umask for testing
var mask = process.umask(0000);
// On Windows chmod is only able to manipulate read-only bit. Test if creating
// the file in read-only mode works.
if (isWindows) {
mode = 0444;
} else {
mode = 0755;
}
// Test writeFileSync
var file1 = path.join(common.tmpDir, 'testWriteFileSync.txt');
removeFile(file1);
fs.writeFileSync(file1, '123', {mode: mode});
content = fs.readFileSync(file1, {encoding: 'utf8'});
assert.equal('123', content);
assert.equal(mode, fs.statSync(file1).mode & 0777);
removeFile(file1);
// Test appendFileSync
var file2 = path.join(common.tmpDir, 'testAppendFileSync.txt');
removeFile(file2);
fs.appendFileSync(file2, 'abc', {mode: mode});
content = fs.readFileSync(file2, {encoding: 'utf8'});
assert.equal('abc', content);
assert.equal(mode, fs.statSync(file2).mode & mode);
removeFile(file2);
// Verify that all opened files were closed.
assert.equal(0, openCount);
// Removes a file if it exists.
function removeFile(file) {
try {
if (isWindows)
fs.chmodSync(file, 0666);
fs.unlinkSync(file);
} catch (err) {
if (err && err.code !== 'ENOENT')
throw err;
}
}
function openSync() {
openCount++;
return fs._openSync.apply(fs, arguments);
}
function closeSync() {
openCount--;
return fs._closeSync.apply(fs, arguments);
}
Loading…
Cancel
Save