Merge pull request #357 from eminence/fix_pasta_mountinfo

Fix parsing for mountinfo and related fields when presented with empty fields

Author: eminence

procfs-core/src/mounts.rs

@@ -31,7 +31,7 @@ impl super::FromBufRead for Vec<MountEntry> {
 
         for line in r.lines() {
             let line = expect!(line);
-            let mut s = line.split_whitespace();
+            let mut s = line.split(' '); // not using split_whitespace because we might have empty fields
 
             let fs_spec = unmangle_octal(expect!(s.next()));
             let fs_file = unmangle_octal(expect!(s.next()));
@@ -104,4 +104,13 @@ Downloads /media/sf_downloads vboxsf rw,nodev,relatime,iocharset=utf8,uid=0,gid=
     let cursor = Cursor::new(s);
     let mounts = Vec::<MountEntry>::from_buf_read(cursor).unwrap();
     assert_eq!(mounts.len(), 4);
+
+    // https://github.com/eminence/procfs/issues/333
+    let s = " / tmpfs ro,nosuid,nodev,noexec,relatime,size=0k,nr_inodes=2,uid=1000,gid=1000,inode64 0 0";
+    let mounts = Vec::<MountEntry>::from_buf_read(Cursor::new(s)).unwrap();
+    assert_eq!(mounts.len(), 1);
+    assert_eq!(mounts[0].fs_spec, "");
+    assert_eq!(mounts[0].fs_file, "/");
+    assert_eq!(mounts[0].fs_vfstype, "tmpfs");
+    assert!(mounts[0].fs_mntops.contains_key("ro"));
 }

procfs-core/src/process/mount.rs

@@ -128,7 +128,7 @@ pub struct MountInfo {
 
 impl MountInfo {
     pub fn from_line(line: &str) -> ProcResult<MountInfo> {
-        let mut split = line.split_whitespace();
+        let mut split = line.split(' '); // not using split_whitespace because we might have empty fields
 
         let mnt_id = expect!(from_iter(&mut split));
         let pid = expect!(from_iter(&mut split));
@@ -173,7 +173,7 @@ impl MountInfo {
         }
         let fs_type: String = expect!(from_iter(&mut split));
         let mount_source = match expect!(split.next()) {
-            "none" => None,
+            "none" | "" => None,
             x => Some(x.to_owned()),
         };
         let super_options = {
@@ -248,7 +248,7 @@ impl crate::FromBufRead for MountStats {
             if line.starts_with("device ") {
                 // line will be of the format:
                 // device proc mounted on /proc with fstype proc
-                let mut s = line.split_whitespace();
+                let mut s = line.split(' '); // not splitwhitespace because we can have some empty fields
 
                 let device = Some(expect!(s.nth(1)).to_owned());
                 let mount_point = PathBuf::from(expect!(s.nth(2)));
@@ -589,6 +589,18 @@ mod tests {
         println!("{:?}", stat);
     }
 
+    #[test]
+    fn test_mountinfo_pasta() {
+        // See https://github.com/eminence/procfs/issues/333
+        let s =
+            "303 98 0:47 / / ro,nosuid,nodev,noexec,relatime - tmpfs  ro,size=0k,nr_inodes=2,uid=1000,gid=1000,inode64";
+
+        let stat = MountInfo::from_line(s).unwrap();
+        assert_eq!(stat.fs_type, "tmpfs");
+        assert_eq!(stat.mount_source, None);
+        assert_eq!(stat.super_options.get("ro"), Some(&None));
+    }
+
     #[test]
     fn test_proc_mountstats() {
         let MountStats(simple) = FromRead::from_read(
@@ -651,5 +663,12 @@ device tmpfs mounted on /run/user/0 with fstype tmpfs
                 panic!("Failed to retrieve nfs statistics");
             }
         }
+
+        // https://github.com/eminence/procfs/issues/333
+        let MountStats(stats) = FromRead::from_read("device  mounted on / with fstype tmpfs".as_bytes()).unwrap();
+        assert_eq!(stats[0].device, Some("".to_string()));
+        assert_eq!(stats[0].mount_point, PathBuf::from("/"));
+        assert_eq!(stats[0].fs, "tmpfs");
+        assert_eq!(stats[0].statistics, None);
     }
 }