mirror of
https://codeberg.org/kiss-community/repo
synced 2024-08-20 05:06:58 +00:00
144 lines
5.2 KiB
Diff
144 lines
5.2 KiB
Diff
diff --git a/library/std/src/os/linux/fs.rs b/library/std/src/os/linux/fs.rs
|
|
index 479bbcc1..ab0b2a3e 100644
|
|
--- a/library/std/src/os/linux/fs.rs
|
|
+++ b/library/std/src/os/linux/fs.rs
|
|
@@ -329,7 +329,14 @@ pub trait MetadataExt {
|
|
impl MetadataExt for Metadata {
|
|
#[allow(deprecated)]
|
|
fn as_raw_stat(&self) -> &raw::stat {
|
|
- unsafe { &*(self.as_inner().as_inner() as *const libc::stat64 as *const raw::stat) }
|
|
+ #[cfg(target_env = "musl")]
|
|
+ unsafe {
|
|
+ &*(self.as_inner().as_inner() as *const libc::stat as *const raw::stat)
|
|
+ }
|
|
+ #[cfg(not(target_env = "musl"))]
|
|
+ unsafe {
|
|
+ &*(self.as_inner().as_inner() as *const libc::stat64 as *const raw::stat)
|
|
+ }
|
|
}
|
|
fn st_dev(&self) -> u64 {
|
|
self.as_inner().as_inner().st_dev as u64
|
|
diff --git a/library/std/src/sys/unix/fd.rs b/library/std/src/sys/unix/fd.rs
|
|
index 85e020ae..7489d5d2 100644
|
|
--- a/library/std/src/sys/unix/fd.rs
|
|
+++ b/library/std/src/sys/unix/fd.rs
|
|
@@ -124,9 +124,12 @@ impl FileDesc {
|
|
}
|
|
|
|
pub fn read_at(&self, buf: &mut [u8], offset: u64) -> io::Result<usize> {
|
|
- #[cfg(not(any(target_os = "linux", target_os = "android")))]
|
|
+ #[cfg(not(any(
|
|
+ all(target_os = "linux", not(target_env = "musl")),
|
|
+ target_os = "android"
|
|
+ )))]
|
|
use libc::pread as pread64;
|
|
- #[cfg(any(target_os = "linux", target_os = "android"))]
|
|
+ #[cfg(any(all(target_os = "linux", not(target_env = "musl")), target_os = "android"))]
|
|
use libc::pread64;
|
|
|
|
unsafe {
|
|
@@ -281,9 +284,12 @@ impl FileDesc {
|
|
}
|
|
|
|
pub fn write_at(&self, buf: &[u8], offset: u64) -> io::Result<usize> {
|
|
- #[cfg(not(any(target_os = "linux", target_os = "android")))]
|
|
+ #[cfg(not(any(
|
|
+ all(target_os = "linux", not(target_env = "musl")),
|
|
+ target_os = "android"
|
|
+ )))]
|
|
use libc::pwrite as pwrite64;
|
|
- #[cfg(any(target_os = "linux", target_os = "android"))]
|
|
+ #[cfg(any(all(target_os = "linux", not(target_env = "musl")), target_os = "android"))]
|
|
use libc::pwrite64;
|
|
|
|
unsafe {
|
|
diff --git a/library/std/src/sys/unix/fs.rs b/library/std/src/sys/unix/fs.rs
|
|
index fbc7f04c..f6034155 100644
|
|
--- a/library/std/src/sys/unix/fs.rs
|
|
+++ b/library/std/src/sys/unix/fs.rs
|
|
@@ -50,9 +50,13 @@ use libc::{c_int, mode_t};
|
|
all(target_os = "linux", target_env = "gnu")
|
|
))]
|
|
use libc::c_char;
|
|
-#[cfg(any(target_os = "linux", target_os = "emscripten", target_os = "android"))]
|
|
+#[cfg(any(
|
|
+ all(target_os = "linux", not(target_env = "musl")),
|
|
+ target_os = "emscripten",
|
|
+ target_os = "android"
|
|
+))]
|
|
use libc::dirfd;
|
|
-#[cfg(any(target_os = "linux", target_os = "emscripten"))]
|
|
+#[cfg(any(not(target_env = "musl"), target_os = "emscripten"))]
|
|
use libc::fstatat64;
|
|
#[cfg(any(
|
|
target_os = "android",
|
|
@@ -62,9 +66,10 @@ use libc::fstatat64;
|
|
target_os = "illumos",
|
|
target_os = "nto",
|
|
target_os = "vita",
|
|
+ target_env = "musl",
|
|
))]
|
|
use libc::readdir as readdir64;
|
|
-#[cfg(target_os = "linux")]
|
|
+#[cfg(all(target_os = "linux", not(target_env = "musl")))]
|
|
use libc::readdir64;
|
|
#[cfg(any(target_os = "emscripten", target_os = "l4re"))]
|
|
use libc::readdir64_r;
|
|
@@ -86,7 +91,13 @@ use libc::{
|
|
dirent as dirent64, fstat as fstat64, fstatat as fstatat64, ftruncate64, lseek64,
|
|
lstat as lstat64, off64_t, open as open64, stat as stat64,
|
|
};
|
|
+#[cfg(target_env = "musl")]
|
|
+use libc::{
|
|
+ dirent as dirent64, fstat as fstat64, ftruncate as ftruncate64, lseek as lseek64,
|
|
+ lstat as lstat64, off_t as off64_t, open as open64, stat as stat64,
|
|
+};
|
|
#[cfg(not(any(
|
|
+ target_env = "musl",
|
|
target_os = "linux",
|
|
target_os = "emscripten",
|
|
target_os = "l4re",
|
|
@@ -96,7 +107,7 @@ use libc::{
|
|
dirent as dirent64, fstat as fstat64, ftruncate as ftruncate64, lseek as lseek64,
|
|
lstat as lstat64, off_t as off64_t, open as open64, stat as stat64,
|
|
};
|
|
-#[cfg(any(target_os = "linux", target_os = "emscripten", target_os = "l4re"))]
|
|
+#[cfg(any(not(target_env = "musl"), target_os = "emscripten", target_os = "l4re"))]
|
|
use libc::{dirent64, fstat64, ftruncate64, lseek64, lstat64, off64_t, open64, stat64};
|
|
|
|
pub use crate::sys_common::fs::try_exists;
|
|
@@ -283,6 +294,7 @@ unsafe impl Sync for Dir {}
|
|
#[cfg(any(
|
|
target_os = "android",
|
|
target_os = "linux",
|
|
+ not(target_env = "musl"),
|
|
target_os = "solaris",
|
|
target_os = "illumos",
|
|
target_os = "fuchsia",
|
|
@@ -324,6 +336,7 @@ struct dirent64_min {
|
|
}
|
|
|
|
#[cfg(not(any(
|
|
+ target_env = "musl",
|
|
target_os = "android",
|
|
target_os = "linux",
|
|
target_os = "solaris",
|
|
@@ -832,7 +845,7 @@ impl DirEntry {
|
|
}
|
|
|
|
#[cfg(all(
|
|
- any(target_os = "linux", target_os = "emscripten", target_os = "android"),
|
|
+ any(not(target_env = "musl"), target_os = "emscripten", target_os = "android"),
|
|
not(miri)
|
|
))]
|
|
pub fn metadata(&self) -> io::Result<FileAttr> {
|
|
@@ -856,7 +869,7 @@ impl DirEntry {
|
|
}
|
|
|
|
#[cfg(any(
|
|
- not(any(target_os = "linux", target_os = "emscripten", target_os = "android")),
|
|
+ not(any(not(target_env = "musl"), target_os = "emscripten", target_os = "android")),
|
|
miri
|
|
))]
|
|
pub fn metadata(&self) -> io::Result<FileAttr> {
|