diff options
author | Suwon Chae <doortts@gmail.com> | 2013-03-19 15:58:44 +0900 |
---|---|---|
committer | Ben Noordhuis <info@bnoordhuis.nl> | 2013-03-28 16:44:51 +0100 |
commit | 120e5a24df76deb5019abec9744ace94f0f3746a (patch) | |
tree | d46bc7fbfeed03b1c67a84db0e815d606a7b2c47 /lib/os.js | |
parent | 1f5570471896b6723b723342d55ad50013ce3b82 (diff) | |
download | android-node-v8-120e5a24df76deb5019abec9744ace94f0f3746a.tar.gz android-node-v8-120e5a24df76deb5019abec9744ace94f0f3746a.tar.bz2 android-node-v8-120e5a24df76deb5019abec9744ace94f0f3746a.zip |
os: use %SystemRoot% or %windir% in os.tmpdir()
On Windows, respect the SystemRoot and windir environment variables,
don't default to c:\windows\temp.
Diffstat (limited to 'lib/os.js')
-rw-r--r-- | lib/os.js | 19 |
1 files changed, 13 insertions, 6 deletions
@@ -21,6 +21,7 @@ var binding = process.binding('os'); var util = require('util'); +var isWindows = process.platform === 'win32'; exports.endianness = binding.getEndianness; exports.hostname = binding.getHostname; @@ -42,11 +43,17 @@ exports.platform = function() { }; exports.tmpdir = function() { - return process.env.TMPDIR || - process.env.TMP || - process.env.TEMP || - (process.platform === 'win32' ? 'c:\\windows\\temp' : '/tmp'); -}; + if (isWindows) { + return process.env.TEMP || + process.env.TMP || + (process.env.SystemRoot || process.env.windir) + "\\temp"; + } else { + return process.env.TMPDIR || + process.env.TMP || + process.env.TEMP || + '/tmp'; + } +} exports.tmpDir = exports.tmpdir; @@ -54,4 +61,4 @@ exports.getNetworkInterfaces = util.deprecate(function() { return exports.networkInterfaces(); }, 'getNetworkInterfaces is now called `os.networkInterfaces`.'); -exports.EOL = process.platform === 'win32' ? '\r\n' : '\n'; +exports.EOL = isWindows ? '\r\n' : '\n'; |