mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

core: switching os::tmpdir() to always return a directory, by defaulting to Windows dir on windows, as per .NET

Browse Source
This commit is contained in:
Daniel Patterson 2012-08-21 15:23:46 -04:00 committed by Brian Anderson
parent 9bb2963b7e
commit 8b8e0c2a45
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/libcore/os.rs
View File

@ -465,16 +465,16 @@ fn homedir() -> option<Path> {
}
/**
* Returns the path to a temporary directory, if known.
* Returns the path to a temporary directory.
*
* On Unix, returns the value of the 'TMPDIR' environment variable if it is
* set and non-empty and '/tmp' otherwise.
*
* On Windows, returns the value of, in order, the 'TMP', 'TEMP',
* 'USERPROFILE' environment variable if any are set and not the empty
* string. Otherwise, tmpdir returns option::none.
* 'USERPROFILE' environment variable if any are set and not the empty
* string. Otherwise, tmpdir returns the path to the Windows directory.
*/
fn tmpdir() -> option<Path> {
fn tmpdir() -> Path {
return lookup();
fn getenv_nonempty(v: Path) -> option<Path> {
@ -490,15 +490,18 @@ fn tmpdir() -> option<Path> {
}
#[cfg(unix)]
fn lookup() -> option<Path> {
option::or(getenv_nonempty(~"TMPDIR"), some(~"/tmp"))
fn lookup() -> Path {
option::get_default(getenv_nonempty(~"TMPDIR"), ~"/tmp")
}
#[cfg(windows)]
fn lookup() -> option<Path> {
option::or(getenv_nonempty(~"TMP"),
option::or(getenv_nonempty(~"TEMP"),
getenv_nonempty(~"USERPROFILE")))
fn lookup() -> Path {
option::get_default(
option::or(getenv_nonempty(~"TMP"),
option::or(getenv_nonempty(~"TEMP"),
option::or(getenv_nonempty(~"USERPROFILE"),
getenv_nonempty(~"WINDIR")))),
~"C:\\Windows")
}
}
/// Recursively walk a directory structure
@ -970,7 +973,7 @@ mod tests {
#[test]
fn tmpdir() {
option::iter(os::tmpdir(), |s| assert !str::is_empty(s));
assert !str::is_empty(os::tmpdir());
}
// Issue #712