Merge pull request #553 from wontem/fs-readSync-throws-error

copySync, moveSync: remove extra step in reading loop
jprichardson · Mar 17, 2018 · b7aa7e3 · b7aa7e3
2 parents a0d44c1 + 7e2aba0
commit b7aa7e3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/lib/copy-sync/copy-sync.js b/lib/copy-sync/copy-sync.js
@@ -91,11 +91,10 @@ function copyFileFallback (srcStat, src, dest, opts) {
 
   const fdr = fs.openSync(src, 'r')
   const fdw = fs.openSync(dest, 'w', srcStat.mode)
-  let bytesRead = 1
   let pos = 0
 
-  while (bytesRead > 0) {
-    bytesRead = fs.readSync(fdr, _buff, 0, BUF_LENGTH, pos)
+  while (pos < srcStat.size) {
+    const bytesRead = fs.readSync(fdr, _buff, 0, BUF_LENGTH, pos)
     fs.writeSync(fdw, _buff, 0, bytesRead)
     pos += bytesRead
   }

diff --git a/lib/move-sync/index.js b/lib/move-sync/index.js
@@ -68,11 +68,10 @@ function moveFileSyncAcrossDevice (src, dest, overwrite) {
   const fdr = fs.openSync(src, 'r')
   const stat = fs.fstatSync(fdr)
   const fdw = fs.openSync(dest, flags, stat.mode)
-  let bytesRead = 1
   let pos = 0
 
-  while (bytesRead > 0) {
-    bytesRead = fs.readSync(fdr, _buff, 0, BUF_LENGTH, pos)
+  while (pos < stat.size) {
+    const bytesRead = fs.readSync(fdr, _buff, 0, BUF_LENGTH, pos)
     fs.writeSync(fdw, _buff, 0, bytesRead)
     pos += bytesRead
   }