itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-09-28 11:20:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't use on Solaris libc::LOCK_* which were removed from libc in ver… (#15143)

Browse Source 
Relevant libc change was:
251e8e839a
This commit is contained in:
Weihang Lo 2025-02-07 13:14:25 +00:00 committed by GitHub
commit 49e5d24870
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/cargo/util/flock.rs
View File

@ -436,24 +436,41 @@ mod sys {
use std::io::{Error, Result};
use std::os::unix::io::AsRawFd;
#[cfg(not(target_os = "solaris"))]
const LOCK_SH: i32 = libc::LOCK_SH;
#[cfg(target_os = "solaris")]
const LOCK_SH: i32 = 1;
#[cfg(not(target_os = "solaris"))]
const LOCK_EX: i32 = libc::LOCK_EX;
#[cfg(target_os = "solaris")]
const LOCK_EX: i32 = 2;
#[cfg(not(target_os = "solaris"))]
const LOCK_NB: i32 = libc::LOCK_NB;
#[cfg(target_os = "solaris")]
const LOCK_NB: i32 = 4;
#[cfg(not(target_os = "solaris"))]
const LOCK_UN: i32 = libc::LOCK_UN;
#[cfg(target_os = "solaris")]
const LOCK_UN: i32 = 8;
pub(super) fn lock_shared(file: &File) -> Result<()> {
flock(file, libc::LOCK_SH)
flock(file, LOCK_SH)
}
pub(super) fn lock_exclusive(file: &File) -> Result<()> {
flock(file, libc::LOCK_EX)
flock(file, LOCK_EX)
}
pub(super) fn try_lock_shared(file: &File) -> Result<()> {
flock(file, libc::LOCK_SH | libc::LOCK_NB)
flock(file, LOCK_SH | LOCK_NB)
}
pub(super) fn try_lock_exclusive(file: &File) -> Result<()> {
flock(file, libc::LOCK_EX | libc::LOCK_NB)
flock(file, LOCK_EX | LOCK_NB)
}
pub(super) fn unlock(file: &File) -> Result<()> {
flock(file, libc::LOCK_UN)
flock(file, LOCK_UN)
}
pub(super) fn error_contended(err: &Error) -> bool {
@ -493,18 +510,18 @@ mod sys {
l_pid: 0,
l_pad: [0, 0, 0, 0],
};
flock.l_type = if flag & libc::LOCK_UN != 0 {
flock.l_type = if flag & LOCK_UN != 0 {
libc::F_UNLCK
} else if flag & libc::LOCK_EX != 0 {
} else if flag & LOCK_EX != 0 {
libc::F_WRLCK
} else if flag & libc::LOCK_SH != 0 {
} else if flag & LOCK_SH != 0 {
libc::F_RDLCK
} else {
panic!("unexpected flock() operation")
};
let mut cmd = libc::F_SETLKW;
if (flag & libc::LOCK_NB) != 0 {
if (flag & LOCK_NB) != 0 {
cmd = libc::F_SETLK;
}