Auto merge of #2329 - devnexen:getsethostid_unix, r=JohnTitor

bors · bors · commit 10761b1cd69c · 2021-08-15T23:39:53.000Z
adding gethostid/sethostid to most unixes (redox still unimplemented at

the moment).
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -1645,6 +1645,8 @@ extern "C" {`
`1645`	`1645`	`pub fn explicit_bzero(s: *mut ::c_void, len: ::size_t);`
`1646`	`1646`	`// ISO/IEC 9899:2011 ("ISO C11") K.3.7.4.1`
`1647`	`1647`	`pub fn memset_s(s: *mut ::c_void, smax: ::size_t, c: ::c_int, n: ::size_t) -> ::c_int;`
	`1648`	`+ pub fn gethostid() -> ::c_long;`
	`1649`	`+ pub fn sethostid(hostid: ::c_long);`
`1648`	`1650`	`}`
`1649`	`1651`
`1650`	`1652`	`#[link(name = "rt")]`
Original file line number	Diff line number	Diff line change
`@@ -745,6 +745,8 @@ extern "C" {`
`745`	`745`
`746`	`746`	`extern "C" {`
`747`	`747`	`pub fn reallocarray(ptr: mut ::c_void, nmemb: ::size_t, size: ::size_t) -> mut ::c_void;`
	`748`	`+ pub fn gethostid() -> ::c_long;`
	`749`	`+ pub fn sethostid(hostid: ::c_long) -> ::c_int;`
`748`	`750`	`}`
`749`	`751`
`750`	`752`	`cfg_if! {`