libmount: accept (deleted) path suffix in mountinfo file

Addresses: debian bug #711183
Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/libmount/src/tab_parse.c b/libmount/src/tab_parse.c
index 532f0ec04a40834689ac3508b4f7a97ef3793942..38c48fdfa14eee86048a75384bbe54faa7d19e14 100644 (file)
--- a/libmount/src/tab_parse.c
+++ b/libmount/src/tab_parse.c
@@ -174,9 +174,20 @@ static int mnt_parse_mountinfo_line(struct libmnt_fs *fs, char *s)
                        &fs->fs_optstr);
 
        if (rc >= 10) {
+               size_t sz;
+
                fs->flags |= MNT_FS_KERNEL;
                fs->devno = makedev(maj, min);
 
+               /* remove "(deleted)" suffix */
+               sz = strlen(fs->target);
+               if (sz > PATH_DELETED_SUFFIX_SZ) {
+                       char *p = fs->target + (sz - PATH_DELETED_SUFFIX_SZ);
+
+                       if (strcmp(p, PATH_DELETED_SUFFIX) == 0)
+                               *p = '\0';
+               }
+
                unmangle_string(fs->root);
                unmangle_string(fs->target);
                unmangle_string(fs->vfs_optstr);

diff --git a/tests/expected/libmount/tabfiles-parse-mountinfo b/tests/expected/libmount/tabfiles-parse-mountinfo
index 44708011dfe46181bed44ed5dbf05a33d1f16b8e..c8390ac4ee055974ffa45b47f5a7f528a38a4476 100644 (file)
--- a/tests/expected/libmount/tabfiles-parse-mountinfo
+++ b/tests/expected/libmount/tabfiles-parse-mountinfo
@@ -350,3 +350,14 @@ root:   /
 id:     47
 parent: 20
 devno:  0:38
+------ fs:
+source: /fooooo
+target: /mnt/foo
+fstype: bar
+optstr: rw,relatime
+VFS-optstr: rw,relatime
+FS-opstr: rw
+root:   /
+id:     48
+parent: 20
+devno:  0:39

diff --git a/tests/ts/libmount/files/mountinfo b/tests/ts/libmount/files/mountinfo
index ff1e664a84cdf905e493e6c6753eb45c87a8a9a1..475ea1a337a1fbac13a60841775b2067274ac0be 100644 (file)
--- a/tests/ts/libmount/files/mountinfo
+++ b/tests/ts/libmount/files/mountinfo
@@ -30,3 +30,4 @@
 44 41 0:36 / /home/kzak/.gvfs rw,nosuid,nodev,relatime - fuse.gvfs-fuse-daemon gvfs-fuse-daemon rw,user_id=500,group_id=500
 45 20 0:37 / /var/lib/nfs/rpc_pipefs rw,relatime - rpc_pipefs sunrpc rw
 47 20 0:38 / /mnt/sounds rw,relatime - cifs //foo.home/bar/ rw,unc=\\foo.home\bar,username=kzak,domain=SRGROUP,uid=0,noforceuid,gid=0,noforcegid,addr=192.168.111.1,posixpaths,serverino,acl,rsize=16384,wsize=57344
+48 20 0:39 / /mnt/foo\040(deleted) rw,relatime - bar /fooooo rw