-
-
Notifications
You must be signed in to change notification settings - Fork 2k
who: cover utmp record types from a fixture #14154
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.
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
Open
itay-raveh
wants to merge
2
commits into
uutils:main
Choose a base branch
from
itay-raveh:tests-who-utmp-records
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+204
−151
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| // This file is part of the uutils coreutils package. | ||
| // | ||
| // For the full copyright and license information, please view the LICENSE | ||
| // file that was distributed with this source code. | ||
|
|
||
| use std::mem::size_of; | ||
| use std::path::Path; | ||
|
|
||
| use uucore::utmpx; | ||
|
|
||
| const GLIBC_RESERVED_SIZE: usize = 20; | ||
| const UT_ADDR_V6_WORDS: usize = 4; | ||
| const UT_TYPE_PADDING: usize = size_of::<i32>() - size_of::<i16>(); | ||
|
|
||
| pub(crate) struct LinuxGlibcUtmpRecord { | ||
| record_type: i16, | ||
| pid: i32, | ||
| line: [u8; utmpx::UT_LINESIZE], | ||
| id: [u8; utmpx::UT_IDSIZE], | ||
| user: [u8; utmpx::UT_NAMESIZE], | ||
| host: [u8; utmpx::UT_HOSTSIZE], | ||
| termination: i16, | ||
| exit: i16, | ||
| timestamp: i32, | ||
| } | ||
|
|
||
| impl LinuxGlibcUtmpRecord { | ||
| pub(crate) fn new( | ||
| record_type: i16, | ||
| pid: i32, | ||
| line: &str, | ||
| id: &str, | ||
| user: &str, | ||
| host: &str, | ||
| ) -> Self { | ||
| Self { | ||
| record_type, | ||
| pid, | ||
| line: fixed_field(line), | ||
| id: fixed_field(id), | ||
| user: fixed_field(user), | ||
| host: fixed_field(host), | ||
| termination: 0, | ||
| exit: 0, | ||
| timestamp: 1_716_371_201, | ||
| } | ||
| } | ||
|
|
||
| #[cfg(feature = "who")] | ||
| pub(crate) fn with_exit_status(mut self, termination: i16, exit: i16) -> Self { | ||
| self.termination = termination; | ||
| self.exit = exit; | ||
| self | ||
| } | ||
|
|
||
| fn encode_into(&self, bytes: &mut Vec<u8>) { | ||
| let start = bytes.len(); | ||
| bytes.extend_from_slice(&self.record_type.to_ne_bytes()); | ||
| // glibc aligns ut_pid after the 16-bit ut_type field. | ||
| bytes.resize(bytes.len() + UT_TYPE_PADDING, 0); | ||
| bytes.extend_from_slice(&self.pid.to_ne_bytes()); | ||
| bytes.extend_from_slice(&self.line); | ||
| bytes.extend_from_slice(&self.id); | ||
| bytes.extend_from_slice(&self.user); | ||
| bytes.extend_from_slice(&self.host); | ||
| bytes.extend_from_slice(&self.termination.to_ne_bytes()); | ||
| bytes.extend_from_slice(&self.exit.to_ne_bytes()); | ||
| bytes.extend_from_slice(&0_i32.to_ne_bytes()); | ||
| bytes.extend_from_slice(&self.timestamp.to_ne_bytes()); | ||
| bytes.extend_from_slice(&0_i32.to_ne_bytes()); | ||
| for _ in 0..UT_ADDR_V6_WORDS { | ||
| bytes.extend_from_slice(&0_i32.to_ne_bytes()); | ||
| } | ||
| bytes.resize(bytes.len() + GLIBC_RESERVED_SIZE, 0); | ||
| assert_eq!(bytes.len() - start, size_of::<libc::utmpx>()); | ||
| } | ||
| } | ||
|
|
||
| fn fixed_field<const N: usize>(value: &str) -> [u8; N] { | ||
| assert!(value.len() <= N); | ||
| let mut field = [0; N]; | ||
| field[..value.len()].copy_from_slice(value.as_bytes()); | ||
| field | ||
| } | ||
|
|
||
| pub(crate) fn write_linux_glibc_utmp(path: &Path, records: &[LinuxGlibcUtmpRecord]) { | ||
| let mut bytes = Vec::with_capacity(size_of::<libc::utmpx>() * records.len()); | ||
| for record in records { | ||
| record.encode_into(&mut bytes); | ||
| } | ||
| std::fs::write(path, bytes).unwrap(); | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why do we need a new file ? it can't be in who ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I wanted to use
LinuxGlibcUtmpRecordandwrite_linux_glibc_utmpin both places, so I created a shared file. Do you preferuptimeimport fromwho?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ok, makes sense, thanks