From 3fe99420177809180ccd3d6cf117b37fe8d6f9bc Mon Sep 17 00:00:00 2001
From: Lukas Fleischer <calcurse@cryptocrack.de>
Date: Sun, 27 Jul 2014 10:53:03 +0200
Subject: Fix find_basedir() and display_help()
Fixes two regressions introduced in 21fc7a4 (Replace several uses of
snprintf() by asprintf(), 2014-07-21).
Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
---
src/help.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
(limited to 'src')
diff --git a/src/help.c b/src/help.c
index fe144f4..13a49fc 100644
--- a/src/help.c
+++ b/src/help.c
@@ -72,7 +72,7 @@ static int find_basedir(const char *locale_info[], unsigned n, char **basedir)
}
mem_free(*basedir);
- basedir = NULL;
+ *basedir = NULL;
mem_free(locale);
locale = NULL;
}
@@ -98,10 +98,8 @@ int display_help(const char *topic)
if (!topic)
topic = "intro";
- if (!find_basedir(locale_info, ARRAY_SIZE(locale_info), &basedir)) {
- mem_free(basedir);
+ if (!find_basedir(locale_info, ARRAY_SIZE(locale_info), &basedir))
asprintf(&basedir, "%s", DOCDIR);
- }
asprintf(&path, "%s/%s.txt", basedir, topic);
--
cgit v1.2.3-70-g09d2