From: Theodore Ts'o <tytso@mit.edu>
Date: Mon, 12 Apr 2004 11:26:23 +0000 (-0400)
Subject: In the blkid library, if the BLKID_FILE environment
X-Git-Tag: E2FSPROGS-1_36~183
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=7a3a386b9e6c1ad00f7fb4f57c32178974203a05;p=tools%2Fe2fsprogs.git

In the blkid library, if the BLKID_FILE environment
variable is set, use it to find the blkid.tab file if the
calling application did not supply a filename.
---

diff --git a/lib/blkid/ChangeLog b/lib/blkid/ChangeLog
index 022b4ba..4db38b0 100644
--- a/lib/blkid/ChangeLog
+++ b/lib/blkid/ChangeLog
@@ -1,3 +1,9 @@
+2004-04-12  Theodore Ts'o  <tytso@mit.edu>
+
+	* cache.c (blkid_get_cache): If the BLKID_FILE environment
+		variable is set, use it to find the blkid.tab file if the
+		calling application did not supply a filename.
+
 2004-04-03  Theodore Ts'o  <tytso@mit.edu>
 
 	* Makefile.in: Update the modtime even if subst doesn't need to
diff --git a/lib/blkid/cache.c b/lib/blkid/cache.c
index 5d824d2..d0c41ba 100644
--- a/lib/blkid/cache.c
+++ b/lib/blkid/cache.c
@@ -39,7 +39,11 @@ int blkid_get_cache(blkid_cache *ret_cache, const char *filename)
 	INIT_LIST_HEAD(&cache->bic_devs);
 	INIT_LIST_HEAD(&cache->bic_tags);
 
-	if (!filename || !strlen(filename))
+	if (filename && !strlen(filename))
+		filename = 0;
+	if (!filename)
+		filename = getenv("BLKID_FILE");
+	if (!filename)
 		filename = BLKID_CACHE_FILE;
 	cache->bic_filename = blkid_strdup(filename);