update TODO

[thirdparty/systemd.git] / src / shared / fstab-util.h

diff --git a/src/shared/fstab-util.h b/src/shared/fstab-util.h
index 5ebea4401983ec770e97ce998b847f3778081979..a73575e95c88b095873f4461de3dab4f4560329d 100644 (file)
--- a/src/shared/fstab-util.h
+++ b/src/shared/fstab-util.h
@@ -1,32 +1,14 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
+/* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-/***
-  This file is part of systemd.
-
-  Copyright 2015 Zbigniew Jędrzejewski-Szmek
-
-  systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License as published by
-  the Free Software Foundation; either version 2.1 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-***/
-
 #include <stdbool.h>
 #include <stddef.h>
 
 #include "macro.h"
 
-bool fstab_is_mount_point(const char *mount);
+bool fstab_is_extrinsic(const char *mount, const char *opts);
+int fstab_is_mount_point(const char *mount);
+int fstab_has_fstype(const char *fstype);
 
 int fstab_filter_options(const char *opts, const char *names, const char **namefound, char **value, char **filtered);
 
@@ -39,16 +21,18 @@ 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);
+        assert_se(fstab_filter_options(opts, yes_no, &opt, NULL, NULL) >= 0);
 
         return opt == yes_no;
 }
 
 char *fstab_node_to_udev_node(const char *p);
+
+static inline const char* fstab_path(void) {
+        return secure_getenv("SYSTEMD_FSTAB") ?: "/etc/fstab";
+}