ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

libmount: support name=value for mnt_match_options() 

$ findmnt --options mode=755
TARGET         SOURCE FSTYPE   OPTIONS
/sys/fs/cgroup tmpfs  tmpfs    rw,nosuid,nodev,noexec,relatime,mode=755
/dev           udev   devtmpfs rw,relatime,size=1983516k,nr_inodes=495879,mode=755

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2016-12-20 16:01:22 +01:00
parent db17f201b8
commit 7d395c75d1
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libmount/src/optstr.c
View File

@ -1113,8 +1113,8 @@ int mnt_optstr_fix_user(char **optstr)
int mnt_match_options(const char *optstr, const char *pattern)
{
char *name, *pat = (char *) pattern;
char *buf;
size_t namesz = 0, valsz = 0;
char *buf, *patval;
size_t namesz = 0, patvalsz = 0;
int match = 1;
if (!pattern && !optstr)
@ -1128,10 +1128,11 @@ int mnt_match_options(const char *optstr, const char *pattern)
/* walk on pattern string
*/
while (match && !mnt_optstr_next_option(&pat, &name, &namesz, NULL, &valsz)) {
while (match && !mnt_optstr_next_option(&pat, &name, &namesz,
&patval, &patvalsz)) {
char *val;
size_t sz;
int no = 0;
int no = 0, rc;
if (*name == '+')
name++, namesz--;
@ -1140,7 +1141,14 @@ int mnt_match_options(const char *optstr, const char *pattern)
xstrncpy(buf, name, namesz + 1);
switch (mnt_optstr_get_option(optstr, buf, &val, &sz)) {
rc = mnt_optstr_get_option(optstr, buf, &val, &sz);
/* check also value (if the pattern is "foo=value") */
if (rc == 0 && patvalsz > 0 &&
(patvalsz != sz || strncmp(patval, val, sz) != 0))
rc = 1;
switch (rc) {
case 0: /* found */
match = no == 0 ? 1 : 0;
break;