Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix cp from readonly source #870

Merged
merged 3 commits into from Jul 10, 2018
Merged

Fix cp from readonly source #870

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fa4f29a
Fix: copy recursively from read only location. (fixes #98)
Fransz Nov 13, 2016
aef3f8b
fix async bug, change test to use skipOnWin
nfischer Jul 4, 2018
bedc538
add comment
nfischer Jul 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/cp.js
View file
Open in desktop
Expand Up @@ -99,8 +99,7 @@ function cpdirSyncRecursive(sourceDir, destDir, currentDepth, opts) {
// Create the directory where all our junk is moving to; read the mode of the
// source directory and mirror it
try {
var checkDir = common.statFollowLinks(sourceDir);
fs.mkdirSync(destDir, checkDir.mode);
fs.mkdirSync(destDir);
} catch (e) {
// if the directory already exists, that's okay
if (e.code !== 'EEXIST') throw e;
Expand Down Expand Up @@ -151,6 +150,11 @@ function cpdirSyncRecursive(sourceDir, destDir, currentDepth, opts) {
}
}
} // for files

// finally change the mode for the newly created directory (otherwise, we
// couldn't add files to a read-only directory).
var checkDir = common.statFollowLinks(sourceDir);
fs.chmodSync(destDir, checkDir.mode);
} // cpdirSyncRecursive

// Checks if cureent file was created recently
Expand Down
24 changes: 24 additions & 0 deletions test/cp.js
View file
Open in desktop
Expand Up @@ -756,3 +756,27 @@ test('should not overwrite recently created files (not give error no-force mode)
// Ensure First file is copied
t.is(shell.cat(`${t.context.tmp}/file1`).toString(), 'test1');
});

// cp -R should be able to copy a readonly src (issue #98).
// On Windows, chmod acts VERY differently so skip these tests for now
test('cp -R should be able to copy a readonly src. issue #98; (Non window platforms only)', t => {
utils.skipOnWin(t, () => {
shell.cp('-r', 'test/resources/cp', t.context.tmp);
shell.chmod('555', `${t.context.tmp}/cp/`);
shell.chmod('555', `${t.context.tmp}/cp/dir_a`);
shell.chmod('555', `${t.context.tmp}/cp/dir_b`);
shell.chmod('555', `${t.context.tmp}/cp/a`);

const result = shell.cp('-r', `${t.context.tmp}/cp`, `${t.context.tmp}/cp_cp`);
t.falsy(shell.error());
t.falsy(result.stderr);
t.is(result.code, 0);

t.is(shell.ls('-R', `${t.context.tmp}/cp`) + '', shell.ls('-R', `${t.context.tmp}/cp_cp`) + '');
t.is(fs.statSync(`${t.context.tmp}/cp_cp`).mode & parseInt('777', 8), parseInt('555', 8));
t.is(fs.statSync(`${t.context.tmp}/cp_cp/dir_a`).mode & parseInt('777', 8), parseInt('555', 8));
t.is(fs.statSync(`${t.context.tmp}/cp_cp/a`).mode & parseInt('777', 8), parseInt('555', 8));

shell.chmod('-R', '755', t.context.tmp);
});
});