From c6f462ffacc64fd605f1860972907803db318f5f Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Mon, 17 Feb 2014 13:12:23 +0100 Subject: libmount: accept (deleted) path suffix in mountinfo file Addresses: debian bug #711183 Signed-off-by: Karel Zak --- libmount/src/tab_parse.c | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'libmount/src/tab_parse.c') diff --git a/libmount/src/tab_parse.c b/libmount/src/tab_parse.c index b72d9b343..910b4b313 100644 --- a/libmount/src/tab_parse.c +++ b/libmount/src/tab_parse.c @@ -123,6 +123,7 @@ static int mnt_parse_table_line(struct libmnt_fs *fs, char *s) */ static int mnt_parse_mountinfo_line(struct libmnt_fs *fs, char *s) { + size_t sz; int rc, end = 0; unsigned int maj, min; char *fstype = NULL, *src = NULL, *p; @@ -146,6 +147,15 @@ static int mnt_parse_mountinfo_line(struct libmnt_fs *fs, char *s) if (rc >= 7 && end > 0) s += end; + /* 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'; + } + /* (7) optional fields, terminated by " - " */ p = strstr(s, " - "); if (!p) { -- cgit v1.2.3-55-g7522