Auto merge of rust-lang#1313 - keur:master, r=gnzlbg

add login_tty api from libutil

Author: bors

libc-test/build.rs

@@ -124,7 +124,6 @@ fn do_ctest() {
         }
         cfg.header("arpa/inet.h");
         cfg.header("xlocale.h");
-        cfg.header("utmp.h");
         cfg.header("ifaddrs.h");
         if i686 || x86_64 {
             cfg.header("sys/reg.h");
@@ -208,6 +207,7 @@ fn do_ctest() {
         cfg.header("sys/personality.h");
         cfg.header("sys/swap.h");
         cfg.header("pty.h");
+        cfg.header("utmp.h");
         if !uclibc {
             cfg.header("sys/sysinfo.h");
         }

src/unix/bsd/apple/mod.rs

@@ -3168,6 +3168,7 @@ extern {
                    name: *mut ::c_char,
                    termp: *mut termios,
                    winp: *mut ::winsize) -> ::pid_t;
+    pub fn login_tty(fd: ::c_int) -> ::c_int;
     pub fn duplocale(base: ::locale_t) -> ::locale_t;
     pub fn freelocale(loc: ::locale_t) -> ::c_int;
     pub fn localeconv_l(loc: ::locale_t) -> *mut lconv;

src/unix/bsd/freebsdlike/mod.rs

@@ -1299,6 +1299,7 @@ extern {
                    name: *mut ::c_char,
                    termp: *mut termios,
                    winp: *mut ::winsize) -> ::pid_t;
+    pub fn login_tty(fd: ::c_int) -> ::c_int;
 }
 
 cfg_if! {

src/unix/bsd/netbsdlike/mod.rs

@@ -643,6 +643,7 @@ extern {
                    name: *mut ::c_char,
                    termp: *mut termios,
                    winp: *mut ::winsize) -> ::pid_t;
+    pub fn login_tty(fd: ::c_int) -> ::c_int;
     pub fn getpriority(which: ::c_int, who: ::id_t) -> ::c_int;
     pub fn setpriority(which: ::c_int, who: ::id_t, prio: ::c_int) -> ::c_int;
 

src/unix/notbsd/mod.rs

@@ -1383,6 +1383,11 @@ extern {
                 name: *mut ::c_char,
                 termp: *const termios,
                 winp: *const ::winsize) -> ::c_int;
+    pub fn forkpty(amaster: *mut ::c_int,
+                name: *mut ::c_char,
+                termp: *const termios,
+                winp: *const ::winsize) -> ::pid_t;
+    pub fn login_tty(fd: ::c_int) -> ::c_int;
     pub fn execvpe(file: *const ::c_char, argv: *const *const ::c_char,
                    envp: *const *const ::c_char) -> ::c_int;
     pub fn fexecve(fd: ::c_int, argv: *const *const ::c_char,
@@ -1422,7 +1427,3 @@ cfg_if! {
         // Unknown target_os
     }
 }
-    // pub fn forkpty(amaster: *mut ::c_int,
-    //             name: *mut ::c_char,
-    //             termp: *const termios,
-    //             winp: *const ::winsize) -> ::pid_t;