From 150739e19ee0e8fa1dd58c7e7a8cb0545e4d7ef9 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Sun, 28 Sep 2014 22:45:29 +0800 Subject: [PATCH] Fix calling fs.open in fs.readFile wrapper --- atom/common/lib/asar.coffee | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/atom/common/lib/asar.coffee b/atom/common/lib/asar.coffee index bdb14e08da7b..839a512213d6 100644 --- a/atom/common/lib/asar.coffee +++ b/atom/common/lib/asar.coffee @@ -129,6 +129,7 @@ fs.existsSync = (p) -> archive.stat(filePath) isnt false +open = fs.open readFile = fs.readFile fs.readFile = (p, options, callback) -> [isAsar, asarPath, filePath] = splitPath p @@ -155,12 +156,13 @@ fs.readFile = (p, options, callback) -> encoding = options.encoding buffer = new Buffer(info.size) - fs.open archive.path, flag, (error, fd) -> + open archive.path, flag, (error, fd) -> return callback error if error fs.read fd, buffer, 0, info.size, info.offset, (error) -> fs.close fd, -> callback error, if encoding then buffer.toString encoding else buffer +openSync = fs.openSync readFileSync = fs.readFileSync fs.readFileSync = (p, options) -> [isAsar, asarPath, filePath] = splitPath p @@ -183,7 +185,7 @@ fs.readFileSync = (p, options) -> encoding = options.encoding buffer = new Buffer(info.size) - fd = fs.openSync archive.path, flag + fd = openSync archive.path, flag try fs.readSync fd, buffer, 0, info.size, info.offset catch e