about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2015-03-14 23:40:12 -0700
committerAlex Crichton <alex@alexcrichton.com>2015-03-14 23:40:12 -0700
commit9c906da7ade767925aca1da06f139152835b661b (patch)
tree47673aaa87893b1d56a23ee6a95c655a6305b2c3 /src
parent66853af9af79fdc4fb8e659c8b1f890918749d5f (diff)
std: Fix create_dir_all for empty paths
Recent changes in path semantics meant that if none of the components in a
relative path existed as a part of a call to `create_dir_all` then the call
would fail as `create_dir("")` would be attempted and would fail with an OS
error.
Diffstat (limited to 'src')
-rw-r--r--src/libstd/fs/mod.rs2
-rw-r--r--src/test/run-pass/create-dir-all-bare.rs18
2 files changed, 19 insertions, 1 deletions
diff --git a/src/libstd/fs/mod.rs b/src/libstd/fs/mod.rs
index ac1f5993aa1..813283ed164 100644
--- a/src/libstd/fs/mod.rs
+++ b/src/libstd/fs/mod.rs
@@ -570,7 +570,7 @@ pub fn create_dir<P: AsPath + ?Sized>(path: &P) -> io::Result<()> {
 #[stable(feature = "rust1", since = "1.0.0")]
 pub fn create_dir_all<P: AsPath + ?Sized>(path: &P) -> io::Result<()> {
     let path = path.as_path();
-    if path.is_dir() { return Ok(()) }
+    if path == Path::new("") || path.is_dir() { return Ok(()) }
     if let Some(p) = path.parent() { try!(create_dir_all(p)) }
     create_dir(path)
 }
diff --git a/src/test/run-pass/create-dir-all-bare.rs b/src/test/run-pass/create-dir-all-bare.rs
new file mode 100644
index 00000000000..3a4286c2927
--- /dev/null
+++ b/src/test/run-pass/create-dir-all-bare.rs
@@ -0,0 +1,18 @@
+// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+use std::env;
+use std::fs::{self, TempDir};
+
+fn main() {
+    let td = TempDir::new("create-dir-all-bare").unwrap();
+    env::set_current_dir(td.path()).unwrap();
+    fs::create_dir_all("create-dir-all-bare").unwrap();
+}