#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!" },
* lang is a two-letter code according to ISO-639-1 (or three-letter
* code according to ISO-639-2 for languages not in ISO-639-1), and
* COUNTRY is the ISO 3166 country code in all upper case.
- *
+ *
* See also:
* http://www.loc.gov/standards/iso639-2/
* http://www.loc.gov/standards/iso639-2/langhome.html
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);
}
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)
/* (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);
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) {
#endif
}
message_source = src;
- if (!(msg_type & 4) && !(format = handle_find_message(handle, format)))
+ if (!(msg_type & MSG_TYPE_NOXLATE)
+ && !(format = handle_find_message(handle, format)))
return 0;
/* fill in a buffer with the string */
input.used = 0;
size = sizeof(line);
use_color = 1;
}
- if (!size)
+ if (!size || !(msg_type & MSG_TYPE_MULTILINE))
size = DEFAULT_LINE_SIZE;
switch (msg_type & 3) {
case 0:
case 'H':
value = handle ? handle->handle : "Account";
break;
-#define SEND_LINE() do { line[pos] = 0; if (pos > 0) irc_send(src, dest, line); chars_sent += pos; pos = 0; newline_ipos = ipos; } while (0)
+#define SEND_LINE(TRUNCED) do { \
+ line[pos] = 0; \
+ if (pos > 0) { \
+ if (!(msg_type & MSG_TYPE_MULTILINE) && (pos > 1) && TRUNCED) \
+ line[pos-2] = line[pos-1] = '.'; \
+ irc_send(src, dest, line); \
+ } \
+ chars_sent += pos; \
+ pos = 0; \
+ newline_ipos = ipos; \
+ if (!(msg_type & MSG_TYPE_MULTILINE)) return chars_sent; \
+} while (0)
/* Custom expansion handled by helpfile-specific function. */
case '{':
case '(': {
break;
case HF_TABLE:
/* Must send current line, then emit table. */
- SEND_LINE();
+ SEND_LINE(0);
table_send(src, (message_dest ? message_dest->nick : dest), 0, irc_send, exp.value.table);
value = "";
break;
/* word to send is too big to send now.. what to do? */
if (pos > 0) {
/* try to put it on a separate line */
- SEND_LINE();
+ SEND_LINE(1);
} else {
/* already at start of line; only send part of it */
strncpy(line, value, avail);
}
/* if we're looking at a newline, send the accumulated text */
if (*value == '\n') {
- SEND_LINE();
+ SEND_LINE(0);
value++;
}
}
send_line:
expand_pos = pos;
expand_ipos = ipos;
- SEND_LINE();
+ SEND_LINE(0);
#undef SEND_LINE
}
return chars_sent;
va_list ap;
va_start(ap, format);
- res = vsend_message(dest->nick, src, dest->handle_info, 4, expand, format, ap);
+ res = vsend_message(dest->nick, src, dest->handle_info, 12, expand, format, ap);
va_end(ap);
return res;
}
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);
}
projects / srvx.git / blobdiff