fix(cp): add recursive support for cp -p

nfischer · nfischer · commit a72bc8c6ba40 · 2022-01-26T22:24:53.000-08:00
This adds recursive support for `cp -p`. This also sets atime/mtime on
the directory itself.
diff --git a/src/cp.js b/src/cp.js
@@ -103,8 +103,9 @@ function cpdirSyncRecursive(sourceDir, destDir, currentDepth, opts) {
 
   var isWindows = process.platform === 'win32';
 
-  // Create the directory where all our junk is moving to; read the mode of the
-  // source directory and mirror it
+  // Create the directory where all our junk is moving to; read the mode/etc. of
+  // the source directory (we'll set this on the destDir at the end).
+  var checkDir = common.statFollowLinks(sourceDir);
   try {
     fs.mkdirSync(destDir);
   } catch (e) {
@@ -157,7 +158,10 @@ function cpdirSyncRecursive(sourceDir, destDir, currentDepth, opts) {
 
   // 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);
+  // var checkDir = common.statFollowLinks(sourceDir);
+  if (opts.preserve) {
+    fs.utimesSync(destDir, checkDir.atime, checkDir.mtime);
+  }
   fs.chmodSync(destDir, checkDir.mode);
 } // cpdirSyncRecursive
 
@@ -266,7 +270,7 @@ function _cp(options, sources, dest) {
 
         try {
           common.statFollowLinks(path.dirname(dest));
-          cpdirSyncRecursive(src, newDest, 0, { no_force: options.no_force, followsymlink: options.followsymlink, update: options.update });
+          cpdirSyncRecursive(src, newDest, 0, options);
         } catch (e) {
           /* istanbul ignore next */
           common.error("cannot create directory '" + dest + "': No such file or directory");
diff --git a/test/cp.js b/test/cp.js
@@ -838,6 +838,48 @@ test('cp -p should preserve mode, ownership, and timestamp (regular file)', t =>
   t.is(stat.gid, statOfResult.gid);
 });
 
+test('cp -p should preserve mode, ownership, and timestamp (directory)', t => {
+  // Setup: copy to srcFile and modify mode and timestamp
+  const srcDir = `${t.context.tmp}/srcDir`;
+  const srcFile = `${srcDir}/srcFile`;
+  shell.mkdir(srcDir);
+  shell.cp('test/resources/cp/file1', srcFile);
+  // Make this a round number of seconds, since the underlying system may not
+  // have millisecond precision.
+  const newModifyTimeMs = 12345000;
+  const newAccessTimeMs = 67890000;
+  shell.touch({ '-d': new Date(newModifyTimeMs), '-m': true }, srcFile);
+  shell.touch({ '-d': new Date(newAccessTimeMs), '-a': true }, srcFile);
+  fs.utimesSync(srcDir, new Date(newAccessTimeMs), new Date(newModifyTimeMs));
+  const mode = '444';
+  shell.chmod(mode, srcFile);
+
+  // Now re-copy (the whole dir) with '-p' and verify metadata of file contents.
+  const result = shell.cp('-pr', srcDir, `${t.context.tmp}/preservedDir`);
+  const stat = common.statFollowLinks(srcFile);
+  const statDir = common.statFollowLinks(srcDir);
+  const statOfResult = common.statFollowLinks(`${t.context.tmp}/preservedDir/srcFile`);
+  const statOfResultDir = common.statFollowLinks(`${t.context.tmp}/preservedDir`);
+
+  t.is(result.code, 0);
+
+  // Both original file and original dir should be unchanged:
+  t.is(statDir.mtime.getTime(), newModifyTimeMs);
+  t.is(stat.mtime.getTime(), newModifyTimeMs);
+  // cp appears to update the atime, but only of the srcFile & srcDir
+  t.is(stat.mode.toString(8), '100' + mode);
+
+  // Both new file and new dir should keep same attributes
+  t.is(statOfResultDir.mtime.getTime(), newModifyTimeMs);
+  t.is(statOfResultDir.atime.getTime(), newAccessTimeMs);
+  t.is(statOfResult.mtime.getTime(), newModifyTimeMs);
+  t.is(statOfResult.atime.getTime(), newAccessTimeMs);
+  t.is(statOfResult.mode.toString(8), '100' + mode);
+
+  t.is(stat.uid, statOfResult.uid);
+  t.is(stat.gid, statOfResult.gid);
+});
+
 test('cp -p should preserve mode, ownership, and timestamp (symlink)', t => {
   // Skip in Windows because symlinks require elevated permissions.
   utils.skipOnWin(t, () => {
