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

Make the other field variable length, it can now be many fields or be missing entirely

Browse Source
This commit is contained in:
Dietrich 2020-09-29 14:19:40 +02:00
parent a25092c7a0
commit 020a95920e
2 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
/target /target
.vscode .vscode
launch.json launch.json
*.orig

42
src/passwd.rs
View File

@ -43,7 +43,7 @@ pub enum Gecos<'a> {
room: &'a str, room: &'a str,
phone_work: &'a str, phone_work: &'a str,
phone_home: &'a str, phone_home: &'a str,
other: &'a str, other: Vec<&'a str>,
}, },
Simple { Simple {
comment: &'a str, comment: &'a str,
@ -168,8 +168,8 @@ impl<'a> Gecos<'a> {
} }
} }
#[must_use] #[must_use]
pub const fn get_other(&'a self) -> Option<&'a str> { pub const fn get_other(&'a self) -> Option<&Vec<&'a str>> {
match *self { match self {
Gecos::Simple { .. } => None, Gecos::Simple { .. } => None,
Gecos::Detail { other, .. } => Some(other), Gecos::Detail { other, .. } => Some(other),
} }
@ -283,7 +283,11 @@ impl Display for Gecos<'_> {
} => write!( } => write!(
f, f,
"{},{},{},{},{}", "{},{},{},{},{}",
full_name, room, phone_work, phone_home, other full_name,
room,
phone_work,
phone_home,
other.join(",")
), ),
} }
} }
@ -293,21 +297,13 @@ impl<'a> TryFrom<&'a str> for Gecos<'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> {
let vals: Vec<&str> = source.split(',').collect(); let vals: Vec<&str> = source.split(',').collect();
if vals.len() == 5 { if vals.len() > 3 {
Ok(Gecos::Detail { Ok(Gecos::Detail {
full_name: vals.get(0).unwrap(), full_name: vals[0],
room: vals.get(1).unwrap(), room: vals[1],
phone_work: vals.get(2).unwrap(), phone_work: vals[2],
phone_home: vals.get(3).unwrap(), phone_home: vals[3],
other: vals.get(4).unwrap(), other: vals[4..].to_vec(),
})
} else if vals.len() == 4 {
Ok(Gecos::Detail {
full_name: vals.get(0).unwrap(),
room: vals.get(1).unwrap(),
phone_work: vals.get(2).unwrap(),
phone_home: vals.get(3).unwrap(),
other: "",
}) })
} else if vals.len() == 1 { } else if vals.len() == 1 {
Ok(Gecos::Simple { Ok(Gecos::Simple {
@ -381,7 +377,7 @@ fn test_parse_gecos() {
assert_eq!(room, "504"); assert_eq!(room, "504");
assert_eq!(phone_work, "11345342"); assert_eq!(phone_work, "11345342");
assert_eq!(phone_home, "ä1-2312"); assert_eq!(phone_home, "ä1-2312");
assert_eq!(other, "myemail@test.com"); assert_eq!(other[0], "myemail@test.com");
} }
_ => unreachable!(), _ => unreachable!(),
} }
@ -397,7 +393,7 @@ fn test_parse_gecos() {
assert_eq!(room, ""); assert_eq!(room, "");
assert_eq!(phone_work, ""); assert_eq!(phone_work, "");
assert_eq!(phone_home, ""); assert_eq!(phone_home, "");
assert_eq!(other, ""); assert_eq!(other.len(), 0);
} }
_ => unreachable!(), _ => unreachable!(),
} }
@ -436,7 +432,7 @@ fn test_new_from_string() {
assert_eq!(room, "004"); assert_eq!(room, "004");
assert_eq!(phone_work, "000342"); assert_eq!(phone_work, "000342");
assert_eq!(phone_home, "001-2312"); assert_eq!(phone_home, "001-2312");
assert_eq!(other, "myemail@test.com"); assert_eq!(other[0], "myemail@test.com");
} }
_ => unreachable!(), _ => unreachable!(),
} }
@ -454,8 +450,8 @@ fn test_parse_passwd() {
let lineorig: String = line.unwrap(); let lineorig: String = line.unwrap();
assert_eq!( assert_eq!(
// ignoring the numbers of `,` since the implementation does not (yet) reproduce a missing comment field. // ignoring the numbers of `,` since the implementation does not (yet) reproduce a missing comment field.
format!("{}", Passwd::new_from_string(&lineorig.clone()).unwrap()).replace(",", ""), format!("{}", Passwd::new_from_string(&lineorig.clone()).unwrap()),
lineorig.replace(",", "") lineorig
); );
} }
} }