Repository navigation
fs: stat src through symlinks in cpSync() when dereference is set - #67340
yohannesjoya wants to merge 1 commit into
Conversation
CpSyncCheckPaths() used symlink_status() for src when dereference was true and status() when it was false, the reverse of what the option means. nodejs#59681 fixed the same swap for dest but left src as it was. A symlink to a file passed as src with dereference: true was treated as a directory, so cpSync() threw ERR_FS_EISDIR unless recursive was set, while fs.cp() copied the file. Swap the two calls and drop the check that counted a symlink as a directory, which status() can no longer return. Refs: nodejs#59168 Refs: nodejs#60945 Co-authored-by: Nicholas Paun <npaun@cloudflare.com> Signed-off-by: yohannesjoya <yohannesdestagebru10@gmail.com>
|
Welcome to Node.js, and thank you for your first contribution! Before review, please take a moment to read:
Please make sure every commit is signed off. For a first pull request, GitHub Actions require collaborator approval and Jenkins CI must be started by a collaborator or triager, so an initial wait is normal. |
|
@LiviaMedeiros this ports the fix from #60945, which you reviewed, plus the async test you asked for there. Could you take a look and start CI? |
| cp(join(src, 'link.txt'), dest, opts, mustCall((err) => { | ||
| assert.ifError(err); |
There was a problem hiding this comment.
Nit (i think this was supposed to be catchable by lint rule?):
| cp(join(src, 'link.txt'), dest, opts, mustCall((err) => { | |
| assert.ifError(err); | |
| cp(join(src, 'link.txt'), dest, opts, mustSucceed(() => { |
There was a problem hiding this comment.
Agreed, mustSucceed() is cleaner. Since CI is already green and this is a nit, I'll leave the branch as is unless you'd like me to push it; happy to do so.
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #67340 +/- ##
==========================================
- Coverage 92.99% 90.68% -2.32%
==========================================
Files 428 797 +369
Lines 195633 279572 +83939
Branches 30281 53773 +23492
==========================================
+ Hits 181937 253521 +71584
- Misses 13369 16342 +2973
- Partials 327 9709 +9382
🚀 New features to boost your workflow:
|
cpSync()checkedsrcwithsymlink_status()whendereferencewas true and withstatus()when it was false, the reverse of what the option means. #59681 fixed the same swap fordestbut leftsrcas it was. So a symlink to a file passed assrcwithdereference: truewas treated as a directory:cpSync()threwERR_FS_EISDIRunlessrecursivewas set, whilefs.cp()copied the file.This swaps the two calls and drops the check that counted a symlink as a directory, which
status()can no longer return. The new test covers bothcpSync()andfs.cp()and fails onmain.This is @npaun's fix from #60945, which the stale bot closed. I asked there on Oct 31 whether they planned to reopen it and got no reply, so I've rebased it and added the test, with them as co-author.
Refs: #59168
AI disclosure: I used an AI assistant to help find, test and write up this change. I reviewed and tested it myself.