summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2022-10-09 01:18:29 +0000
committerbors <bors@rust-lang.org>2022-10-09 01:18:29 +0000
commita0ff4d25d8a2aacb48116ee3b24201da16317d4b (patch)
tree2a101697cb45613326bfca2ba4b96cc49cb381ce
parent2dfe1ab9eed52d0f46983414028fe5ec49e0d5e0 (diff)
parentb1ccdcce2e1db05f09dc8ace7db00486ba2d39a7 (diff)
downloadrust-libc-a0ff4d25d8a2aacb48116ee3b24201da16317d4b.tar.gz
Auto merge of #2943 - SteveLauC:fgetpwent_r-and-fgetgrent_r-on-GNU-Linux, r=JohnTitor
add fgetpwent_r and fgetgrent_r on GNU/Linux [man page for `fgetpwent_r()`](https://man7.org/linux/man-pages/man3/getpwent_r.3.html) [man page for `fgetgrent_r()`](https://man7.org/linux/man-pages/man3/getgrent_r.3.html)
-rw-r--r--libc-test/semver/linux-gnu.txt2
-rw-r--r--src/unix/linux_like/linux/gnu/mod.rs14
2 files changed, 16 insertions, 0 deletions
diff --git a/libc-test/semver/linux-gnu.txt b/libc-test/semver/linux-gnu.txt
index 27bd593843..b48f9a5ffc 100644
--- a/libc-test/semver/linux-gnu.txt
+++ b/libc-test/semver/linux-gnu.txt
@@ -589,9 +589,11 @@ futimes
getauxval
getentropy
getgrent_r
+fgetgrent_r
getloadavg
getpt
getpwent_r
+fgetpwent_r
getpwnam_r
getspent_r
getutxent
diff --git a/src/unix/linux_like/linux/gnu/mod.rs b/src/unix/linux_like/linux/gnu/mod.rs
index 6b86dea32b..a8fc30e6e9 100644
--- a/src/unix/linux_like/linux/gnu/mod.rs
+++ b/src/unix/linux_like/linux/gnu/mod.rs
@@ -1310,6 +1310,20 @@ extern "C" {
buflen: ::size_t,
result: *mut *mut ::group,
) -> ::c_int;
+ pub fn fgetpwent_r(
+ stream: *mut ::FILE,
+ pwd: *mut ::passwd,
+ buf: *mut ::c_char,
+ buflen: ::size_t,
+ result: *mut *mut ::passwd,
+ ) -> ::c_int;
+ pub fn fgetgrent_r(
+ stream: *mut ::FILE,
+ grp: *mut ::group,
+ buf: *mut ::c_char,
+ buflen: ::size_t,
+ result: *mut *mut ::group,
+ ) -> ::c_int;
pub fn sethostid(hostid: ::c_long) -> ::c_int;