summaryrefslogtreecommitdiff
path: root/src/game
diff options
context:
space:
mode:
Diffstat (limited to 'src/game')
-rw-r--r--src/game/game_text.cpp25
-rw-r--r--src/game/game_text.hpp2
2 files changed, 15 insertions, 12 deletions
diff --git a/src/game/game_text.cpp b/src/game/game_text.cpp
index 27e379077..53c6795e9 100644
--- a/src/game/game_text.cpp
+++ b/src/game/game_text.cpp
@@ -60,18 +60,11 @@ void NORETURN CDECL strgen_fatal(const char *s, ...)
/**
* Create a new container for language strings.
* @param language The language name.
+ * @param end If not NULL, terminate \a language at this position.
*/
-LanguageStrings::LanguageStrings(const char *language)
+LanguageStrings::LanguageStrings(const char *language, const char *end)
{
- const char *p = strrchr(language, PATHSEPCHAR);
- if (p == NULL) {
- p = language;
- } else {
- p++;
- }
-
- const char *e = strchr(p, '.');
- this->language = e == NULL ? strdup(p) : strndup(p, e - p);
+ this->language = end == NULL ? strdup(language) : strndup(language, end - language);
}
/** Free everything. */
@@ -95,7 +88,17 @@ LanguageStrings *ReadRawLanguageStrings(const char *file)
return NULL;
}
- ret = new LanguageStrings(file);
+ const char *langname = strrchr(file, PATHSEPCHAR);
+ if (langname == NULL) {
+ langname = file;
+ } else {
+ langname++;
+ }
+
+ /* Check for invalid empty filename */
+ if (*langname == '.' || *langname == 0) return NULL;
+
+ ret = new LanguageStrings(langname, strchr(langname, '.'));
char buffer[2048];
while (to_read != 0 && fgets(buffer, sizeof(buffer), fh) != NULL) {
diff --git a/src/game/game_text.hpp b/src/game/game_text.hpp
index b367e63f9..19a31049e 100644
--- a/src/game/game_text.hpp
+++ b/src/game/game_text.hpp
@@ -26,7 +26,7 @@ struct LanguageStrings {
const char *language; ///< Name of the language (base filename).
StringList lines; ///< The lines of the file to pass into the parser/encoder.
- LanguageStrings(const char *language);
+ LanguageStrings(const char *language, const char *end = NULL);
~LanguageStrings();
};