From b9f111b93f9f442f00266f338b14f25ca8685352 Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Sun, 11 Jan 2015 00:04:00 -0500 Subject: Support negated fstab options We would ignore options like "fail" and "auto", and for any option which takes a value the first assignment would win. Repeated and options equivalent to the default are rarely used, but they have been documented forever, and people might use them. Especially on the kernel command line it is easier to append a repeated or negated option at the end. --- src/shared/fstab-util.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'src/shared/fstab-util.h') diff --git a/src/shared/fstab-util.h b/src/shared/fstab-util.h index 39ddb71ef4..9f6b32eaf4 100644 --- a/src/shared/fstab-util.h +++ b/src/shared/fstab-util.h @@ -23,6 +23,7 @@ #include #include +#include "macro.h" int fstab_filter_options(const char *opts, const char *names, const char **namefound, char **value, char **filtered); @@ -32,3 +33,16 @@ static inline bool fstab_test_option(const char *opts, const char *names) { } int fstab_find_pri(const char *options, int *ret); + +static inline bool fstab_test_yes_no_option(const char *opts, const char *yes_no) { + int r; + const char *opt; + + /* If first name given is last, return 1. + * If second name given is last or neither is found, return 0. */ + + r = fstab_filter_options(opts, yes_no, &opt, NULL, NULL); + assert(r >= 0); + + return opt == yes_no; +} -- cgit v1.2.3-54-g00ecf