Rust/umanux
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

rename shell_dir -> shell_path

Browse Source
This commit is contained in:
Dietrich 2020-09-30 18:02:02 +02:00
parent 2094bb7549
commit 676a5218e6
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/passwd.rs
View File

@ -52,17 +52,19 @@ pub enum Gecos<'a> {
}, },
} }
/// The home directory of a user
#[derive(Debug, PartialEq, Eq)] #[derive(Debug, PartialEq, Eq)]
pub struct HomeDir<'a> { pub struct HomeDir<'a> {
dir: &'a str, dir: &'a str,
} }
/// The path to the Shell binary
#[derive(Debug, PartialEq, Eq)] #[derive(Debug, PartialEq, Eq)]
pub struct ShellDir<'a> { pub struct ShellPath<'a> {
shell: &'a str, shell: &'a str,
} }
/// A record in the user database `/etc/passwd`. /// A record(line) in the user database `/etc/passwd` found in most linux systems.
#[derive(Debug, PartialEq, Eq)] #[derive(Debug, PartialEq, Eq)]
pub struct Passwd<'a> { pub struct Passwd<'a> {
username: Username<'a>, /* Username. */ username: Username<'a>, /* Username. */
@ -71,7 +73,7 @@ pub struct Passwd<'a> {
gid: Gid, /* Group ID. */ gid: Gid, /* Group ID. */
gecos: Gecos<'a>, /* Real name. */ gecos: Gecos<'a>, /* Real name. */
home_dir: HomeDir<'a>, /* Home directory. */ home_dir: HomeDir<'a>, /* Home directory. */
shell_dir: ShellDir<'a>, /* Shell program. */ shell_path: ShellPath<'a>, /* Shell program. */
} }
impl<'a> Passwd<'a> { impl<'a> Passwd<'a> {
@ -97,7 +99,7 @@ impl<'a> Passwd<'a> {
gid: Gid::try_from(*elements.get(3).unwrap())?, gid: Gid::try_from(*elements.get(3).unwrap())?,
gecos: Gecos::try_from(*elements.get(4).unwrap())?, gecos: Gecos::try_from(*elements.get(4).unwrap())?,
home_dir: HomeDir::try_from(*elements.get(5).unwrap())?, home_dir: HomeDir::try_from(*elements.get(5).unwrap())?,
shell_dir: ShellDir::try_from(*elements.get(6).unwrap())?, shell_path: ShellPath::try_from(*elements.get(6).unwrap())?,
}) })
} else { } else {
Err("Failed to parse: not enough elements".into()) Err("Failed to parse: not enough elements".into())
@ -128,8 +130,8 @@ impl<'a> Passwd<'a> {
self.home_dir.dir self.home_dir.dir
} }
#[must_use] #[must_use]
pub const fn get_shell_dir(&self) -> &'a str { pub const fn get_shell_path(&self) -> &'a str {
self.shell_dir.shell self.shell_path.shell
} }
} }
@ -222,7 +224,7 @@ impl Default for Passwd<'_> {
home_dir: HomeDir { home_dir: HomeDir {
dir: "/home/default", dir: "/home/default",
}, },
shell_dir: ShellDir { shell: "/bin/bash" }, shell_path: ShellPath { shell: "/bin/bash" },
} }
} }
} }
@ -238,7 +240,7 @@ impl Display for Passwd<'_> {
self.gid, self.gid,
self.gecos, self.gecos,
self.home_dir, self.home_dir,
self.shell_dir self.shell_path
) )
} }
} }
@ -364,16 +366,16 @@ impl<'a> TryFrom<&'a str> for HomeDir<'a> {
} }
} }
impl Display for ShellDir<'_> { impl Display for ShellPath<'_> {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
write!(f, "{}", self.shell,) write!(f, "{}", self.shell,)
} }
} }
impl<'a> TryFrom<&'a str> for ShellDir<'a> { impl<'a> TryFrom<&'a str> for ShellPath<'a> {
type Error = UserLibError; type Error = UserLibError;
fn try_from(source: &'a str) -> std::result::Result<Self, Self::Error> { fn try_from(source: &'a str) -> std::result::Result<Self, Self::Error> {
Ok(Self { shell: source }) Ok(ShellPath { shell: source })
} }
} }