From: Karel Zak <kzak@redhat.com>
Date: Tue, 29 Sep 2009 09:08:32 +0000 (+0200)
Subject: libblkid: fix the default cache file path
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3bb52100378944c7c877143e4732940fe3abf250;p=util-linux

libblkid: fix the default cache file path

The blkid_get_cache_filename() can returns BLKID_CONFIG_FILE instead
BLKID_CACHE_FILE. Yeah, pretty stupid typo.

Fortunately, this brown-paper-bag bug is invisible in almost all cases,
because the default path is returned by blkid_read_config().  The bug
can be visible only when blkid_read_config() returns NULL -- it means
on parses or malloc error.

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

diff --git a/shlibs/blkid/src/cache.c b/shlibs/blkid/src/cache.c
index acdf96dd..19941ff0 100644
--- a/shlibs/blkid/src/cache.c
+++ b/shlibs/blkid/src/cache.c
@@ -110,7 +110,7 @@ char *blkid_get_cache_filename(struct blkid_config *conf)
 	else {
 		struct blkid_config *c = blkid_read_config(NULL);
 		if (!c)
-			filename = blkid_strdup(BLKID_CONFIG_FILE);
+			filename = blkid_strdup(BLKID_CACHE_FILE);
 		else {
 			filename = c->cachefile;  /* already allocated */
 			c->cachefile = NULL;