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

fs, src, lib: fix blksize & blocks on Windows #26056

Merged
merged 1 commit into from
Feb 15, 2019
Merged

fs, src, lib: fix blksize & blocks on Windows #26056

merged 1 commit into from
Feb 15, 2019

Conversation

richardlau
Copy link
Member

@richardlau richardlau commented Feb 12, 2019 •
edited
Loading

libuv returns values for blksize and blocks on stat calls so
do not coerce them into undefined on Windows.

Fixes: #25913

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • tests and/or benchmarks are included
  • commit message follows commit guidelines

@nodejs-github-bot
Copy link
Collaborator

@richardlau build started: https://ci.nodejs.org/blue/organizations/jenkins/node-test-pull-request-lite-pipeline/detail/node-test-pull-request-lite-pipeline/2577/pipeline

@nodejs-github-bot nodejs-github-bot added c++ Issues and PRs that require attention from people who are familiar with C++. fs Issues and PRs related to the fs subsystem / file system. labels Feb 12, 2019
@richardlau richardlau mentioned this pull request Feb 12, 2019
Closed
@richardlau
Copy link
Member Author

CI: https://ci.nodejs.org/job/node-test-pull-request/20743/

@richardlau richardlau added the author ready PRs that have at least one approval, no pending requests for changes, and a CI started. label Feb 12, 2019
@richardlau
Copy link
Member Author

FreeBSD failure is infrastructure: nodejs/build#1682

@joyeecheung
Copy link
Member

Looks like the previous behavior was to return undefined in fs.watchFile call stat objects on Windows when there was an error so that users can check for errors
ed85c95

@richardlau
Copy link
Member Author

Looks like the previous behavior was to return undefined in fs.watchFile call stat objects on Windows when there was an error so that users can check for errors
ed85c95

I see no reason for Windows to differ from the other platforms with regard to 0 vs undefined. I've pushed an update to the documentation (thank you, I hadn't spotted it).

@richardlau
Copy link
Member Author

New CI: https://ci.nodejs.org/job/node-test-pull-request/20744/

@richardlau
Copy link
Member Author

richardlau commented Feb 13, 2019 •
edited
Loading

Resume CI: https://ci.nodejs.org/job/node-test-pull-request/20755/ (✔️)

joyeecheung
joyeecheung approved these changes Feb 14, 2019
View reviewed changes
Copy link
Member

@joyeecheung joyeecheung left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. If this has been broken for so long without being noticed, it's probably to leave this as a semver-patch.

@richardlau
fs, src, lib: fix blksize & blocks on Windows
51d20b6 
libuv returns values for `blksize` and `blocks` on stat calls so
do not coerce them into `undefined` on Windows.

PR-URL: nodejs#26056
Fixes: nodejs#25913
Reviewed-By: Ben Noordhuis <[email protected]>
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: Anna Henningsen <[email protected]>
Reviewed-By: Joyee Cheung <[email protected]>
Reviewed-By: James M Snell <[email protected]>
@richardlau richardlau merged commit 51d20b6 into nodejs:master Feb 15, 2019
targos pushed a commit that referenced this pull request Feb 15, 2019
@richardlau @targos
fs, src, lib: fix blksize & blocks on Windows
f8484f0 
libuv returns values for `blksize` and `blocks` on stat calls so
do not coerce them into `undefined` on Windows.

PR-URL: #26056
Fixes: #25913
Reviewed-By: Ben Noordhuis <[email protected]>
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: Anna Henningsen <[email protected]>
Reviewed-By: Joyee Cheung <[email protected]>
Reviewed-By: James M Snell <[email protected]>
@BridgeAR BridgeAR mentioned this pull request Feb 26, 2019
Merged
rvagg pushed a commit that referenced this pull request Feb 28, 2019
@richardlau @rvagg
fs, src, lib: fix blksize & blocks on Windows
14cf22f 
libuv returns values for `blksize` and `blocks` on stat calls so
do not coerce them into `undefined` on Windows.

PR-URL: #26056
Fixes: #25913
Reviewed-By: Ben Noordhuis <[email protected]>
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: Anna Henningsen <[email protected]>
Reviewed-By: Joyee Cheung <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@joyeecheung joyeecheung joyeecheung approved these changes

@cjihrig cjihrig cjihrig approved these changes

@addaleax addaleax addaleax approved these changes

@jasnell jasnell jasnell approved these changes

@bnoordhuis bnoordhuis bnoordhuis approved these changes

Assignees
No one assigned
Labels
author ready PRs that have at least one approval, no pending requests for changes, and a CI started. c++ Issues and PRs that require attention from people who are familiar with C++. fs Issues and PRs related to the fs subsystem / file system.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

on Win10, fs.stat() returns a stats with undefined blksize and blocks
7 participants
@richardlau @nodejs-github-bot @joyeecheung @bnoordhuis @jasnell @addaleax @cjihrig