diff options
author | bors <bors@rust-lang.org> | 2021-08-15 23:39:53 +0000 |
---|---|---|
committer | bors <bors@rust-lang.org> | 2021-08-15 23:39:53 +0000 |
commit | 10761b1cd69cca22cbb67da5254cfd4281c6aaf0 (patch) | |
tree | 2743d89717e8bb6444308f5aea2d30dd104c5a97 | |
parent | 95304c421a4fab4dacab49e7009c46030a613746 (diff) | |
parent | 43c316e287df22482adc292195f1c2760f3e12c5 (diff) | |
download | rust-libc-10761b1cd69cca22cbb67da5254cfd4281c6aaf0.tar.gz |
Auto merge of #2329 - devnexen:getsethostid_unix, r=JohnTitor
adding gethostid/sethostid to most unixes (redox still unimplemented at
the moment).
-rw-r--r-- | libc-test/semver/apple.txt | 2 | ||||
-rw-r--r-- | libc-test/semver/dragonfly.txt | 2 | ||||
-rw-r--r-- | libc-test/semver/freebsd.txt | 2 | ||||
-rw-r--r-- | libc-test/semver/linux-gnu.txt | 1 | ||||
-rw-r--r-- | libc-test/semver/linux.txt | 1 | ||||
-rw-r--r-- | libc-test/semver/netbsd.txt | 2 | ||||
-rw-r--r-- | libc-test/semver/openbsd.txt | 2 | ||||
-rw-r--r-- | src/unix/bsd/apple/mod.rs | 3 | ||||
-rw-r--r-- | src/unix/bsd/freebsdlike/mod.rs | 2 | ||||
-rw-r--r-- | src/unix/bsd/netbsdlike/mod.rs | 2 | ||||
-rw-r--r-- | src/unix/linux_like/linux/gnu/mod.rs | 2 | ||||
-rw-r--r-- | src/unix/linux_like/linux/mod.rs | 2 | ||||
-rw-r--r-- | src/unix/linux_like/linux/uclibc/mod.rs | 2 | ||||
-rw-r--r-- | src/unix/solarish/mod.rs | 3 |
14 files changed, 28 insertions, 0 deletions
diff --git a/libc-test/semver/apple.txt b/libc-test/semver/apple.txt index 5ad24f74fe..faf1fa5238 100644 --- a/libc-test/semver/apple.txt +++ b/libc-test/semver/apple.txt @@ -1649,6 +1649,7 @@ getgrgid_r getgrnam getgrnam_r getgrouplist +gethostid getifaddrs getitimer getline @@ -1863,6 +1864,7 @@ sendmsg setdomainname setgrent setgroups +sethostid sethostname setitimer setpriority diff --git a/libc-test/semver/dragonfly.txt b/libc-test/semver/dragonfly.txt index e2ae4664b3..e5118d3ba2 100644 --- a/libc-test/semver/dragonfly.txt +++ b/libc-test/semver/dragonfly.txt @@ -1219,6 +1219,7 @@ getgrgid_r getgrnam getgrnam_r getgrouplist +gethostid getifaddrs getitimer getline @@ -1379,6 +1380,7 @@ sendmsg setdomainname setgrent setgroups +sethostid sethostname setitimer setpriority diff --git a/libc-test/semver/freebsd.txt b/libc-test/semver/freebsd.txt index c5a4164ac4..c42716b0be 100644 --- a/libc-test/semver/freebsd.txt +++ b/libc-test/semver/freebsd.txt @@ -1421,6 +1421,7 @@ getgrgid_r getgrnam getgrnam_r getgrouplist +gethostid getifaddrs getitimer getline @@ -1647,6 +1648,7 @@ sendmsg setdomainname setgrent setgroups +sethostid sethostname setitimer setpriority diff --git a/libc-test/semver/linux-gnu.txt b/libc-test/semver/linux-gnu.txt index 18811c7592..e247c6af74 100644 --- a/libc-test/semver/linux-gnu.txt +++ b/libc-test/semver/linux-gnu.txt @@ -569,6 +569,7 @@ qsort_r reallocarray semid_ds seminfo +sethostid setutxent setxattr sgetspent_r diff --git a/libc-test/semver/linux.txt b/libc-test/semver/linux.txt index a756209ca2..f87184a8fe 100644 --- a/libc-test/semver/linux.txt +++ b/libc-test/semver/linux.txt @@ -2738,6 +2738,7 @@ getgrgid_r getgrnam getgrnam_r getgrouplist +gethostid getifaddrs getline getloadavg diff --git a/libc-test/semver/netbsd.txt b/libc-test/semver/netbsd.txt index 6754a04f2b..5af0b1605d 100644 --- a/libc-test/semver/netbsd.txt +++ b/libc-test/semver/netbsd.txt @@ -1122,6 +1122,7 @@ getgrgid_r getgrnam getgrnam_r getgrouplist +gethostid getifaddrs getitimer getlastlogx @@ -1290,6 +1291,7 @@ sendmsg setdomainname setgrent setgroups +sethostid sethostname setitimer setpriority diff --git a/libc-test/semver/openbsd.txt b/libc-test/semver/openbsd.txt index db4f93fd5f..06322dc816 100644 --- a/libc-test/semver/openbsd.txt +++ b/libc-test/semver/openbsd.txt @@ -936,6 +936,7 @@ getgrgid_r getgrnam getgrnam_r getgrouplist +gethostid getifaddrs getitimer getline @@ -1055,6 +1056,7 @@ sendmsg setdomainname setgrent setgroups +sethostid sethostname setitimer setpriority diff --git a/src/unix/bsd/apple/mod.rs b/src/unix/bsd/apple/mod.rs index 66dd4f5d2a..688961d0a6 100644 --- a/src/unix/bsd/apple/mod.rs +++ b/src/unix/bsd/apple/mod.rs @@ -4458,6 +4458,9 @@ extern "C" { /// `id` is of type [`uuid_t`]. pub fn gethostuuid(id: *mut u8, timeout: *const ::timespec) -> ::c_int; + pub fn gethostid() -> ::c_long; + pub fn sethostid(hostid: ::c_long); + pub fn CCRandomGenerateBytes(bytes: *mut ::c_void, size: ::size_t) -> ::CCRNGStatus; pub fn _NSGetExecutablePath(buf: *mut ::c_char, bufsize: *mut u32) -> ::c_int; diff --git a/src/unix/bsd/freebsdlike/mod.rs b/src/unix/bsd/freebsdlike/mod.rs index 7407b8b6ac..9b883ccc44 100644 --- a/src/unix/bsd/freebsdlike/mod.rs +++ b/src/unix/bsd/freebsdlike/mod.rs @@ -1645,6 +1645,8 @@ extern "C" { pub fn explicit_bzero(s: *mut ::c_void, len: ::size_t); // ISO/IEC 9899:2011 ("ISO C11") K.3.7.4.1 pub fn memset_s(s: *mut ::c_void, smax: ::size_t, c: ::c_int, n: ::size_t) -> ::c_int; + pub fn gethostid() -> ::c_long; + pub fn sethostid(hostid: ::c_long); } #[link(name = "rt")] diff --git a/src/unix/bsd/netbsdlike/mod.rs b/src/unix/bsd/netbsdlike/mod.rs index 6da25ca34a..4e9cd1bc8c 100644 --- a/src/unix/bsd/netbsdlike/mod.rs +++ b/src/unix/bsd/netbsdlike/mod.rs @@ -745,6 +745,8 @@ extern "C" { extern "C" { pub fn reallocarray(ptr: *mut ::c_void, nmemb: ::size_t, size: ::size_t) -> *mut ::c_void; + pub fn gethostid() -> ::c_long; + pub fn sethostid(hostid: ::c_long) -> ::c_int; } cfg_if! { diff --git a/src/unix/linux_like/linux/gnu/mod.rs b/src/unix/linux_like/linux/gnu/mod.rs index f90ec98d21..65a7925b4c 100644 --- a/src/unix/linux_like/linux/gnu/mod.rs +++ b/src/unix/linux_like/linux/gnu/mod.rs @@ -1339,6 +1339,8 @@ extern "C" { ) -> ::c_int; pub fn pthread_getname_np(thread: ::pthread_t, name: *mut ::c_char, len: ::size_t) -> ::c_int; pub fn pthread_setname_np(thread: ::pthread_t, name: *const ::c_char) -> ::c_int; + + pub fn sethostid(hostid: ::c_long) -> ::c_int; } extern "C" { diff --git a/src/unix/linux_like/linux/mod.rs b/src/unix/linux_like/linux/mod.rs index e2d492fc41..3e57966c41 100644 --- a/src/unix/linux_like/linux/mod.rs +++ b/src/unix/linux_like/linux/mod.rs @@ -3837,6 +3837,8 @@ extern "C" { new_value: *const ::itimerspec, old_value: *mut ::itimerspec, ) -> ::c_int; + + pub fn gethostid() -> ::c_long; } cfg_if! { diff --git a/src/unix/linux_like/linux/uclibc/mod.rs b/src/unix/linux_like/linux/uclibc/mod.rs index 60a40e7ab0..396e33d560 100644 --- a/src/unix/linux_like/linux/uclibc/mod.rs +++ b/src/unix/linux_like/linux/uclibc/mod.rs @@ -287,6 +287,8 @@ extern "C" { iovcnt: ::c_int, offset: ::off64_t, ) -> ::ssize_t; + + pub fn sethostid(hostid: ::c_long) -> ::c_int; } cfg_if! { diff --git a/src/unix/solarish/mod.rs b/src/unix/solarish/mod.rs index eb6c596ce1..a4f0fffdb7 100644 --- a/src/unix/solarish/mod.rs +++ b/src/unix/solarish/mod.rs @@ -2659,6 +2659,9 @@ extern "C" { pub fn p_online(processorid: ::processorid_t, flag: ::c_int) -> ::c_int; pub fn getexecname() -> *const ::c_char; + + pub fn gethostid() -> ::c_long; + pub fn sethostid(hostid: ::c_long) -> ::c_int; } mod compat; |