add support for symlink|symlinkat

Author: Mic92

CHANGELOG.md

@@ -10,7 +10,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
   ([#611](https://github.com/nix-rust/nix/pull/609)
 - Added `AioCb::from_boxed_slice`
   ([#582](https://github.com/nix-rust/nix/pull/582)
-- Added `nix::unistd::{openat, fstatat, readlink, readlinkat, rename, renameat, mknodat, unlinkat, mkdirat, link, linkat}`
+- Added `nix::unistd::{openat, fstatat, readlink, readlinkat, rename, renameat, mknodat, unlinkat, mkdirat, link, linkat, symlink, symlinkat}`
   ([#551](https://github.com/nix-rust/nix/pull/551))
 - Added `nix::pty::{grantpt, posix_openpt, ptsname/ptsname_r, unlockpt}`
   ([#556](https://github.com/nix-rust/nix/pull/556)

src/unistd.rs

@@ -641,6 +641,39 @@ pub fn linkat<P1: ?Sized + NixPath, P2: ?Sized + NixPath>(olddirfd: RawFd, oldpa
     Errno::result(res).map(drop)
 }
 
+/// Make a new name for a file
+/// ([see symlink(2)](http://man7.org/linux/man-pages/man2/symlink.2.html)).
+pub fn symlink<P1: ?Sized + NixPath, P2: ?Sized + NixPath>(target: &P1,
+                                                           linkpath: &P2) -> Result<()> {
+    let res = try!(try!(target.with_nix_path(|t|
+        linkpath.with_nix_path(|l|
+            unsafe {
+                libc::symlink(t.as_ptr() as *const c_char, l.as_ptr() as *const c_char)
+            }
+        )
+    )));
+
+    Errno::result(res).map(drop)
+}
+
+/// Make a new name for a file
+/// ([see symlinkat(2)](http://man7.org/linux/man-pages/man2/symlinkat.2.html)).
+pub fn symlinkat<P1: ?Sized + NixPath, P2: ?Sized + NixPath>(target: &P1,
+                                                             newdirfd: RawFd,
+                                                             linkpath: &P2) -> Result<()> {
+    let res = try!(try!(target.with_nix_path(|t|
+        linkpath.with_nix_path(|l|
+            unsafe {
+                libc::symlinkat(t.as_ptr() as *const c_char,
+                                newdirfd,
+                                l.as_ptr() as *const c_char)
+            }
+        )
+    )));
+
+    Errno::result(res).map(drop)
+}
+
 pub fn pipe() -> Result<(RawFd, RawFd)> {
     unsafe {
         let mut fds: [c_int; 2] = mem::uninitialized();

test/test_fcntl.rs

@@ -1,11 +1,10 @@
 use nix::fcntl::{openat, open, OFlag, O_RDONLY, readlink, readlinkat, rename, renameat};
 use nix::sys::stat::Mode;
-use nix::unistd::{close, read};
+use nix::unistd::{close, read, symlink, symlinkat};
 use tempdir::TempDir;
 use tempfile::NamedTempFile;
 use std::fs::File;
 use std::io::prelude::*;
-use std::os::unix::fs;
 
 #[test]
 fn test_openat() {
@@ -31,19 +30,29 @@ fn test_openat() {
 
 #[test]
 fn test_readlink() {
-    let tempdir = TempDir::new("nix-test_readdir")
+    let tempdir = TempDir::new("nix-test_readdlink")
+        .unwrap_or_else(|e| panic!("tempdir failed: {}", e));
+    let src = tempdir.path().join("a");
+    let dst = tempdir.path().join("b");
+    symlink(src.as_path(), dst.as_path()).unwrap();
+
+    let mut buf = vec![0; src.to_str().unwrap().len() + 1];
+    assert_eq!(readlink(&dst, &mut buf).unwrap().to_str().unwrap(),
+               src.to_str().unwrap());
+}
+
+#[test]
+fn test_readlinkat() {
+    let tempdir = TempDir::new("nix-test_readlinkat")
         .unwrap_or_else(|e| panic!("tempdir failed: {}", e));
     let src = tempdir.path().join("a");
     let dst = tempdir.path().join("b");
-    println!("a: {:?}, b: {:?}", &src, &dst);
-    fs::symlink(&src.as_path(), &dst.as_path()).unwrap();
     let dirfd = open(tempdir.path(),
                      OFlag::empty(),
                      Mode::empty()).unwrap();
+    symlinkat(src.as_path(), dirfd, dst.file_name().unwrap()).unwrap();
 
     let mut buf = vec![0; src.to_str().unwrap().len() + 1];
-    assert_eq!(readlink(&dst, &mut buf).unwrap().to_str().unwrap(),
-               src.to_str().unwrap());
     assert_eq!(readlinkat(dirfd, "b", &mut buf).unwrap().to_str().unwrap(),
                src.to_str().unwrap());
 }