X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/fc04d4b48a0a464a9fc3570e674c17ad81c3134d..c3a3a1b1b68706df40dc022bdcdf8ede684f5956:/apt-pkg/aptconfiguration.cc

diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc
index 429219cbd..2acf8dd9f 100644
--- a/apt-pkg/aptconfiguration.cc
+++ b/apt-pkg/aptconfiguration.cc
@@ -152,6 +152,7 @@ std::vector<std::string> const Configuration::getLanguages(bool const &All,
 			builtin.push_back(c);
 		}
 	}
+	closedir(D);
 
 	// get the environment language codes: LC_MESSAGES (and later LANGUAGE)
 	// we extract both, a long and a short code and then we will
@@ -217,9 +218,10 @@ std::vector<std::string> const Configuration::getLanguages(bool const &All,
 		environment.push_back(envLong);
 	environment.push_back(envShort);
 	// take care of LANGUAGE
-	string envLang = Locale == 0 ? getenv("LANGUAGE") : *(Locale+1);
+	const char *language_env = getenv("LANGUAGE") == 0 ? "" : getenv("LANGUAGE");
+	string envLang = Locale == 0 ? language_env : *(Locale+1);
 	if (envLang.empty() == false) {
-		std::vector<string> env = ExplodeString(envLang,':');
+		std::vector<string> env = VectorizeString(envLang,':');
 		short addedLangs = 0; // add a maximum of 3 fallbacks from the environment
 		for (std::vector<string>::const_iterator e = env.begin();
 		     e != env.end() && addedLangs < 3; ++e) {