fix compile errors on readdir()-deficient platforms

[srvx.git] / src / helpfile.c

diff --git a/src/helpfile.c b/src/helpfile.c
index 709e37cbb516f06f8b44d85952ab8c7b0fb08bb3..a08c7b7316f0a7abcbb3d8bb1014deb61fa25e91 100644 (file)
--- a/src/helpfile.c
+++ b/src/helpfile.c
@@ -24,7 +24,13 @@
 #include "modcmd.h"
 #include "nickserv.h"
 
+#if defined(HAVE_DIRENT_H)
 #include <dirent.h>
+#endif
+
+#if defined(HAVE_SYS_STAT_H)
+#include <sys/stat.h>
+#endif
 
 static const struct message_entry msgtab[] = {
     { "HFMSG_MISSING_HELPFILE", "The help file could not be found.  Sorry!" },
@@ -137,7 +143,7 @@ static void language_set_messages(struct language *lang, dict_t dict)
             log_module(MAIN_LOG, LOG_WARNING, "Unsupported record type for message %s in language %s", msgid, lang->name);
             continue;
         }
-        dict_insert(lang->messages, msgid, msg);
+        dict_insert(lang->messages, strdup(msgid), msg);
         it = iter_next(it);
         it2 = iter_next(it2);
     }
@@ -145,7 +151,8 @@ static void language_set_messages(struct language *lang, dict_t dict)
         missing++;
         it2 = iter_next(it2);
     }
-    log_module(MAIN_LOG, LOG_WARNING, "In language %s, %d extra and %d missing messages", lang->name, extra, missing);
+    if (extra || missing)
+        log_module(MAIN_LOG, LOG_WARNING, "In language %s, %d extra and %d missing messages.", lang->name, extra, missing);
 }
 
 static struct language *language_read(const char *name)
@@ -188,6 +195,7 @@ static struct language *language_read(const char *name)
     /* (Re-)initialize the language's dicts. */
     dict_delete(lang->messages);
     lang->messages = dict_new();
+    dict_set_free_keys(lang->messages, free);
     dict_set_free_data(lang->messages, free);
     lang->helpfiles = dict_new();
     dict_set_free_data(lang->helpfiles, language_free_helpfile);
@@ -219,34 +227,26 @@ static void language_read_list(void)
 
     if (!(dir = opendir("languages")))
         return;
-    while ((dirent = readdir(dir)))
-        language_alloc(dirent->d_name);
-    closedir(dir);
-}
-
-static void language_read_all(void)
-{
-    struct string_list *slist;
-    struct dirent *dirent;
-    DIR *dir;
-    unsigned int ii;
-
-    /* Read into an in-memory list and sort so we are likely to load
-     * parent languages before their children (de_DE sorts after de).
-     */
-    if (!(dir = opendir("languages")))
-        return;
-    slist = alloc_string_list(4);
-    while ((dirent = readdir(dir)))
-        string_list_append(slist, strdup(dirent->d_name));
-    closedir(dir);
-    string_list_sort(slist);
-    for (ii = 0; ii < slist->used; ++ii) {
-        if (!strcmp(slist->list[ii], ".") || !strcmp(slist->list[ii], ".."))
+    while ((dirent = readdir(dir))) {
+        if (dirent->d_name[0] == '.')
+            continue;
+#ifdef HAVE_DIRENT_D_TYPE
+        if (dirent->d_type != DT_DIR)
             continue;
-        language_read(slist->list[ii]);
+#else
+        {
+            char namebuf[MAXLEN];
+            struct stat sbuf;
+            snprintf(namebuf, sizeof(namebuf), "languages/%s", dirent->d_name);
+            if (stat(namebuf, &sbuf) < 0)
+                continue;
+            if (!S_ISDIR(sbuf.st_mode))
+                continue;
+        }
+#endif
+        language_alloc(dirent->d_name);
     }
-    free_string_list(slist);
+    closedir(dir);
 }
 
 const char *language_find_message(struct language *lang, const char *msgid) {
@@ -1024,6 +1024,8 @@ void helpfile_init(void)
 
 void helpfile_finalize(void)
 {
-    language_read_all();
+    dict_iterator_t it;
+    for (it = dict_first(languages); it; it = iter_next(it))
+        language_read(iter_key(it));
     reg_exit_func(language_cleanup);
 }