---

yaml
---
r: 14612
b: refs/heads/try
c: 6b0c482
h: refs/heads/master
v: v3

Author: erickt

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: 3cb2cd1f7133619761a7c229185f0ab227526181
+refs/heads/try: 6b0c4822c10d1e0824043f81fc9e39096cc40172
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/libstd/freebsd_os.rs

@@ -62,6 +62,7 @@ native mod libc {
     fn mkdir(path: str::sbuf, mode: c_int) -> c_int;
     fn rmdir(path: str::sbuf) -> c_int;
     fn chdir(path: str::sbuf) -> c_int;
+    fn unlink(path: str::sbuf) -> c_int;
 
     fn sysctl(name: *c_int, namelen: c_uint,
               oldp: *u8, &oldlenp: size_t,

branches/try/src/libstd/fs.rs

@@ -449,6 +449,27 @@ fn homedir() -> option<path> {
     }
 }
 
+/*
+Function: remove_file
+
+Deletes an existing file.
+*/
+fn remove_file(p: path) -> bool {
+    ret unlink(p);
+
+    #[cfg(target_os = "win32")]
+    fn unlink(p: path) -> bool {
+        ret str::as_buf(p, {|buf| os::kernel32::DeleteFileA(buf)});
+    }
+
+    #[cfg(target_os = "linux")]
+    #[cfg(target_os = "macos")]
+    #[cfg(target_os = "freebsd")]
+    fn unlink(_p: path) -> bool {
+        ret str::as_buf(_p, {|buf| os::libc::unlink(buf) == 0i32 });
+    }
+}
+
 #[cfg(test)]
 mod tests {
     #[test]

branches/try/src/libstd/linux_os.rs

@@ -63,6 +63,7 @@ native mod libc {
     fn mkdir(path: str::sbuf, mode: c_int) -> c_int;
     fn rmdir(path: str::sbuf) -> c_int;
     fn chdir(path: str::sbuf) -> c_int;
+    fn unlink(path: str::sbuf) -> c_int;
 }
 
 mod libc_constants {

branches/try/src/libstd/macos_os.rs

@@ -55,6 +55,7 @@ native mod libc {
     fn mkdir(s: str::sbuf, mode: c_int) -> c_int;
     fn rmdir(s: str::sbuf) -> c_int;
     fn chdir(s: str::sbuf) -> c_int;
+    fn unlink(path: str::sbuf) -> c_int;
 
     // FIXME: Needs varags
     fn fcntl(fd: fd_t, cmd: c_int) -> c_int;

branches/try/src/libstd/win32_os.rs

@@ -62,6 +62,7 @@ native mod kernel32 {
                         lpSecurityAttributes: LPSECURITY_ATTRIBUTES) -> bool;
     fn RemoveDirectoryA(lpPathName: LPCTSTR) -> bool;
     fn SetCurrentDirectoryA(lpPathName: LPCTSTR) -> bool;
+    fn DeleteFileA(lpFileName: LPCTSTR) -> bool;
 }
 
 // FIXME turn into constants