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

misc-tools/findmnt: add --pseudo, --real filters

This commit is contained in:
sluidfoe 2018-05-08 13:08:47 -05:00
parent c9fdebcf54
commit 4c856a471e
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
misc-utils/findmnt.c
View File

@ -947,6 +947,12 @@ static int match_func(struct libmnt_fs *fs,
return rc;
}
if ((flags & FL_REAL) && mnt_fs_is_pseudofs(fs))
return rc;
if ((flags & FL_PSEUDO) && !mnt_fs_is_pseudofs(fs))
return rc;
return !rc;
}
@ -1229,8 +1235,10 @@ static void __attribute__((__noreturn__)) usage(void)
fputs(_(" -o, --output <list> the output columns to be shown\n"), out);
fputs(_(" --output-all output all available columns\n"), out);
fputs(_(" -P, --pairs use key=\"value\" output format\n"), out);
fputs(_(" --pseudo print only pseudo-filesystems\n"), out);
fputs(_(" -R, --submounts print all submounts for the matching filesystems\n"), out);
fputs(_(" -r, --raw use raw output format\n"), out);
fputs(_(" --real print only real filesystems\n"), out);
fputs(_(" -S, --source <string> the device to mount (by name, maj:min, \n"
" LABEL=, UUID=, PARTUUID=, PARTLABEL=)\n"), out);
fputs(_(" -T, --target <path> the path to the filesystem to use\n"), out);
@ -1274,7 +1282,9 @@ int main(int argc, char *argv[])
enum {
FINDMNT_OPT_VERBOSE = CHAR_MAX + 1,
FINDMNT_OPT_TREE,
FINDMNT_OPT_OUTPUT_ALL
FINDMNT_OPT_OUTPUT_ALL,
FINDMNT_OPT_PSEUDO,
FINDMNT_OPT_REAL
};
static const struct option longopts[] = {
@ -1316,6 +1326,8 @@ int main(int argc, char *argv[])
{ "version", no_argument, NULL, 'V' },
{ "verbose", no_argument, NULL, FINDMNT_OPT_VERBOSE },
{ "tree", no_argument, NULL, FINDMNT_OPT_TREE },
{ "real", no_argument, NULL, FINDMNT_OPT_REAL },
{ "pseudo", no_argument, NULL, FINDMNT_OPT_PSEUDO },
{ NULL, 0, NULL, 0 }
};
@ -1328,6 +1340,7 @@ int main(int argc, char *argv[])
{ 'P','l','r','x' }, /* pairs,list,raw,verify */
{ 'p','x' }, /* poll,verify */
{ 'm','p','s' }, /* mtab,poll,fstab */
{ FINDMNT_OPT_PSEUDO, FINDMNT_OPT_REAL },
{ 0 }
};
int excl_st[ARRAY_SIZE(excl)] = UL_EXCL_STATUS_INIT;
@ -1489,6 +1502,12 @@ int main(int argc, char *argv[])
case FINDMNT_OPT_TREE:
force_tree = 1;
break;
case FINDMNT_OPT_PSEUDO:
flags |= FL_PSEUDO;
break;
case FINDMNT_OPT_REAL:
flags |= FL_REAL;
break;
default:
errtryhelp(EXIT_FAILURE);
}

2
misc-utils/findmnt.h
View File

@ -18,6 +18,8 @@ enum {
FL_NOCACHE = (1 << 14),
FL_STRICTTARGET = (1 << 15),
FL_VERBOSE = (1 << 16),
FL_PSEUDO = (1 << 17),
FL_REAL = (1 << 18),
/* basic table settings */
FL_ASCII = (1 << 20),