Don't parse the mount table until it's needed

1 files changed, 7 insertions, 8 deletions

diff --git a/parse.c b/parse.c
index dde22bd..6be2e97 100644
--- a/parse.c
+++ b/parse.c
@@ -1057,9 +1057,13 @@ fail:
  * Parse -fstype TYPE.
  */
 static struct expr *parse_fstype(struct parser_state *state, int arg1, int arg2) {
-	if (!state->cmdline->mtab) {
-		cfprintf(state->cmdline->cerr, "%{er}error: %s: Couldn't parse the mount table.%{rs}\n", state->argv[0]);
-		return NULL;
+	struct cmdline *cmdline = state->cmdline;
+	if (!cmdline->mtab) {
+		cmdline->mtab = parse_bfs_mtab();
+		if (!cmdline->mtab) {
+			cfprintf(cmdline->cerr, "%{er}error: Couldn't parse the mount table: %s.%{rs}\n\n", strerror(errno));
+			return NULL;
+		}
 	}
 
 	return parse_unary_test(state, eval_fstype);
@@ -2840,11 +2844,6 @@ struct cmdline *parse_cmdline(int argc, char *argv[]) {
 		goto fail;
 	}
 
-	cmdline->mtab = parse_bfs_mtab();
-	if (!cmdline->mtab) {
-		cfprintf(cmdline->cerr, "%{wr}warning: Couldn't parse the mount table: %s.%{rs}\n\n", strerror(errno));
-	}
-
 	struct parser_state state = {
 		.cmdline = cmdline,
 		.argv = argv + 1,