Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix build and tests for uptime on OpenBSD #9158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 7, 2025
Merged

Fix build and tests for uptime on OpenBSD #9158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e0af9af
uptime: fix build errors on OpenBSD
lcheylus Nov 6, 2025
7b1fbc0
tests: fix error for uptime on OpenBSD
lcheylus Nov 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/uu/uptime/src/uptime.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ fn uptime_with_file(file_path: &OsString) -> UResult<()> {

#[cfg(target_os = "openbsd")]
{
let upsecs = get_uptime(None);
let upsecs = get_uptime(None)?;
if upsecs >= 0 {
print_uptime(Some(upsecs))?;
} else {
Expand Down
32 changes: 14 additions & 18 deletions src/uucore/src/lib/features/uptime.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ pub fn get_uptime(_boot_time: Option<time_t>) -> UResult<i64> {

Ok(uptime)
} else {
Err(UptimeError::SystemUptime)
Err(UptimeError::SystemUptime)?
}
}

Expand Down Expand Up @@ -213,27 +213,23 @@ pub fn get_nusers() -> usize {
pub fn get_nusers(file: &str) -> usize {
use utmp_classic::{UtmpEntry, parse_from_path};

let mut nusers = 0;

let entries = match parse_from_path(file) {
Some(e) => e,
None => return 0,
Ok(e) => e,
Err(_) => return 0,
};

for entry in entries {
if let UtmpEntry::UTMP {
line: _,
user,
host: _,
time: _,
} = entry
{
if !user.is_empty() {
nusers += 1;
}
}
if entries.is_empty() {
return 0;
}
nusers

// Count entries that have a non-empty user field
entries
.iter()
.filter_map(|entry| match entry {
UtmpEntry::UTMP { user, .. } if !user.is_empty() => Some(()),
_ => None,
})
.count()
}

/// Get the number of users currently logged in
Expand Down
1 change: 0 additions & 1 deletion tests/by-util/test_uptime.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
// spell-checker:ignore bincode serde utmp runlevel testusr testx
#![allow(clippy::cast_possible_wrap, clippy::unreadable_literal)]

#[cfg(not(target_os = "openbsd"))]
use uutests::at_and_ucmd;
use uutests::util::TestScenario;
use uutests::{new_ucmd, util_name};
Expand Down
Loading