Auto merge of #3483 - devnexen:strftime_bsd, r=JohnTitor

strftime* api for *BSD close #3459
rust-lang · Dec 17, 2023 · 07e3912 · 07e3912
2 parents ccdae50 + aff5e66
commit 07e3912
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 6 deletions.
diff --git a/libc-test/semver/apple.txt b/libc-test/semver/apple.txt
@@ -2225,6 +2225,7 @@ statfs
 strcasecmp
 strcasestr
 strftime
+strftime_l
 strncasecmp
 strndup
 strptime

diff --git a/libc-test/semver/dragonfly.txt b/libc-test/semver/dragonfly.txt
@@ -1547,6 +1547,8 @@ stack_t
 statfs
 strcasecmp
 strcasestr
+strftime
+strftime_l
 strncasecmp
 strndup
 strsignal

diff --git a/libc-test/semver/freebsd.txt b/libc-test/semver/freebsd.txt
@@ -2204,6 +2204,8 @@ statfs
 strcasecmp
 strcasestr
 strchrnul
+strftime
+strftime_l
 strncasecmp
 strndup
 strsignal

diff --git a/libc-test/semver/netbsd.txt b/libc-test/semver/netbsd.txt
@@ -1551,6 +1551,8 @@ stack_t
 strcasecmp
 strcasestr
 string_to_flags
+strftime
+strftime_l
 strncasecmp
 strndup
 strpct

diff --git a/libc-test/semver/openbsd.txt b/libc-test/semver/openbsd.txt
@@ -1250,6 +1250,8 @@ stack_t
 statfs
 strcasecmp
 strcasestr
+strftime
+strftime_l
 strncasecmp
 strndup
 strsignal

diff --git a/src/unix/bsd/apple/mod.rs b/src/unix/bsd/apple/mod.rs
@@ -5604,12 +5604,6 @@ extern "C" {
     pub fn asctime(tm: *const ::tm) -> *mut ::c_char;
     pub fn ctime(clock: *const time_t) -> *mut ::c_char;
     pub fn getdate(datestr: *const ::c_char) -> *mut ::tm;
-    pub fn strftime(
-        buf: *mut ::c_char,
-        maxsize: ::size_t,
-        format: *const ::c_char,
-        timeptr: *const ::tm,
-    ) -> ::size_t;
     pub fn strptime(
         buf: *const ::c_char,
         format: *const ::c_char,

diff --git a/src/unix/bsd/mod.rs b/src/unix/bsd/mod.rs
@@ -899,6 +899,20 @@ extern "C" {
         longopts: *const option,
         longindex: *mut ::c_int,
     ) -> ::c_int;
+
+    pub fn strftime(
+        buf: *mut ::c_char,
+        maxsize: ::size_t,
+        format: *const ::c_char,
+        timeptr: *const ::tm,
+    ) -> ::size_t;
+    pub fn strftime_l(
+        buf: *mut ::c_char,
+        maxsize: ::size_t,
+        format: *const ::c_char,
+        timeptr: *const ::tm,
+        locale: ::locale_t,
+    ) -> ::size_t;
 }
 
 cfg_if! {