From: Karel Zak <kzak@redhat.com>
Date: Thu, 18 Aug 2022 10:27:09 +0000 (+0200)
Subject: libmount: (optlist) add mnt_optlist_strdup_optstr()
X-Git-Tag: v2.39-rc1~311
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d6e8427d1ca20a4283d592e7f518d36c4a3fab12;p=thirdparty%2Futil-linux.git

libmount: (optlist) add mnt_optlist_strdup_optstr()

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/libmount/src/mountP.h b/libmount/src/mountP.h
index 6b6f91fccd..9a0727d1be 100644
--- a/libmount/src/mountP.h
+++ b/libmount/src/mountP.h
@@ -526,6 +526,8 @@ extern int mnt_optlist_get_flags(struct libmnt_optlist *ls, unsigned long *flags
                           const struct libmnt_optmap *map, unsigned int what);
 extern int mnt_optlist_get_optstr(struct libmnt_optlist *ol, const char **optstr,
                         const struct libmnt_optmap *map, unsigned int what);
+extern int mnt_optlist_strdup_optstr(struct libmnt_optlist *ls, char **optstr,
+                        const struct libmnt_optmap *map, unsigned int what);
 
 extern int mnt_optlist_get_propagation(struct libmnt_optlist *ls);
 extern int mnt_optlist_is_propagation_only(struct libmnt_optlist *ls);
diff --git a/libmount/src/optlist.c b/libmount/src/optlist.c
index 7d66d1aa31..d480eb9950 100644
--- a/libmount/src/optlist.c
+++ b/libmount/src/optlist.c
@@ -622,14 +622,13 @@ int mnt_optlist_get_flags(struct libmnt_optlist *ls, unsigned long *flags,
 	return 0;
 }
 
-int mnt_optlist_get_optstr(struct libmnt_optlist *ls, const char **optstr,
+int mnt_optlist_strdup_optstr(struct libmnt_optlist *ls, char **optstr,
 			const struct libmnt_optmap *map, unsigned int what)
 {
 	struct libmnt_iter itr;
 	struct libmnt_opt *opt;
 	struct ul_buffer buf = UL_INIT_BUFFER;
-	size_t idx = 0;
-	char *str = NULL, **cache = NULL;
+	char *str = NULL;
 	int rc = 0;
 
 	if (!ls || !optstr)
@@ -637,32 +636,6 @@ int mnt_optlist_get_optstr(struct libmnt_optlist *ls, const char **optstr,
 
 	*optstr = NULL;
 
-	switch (what) {
-	case MNT_OL_FLTR_DFLT:
-		if (map) {
-			idx = optlist_get_mapidx(ls, map);
-			if (idx == (size_t) -1)
-				return -EINVAL;
-			if (ls->cache_mapped[idx])
-				cache = &ls->cache_mapped[idx];
-		} else
-			cache = &ls->cache_all[MNT_OL_FLTR_DFLT];
-		break;
-	case MNT_OL_FLTR_ALL:
-		cache = &ls->cache_all[MNT_OL_FLTR_ALL];
-		break;
-	case MNT_OL_FLTR_UNKNOWN:
-		cache = &ls->cache_all[MNT_OL_FLTR_UNKNOWN];
-		break;
-	default:
-		return -EINVAL;
-	}
-
-	if (cache && *cache) {
-		str = *cache;
-		goto done;
-	}
-
 	/* For generic options stings ro/rw is expected at the begining */
 	if (!map && (what == MNT_OL_FLTR_DFLT || what == MNT_OL_FLTR_ALL)) {
 		opt = mnt_optlist_get_opt(ls, MS_RDONLY, ls->linux_map);
@@ -674,10 +647,8 @@ int mnt_optlist_get_optstr(struct libmnt_optlist *ls, const char **optstr,
 	mnt_reset_iter(&itr, MNT_ITER_FORWARD);
 
 	while (mnt_optlist_next_opt(ls, &itr, &opt) == 0) {
-
 		if (!opt->name)
 			continue;
-
 		if (opt->map == ls->linux_map && opt->ent->id == MS_RDONLY)
 			continue;
 
@@ -705,20 +676,65 @@ int mnt_optlist_get_optstr(struct libmnt_optlist *ls, const char **optstr,
 	}
 
 	str = ul_buffer_get_data(&buf, NULL, NULL);
-
-	if (cache)
-		*cache = str;
-done:
 	if (optstr)
 		*optstr = str;
-
-	DBG(OPTLIST, ul_debugobj(ls, "return optstr %s", str));
 	return 0;
 fail:
 	ul_buffer_free_data(&buf);
 	return rc;
 }
 
+int mnt_optlist_get_optstr(struct libmnt_optlist *ls, const char **optstr,
+			const struct libmnt_optmap *map, unsigned int what)
+{
+	size_t idx = 0;
+	char **cache = NULL;
+	int rc = 0;
+
+	if (!ls || !optstr)
+		return -EINVAL;
+
+	*optstr = NULL;
+
+	switch (what) {
+	case MNT_OL_FLTR_DFLT:
+		if (map) {
+			idx = optlist_get_mapidx(ls, map);
+			if (idx == (size_t) -1)
+				return -EINVAL;
+			cache = &ls->cache_mapped[idx];
+		} else
+			cache = &ls->cache_all[MNT_OL_FLTR_DFLT];
+		break;
+	case MNT_OL_FLTR_ALL:
+		cache = &ls->cache_all[MNT_OL_FLTR_ALL];
+		break;
+	case MNT_OL_FLTR_UNKNOWN:
+		cache = &ls->cache_all[MNT_OL_FLTR_UNKNOWN];
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	assert(cache);
+
+	if (!*cache) {
+		char *str = NULL;
+
+		rc = mnt_optlist_strdup_optstr(ls, &str, map, what);
+		if (rc)
+			return rc;
+		*cache = str;
+		DBG(OPTLIST, ul_debugobj(ls, " optstr %s", str));
+	} else {
+		DBG(OPTLIST, ul_debugobj(ls, " optstr %s (cached)", *cache));
+	}
+
+	if (optstr)
+		*optstr = *cache;
+	return 0;
+}
+
 int mnt_optlist_get_propagation(struct libmnt_optlist *ls)
 {
 	return ls ? ls->propagation : 0;
@@ -956,22 +972,31 @@ static int test_get_str(struct libmnt_test *ts, int argc, char *argv[])
 	map = get_map(argv[2]);
 	mnt_optlist_merge_opts(ol);
 
+	/* We always call mnt_optlist_get_optstr() two times to test the cache */
 	if (map) {
 		rc = mnt_optlist_get_optstr(ol, &str, map, MNT_OL_FLTR_DFLT);
+		if (!rc)
+			rc = mnt_optlist_get_optstr(ol, &str, map, MNT_OL_FLTR_DFLT);
 		if (!rc)
 			printf("Default: %s (in %s map)\n", str, argv[2]);
 	}
 
 	rc = mnt_optlist_get_optstr(ol, &str, NULL, MNT_OL_FLTR_DFLT);
+	if (!rc)
+		rc = mnt_optlist_get_optstr(ol, &str, NULL, MNT_OL_FLTR_DFLT);
 	if (!rc)
 		printf("Default: %s\n", str);
 
 
 	rc = mnt_optlist_get_optstr(ol, &str, NULL, MNT_OL_FLTR_ALL);
+	if (!rc)
+		rc = mnt_optlist_get_optstr(ol, &str, NULL, MNT_OL_FLTR_ALL);
 	if (!rc)
 		printf("All:     %s\n", str);
 
 	rc = mnt_optlist_get_optstr(ol, &str, NULL, MNT_OL_FLTR_UNKNOWN);
+	if (!rc)
+		rc = mnt_optlist_get_optstr(ol, &str, NULL, MNT_OL_FLTR_UNKNOWN);
 	if (!rc)
 		printf("Unknown: %s\n", str);
 done: