X-Git-Url: https://jfr.im/git/irc/evilnet/x3.git/blobdiff_plain/6240cb1987b893432fafa2ad23e79ff437b5f40d..8536ac6b661fa261bad7de981045401f514fb6b7:/src/helpfile.c diff --git a/src/helpfile.c b/src/helpfile.c index c97eb13..91e8f28 100644 --- a/src/helpfile.c +++ b/src/helpfile.c @@ -3,9 +3,9 @@ * * This file is part of x3. * - * srvx is free software; you can redistribute it and/or modify + * x3 is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -23,6 +23,7 @@ #include "log.h" #include "modcmd.h" #include "nickserv.h" +#include "spamserv.h" #if defined(HAVE_DIRENT_H) #include @@ -41,13 +42,13 @@ static const struct message_entry msgtab[] = { #define DEFAULT_LINE_SIZE MAX_LINE_SIZE #define DEFAULT_TABLE_SIZE 80 -extern struct userNode *global, *chanserv, *opserv, *nickserv; +extern struct userNode *global, *chanserv, *opserv, *nickserv, *spamserv; struct userNode *message_dest; struct userNode *message_source; struct language *lang_C; struct dict *languages; -static void language_cleanup(void) +static void language_cleanup(UNUSED_ARG(void *extra)) { dict_delete(languages); } @@ -171,8 +172,10 @@ static struct language *language_read(const char *name) /* Open the directory stream; if we can't, fail. */ snprintf(filename, sizeof(filename), "languages/%s", name); - if (!(dir = opendir(filename))) + if (!(dir = opendir(filename))) { + log_module(MAIN_LOG, LOG_ERROR, "Unable to open language directory languages/%s: %s", name, strerror(errno)); return NULL; + } if (!(lang = dict_find(languages, name, NULL))) lang = language_alloc(name); @@ -203,7 +206,7 @@ static struct language *language_read(const char *name) /* Read all the translations from the directory. */ while ((dirent = readdir(dir))) { snprintf(filename, sizeof(filename), "languages/%s/%s", name, dirent->d_name); - if (!strcmp(dirent->d_name,"parent")) { + if (!strcmp(dirent->d_name, "parent")) { continue; } else if (!strcmp(dirent->d_name, "strings.db")) { dict = parse_database(filename); @@ -222,29 +225,30 @@ static struct language *language_read(const char *name) static void language_read_list(void) { + struct stat sbuf; struct dirent *dirent; DIR *dir; + char namebuf[MAXLEN]; if (!(dir = opendir("languages"))) return; while ((dirent = readdir(dir))) { if (dirent->d_name[0] == '.') continue; -#ifdef HAVE_DIRENT_D_TYPE - if (dirent->d_type != DT_DIR) + snprintf(namebuf, sizeof(namebuf), "languages/%s", dirent->d_name); + if (!strcmp(dirent->d_name, "strings.db")) { continue; -#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); + if (stat(namebuf, &sbuf) < 0) { + log_module(MAIN_LOG, LOG_INFO, "Skipping language entry '%s' (unable to stat).", dirent->d_name); + continue; + } + if (!S_ISDIR(sbuf.st_mode)) { + log_module(MAIN_LOG, LOG_INFO, "Skipping language entry '%s' (not directory).", dirent->d_name); + continue; + } + if (!dict_find(languages, dirent->d_name, NULL)) + language_alloc(dirent->d_name); } closedir(dir); } @@ -276,7 +280,7 @@ table_send(struct userNode *from, const char *to, unsigned int size, irc_send_fu char line[MAX_LINE_SIZE+1]; struct handle_info *hi; char *sepstr = NULL; - int sepsize = 0; + unsigned int sepsize = 0; if (IsChannelName(to) || *to == '$') { message_dest = NULL; @@ -308,10 +312,18 @@ table_send(struct userNode *from, const char *to, unsigned int size, irc_send_fu if (irc_send) {} /* use that function */ - else if (hi) + else if(IsChannelName(to)) { + irc_send = irc_privmsg; + } + else if (message_dest->no_notice) { + irc_send = irc_privmsg; + } + else if (hi) { irc_send = HANDLE_FLAGGED(hi, USE_PRIVMSG) ? irc_privmsg : irc_notice; - else - irc_send = IsChannelName(to) ? irc_privmsg : irc_notice; + } + else { + irc_send = irc_notice; + } /* Limit size to how much we can show at once */ if (size > sizeof(line)) @@ -360,25 +372,34 @@ table_send(struct userNode *from, const char *to, unsigned int size, irc_send_fu line[pos++] = ' '; line[pos++] = ' '; } + line[pos++] = ' '; } line[pos] = 0; - sepsize = strlen_vis(line); - sepstr = malloc(sepsize + 1); - memset(sepstr, '-', sepsize); - sepstr[sepsize] = 0; - if(hi && hi->userlist_style != HI_STYLE_CLEAN) + + /* Dont show ---- bars in 'clean' style. */ + if(!(hi && hi->userlist_style == HI_STYLE_CLEAN)) { + //sepsize = strlen_vis(line); + sepsize = tot_width * nreps; + sepstr = malloc(sepsize + 1); + memset(sepstr, '-', sepsize); + sepstr[sepsize] = 0; irc_send(from, to, sepstr); /* ----------------- */ - irc_send(from, to, line); /* alpha beta roe */ - if(hi && hi->userlist_style != HI_STYLE_CLEAN) + } + irc_send(from, to, line); /* alpha beta roe */ + if(!(hi && hi->userlist_style == HI_STYLE_CLEAN)) irc_send(from, to, sepstr); /* ----------------- */ ii = 1; } /* Send the table. */ for (jj=0, pos=0, reps=0; ii 5) + /* Send end bar */ + if (!(table.flags & TABLE_NO_HEADERS) && + !(table.flags & TABLE_NO_FOOTER) && + !(hi && hi->userlist_style == HI_STYLE_CLEAN)) { + char endstr[MAX_LINE_SIZE+1]; + sprintf(endstr, "End (%d rows)", table.length-1); + + /* Copy above into the sepstr, centered */ + if(sepsize > strlen(endstr)+2) { - sepstr[sepsize/2-1] = 'E'; - sepstr[sepsize/2] = 'n'; - sepstr[sepsize/2+1]= 'd'; + char* eptr = endstr; + char* sptr = sepstr+(sepsize/2) - (strlen(endstr)+2)/2; + while(*eptr) + *sptr++ = *eptr++; } - - if(hi && hi->userlist_style != HI_STYLE_CLEAN) - irc_send(from, to, sepstr); - free(sepstr); + irc_send(from, to, sepstr); } + if(!(hi && hi->userlist_style == HI_STYLE_CLEAN)) + free(sepstr); + if (!(table.flags & TABLE_NO_FREE)) { /* Deallocate table memory (but not the string memory). */ for (ii=0; iino_notice) + irc_send = irc_privmsg; + else + irc_send = irc_notice; break; case 2: irc_send = irc_wallchops; @@ -482,7 +516,7 @@ vsend_message(const char *dest, struct userNode *src, struct handle_info *handle expand_pos = pos = 0; chars_sent = 0; while (input.list[ipos]) { - char ch, *value, *free_value; + char ch, *value = NULL, *free_value; while ((ch = input.list[ipos]) && (ch != '$') && (ch != '\n') && (pos < size)) { line[pos++] = ch; @@ -536,6 +570,9 @@ vsend_message(const char *dest, struct userNode *src, struct handle_info *handle case 'b': value = use_color ? "\002" : ""; break; + case 'k': + value = use_color ? "\003" : ""; + break; case 'o': value = use_color ? "\017" : ""; break; @@ -561,12 +598,29 @@ vsend_message(const char *dest, struct userNode *src, struct handle_info *handle case 'N': value = nickserv ? nickserv->nick : "NickServ"; break; + case 'X': + value = spamserv ? spamserv->nick : "SpamServ"; + break; case 's': value = self->name; break; +#ifdef HAVE_HELPSERV + case 'i': + value = strdup(get_helpserv_id(dest, src)); + break; +#endif case 'H': value = handle ? handle->handle : "Account"; break; + case '!': /* Command Char for chanserv */ + if(!trigger) + trigger = calloc(sizeof(*trigger), 2); + if(chanserv && (service = service_find(chanserv->nick))) + trigger[0] = service->trigger; + else + trigger[0] = '!'; + value = trigger; + break; #define SEND_LINE(TRUNCED) do { \ line[pos] = 0; \ if (pos > 0) { \ @@ -621,7 +675,7 @@ vsend_message(const char *dest, struct userNode *src, struct handle_info *handle break; default: value = ""; - log_module(MAIN_LOG, LOG_ERROR, "Invalid exp.type %d from expansion function %p.", exp.type, expand_f); + log_module(MAIN_LOG, LOG_ERROR, "Invalid exp.type %d from expansion function %p.", exp.type, (void*)expand_f); break; } ipos = name_end - input.list; @@ -695,7 +749,7 @@ send_message(struct userNode *dest, struct userNode *src, const char *format, .. int res; va_list ap; - if (IsLocal(dest)) return 0; + if (IsLocal(dest) && !IsDummy(dest)) return 0; va_start(ap, format); res = vsend_message(dest->nick, src, dest->handle_info, 0, NULL, format, ap); va_end(ap); @@ -707,7 +761,7 @@ send_message_type(int msg_type, struct userNode *dest, struct userNode *src, con int res; va_list ap; - if (IsLocal(dest)) return 0; + if (IsLocal(dest) && !IsDummy(dest)) return 0; va_start(ap, format); res = vsend_message(dest->nick, src, dest->handle_info, msg_type, NULL, format, ap); va_end(ap); @@ -888,7 +942,7 @@ helpfile_eval_identifier(const char *start, const char **end) *end = start + 5; return 0; } else { - log_module(MAIN_LOG, LOG_FATAL, "Unexpected helpfile identifier '%.*s'.", *end-start, start); + log_module(MAIN_LOG, LOG_FATAL, "Unexpected helpfile identifier '%.*s'.", (int)(*end-start), start); return -1; } } @@ -920,7 +974,7 @@ helpfile_eval_atomicexpr(const char *start, const char **end) while (isspace(*sep) && (sep < *end)) sep++; if ((sep == *end) || (sep[0] != ')')) { - log_module(MAIN_LOG, LOG_FATAL, "Expected close parenthesis at '%.*s'.", *end-sep, sep); + log_module(MAIN_LOG, LOG_FATAL, "Expected close parenthesis at '%.*s'.", (int)(*end-sep), sep); return -1; } @@ -957,7 +1011,7 @@ helpfile_eval_expr(const char *start, const char **end) sep += len; } if (op == OP_INVALID) { - log_module(MAIN_LOG, LOG_FATAL, "Unrecognized helpfile operator at '%.*s'.", *end-sep, sep); + log_module(MAIN_LOG, LOG_FATAL, "Unrecognized helpfile operator at '%.*s'.", (int)(*end-sep), sep); return -1; } @@ -971,7 +1025,7 @@ helpfile_eval_expr(const char *start, const char **end) while (isspace(*sep2) && (sep2 < *end)) sep2++; if (sep2 != *end) { - log_module(MAIN_LOG, LOG_FATAL, "Trailing garbage in helpfile expression: '%.*s'.", *end-sep2, sep2); + log_module(MAIN_LOG, LOG_FATAL, "Trailing garbage in helpfile expression: '%.*s'.", (int)(*end-sep2), sep2); return -1; } @@ -998,7 +1052,7 @@ helpfile_eval_condition(const char *start, const char **end) for (term = start; isalnum(*term) && (term < *end); ++term) ; if (term != start) { if ((term + 2 >= *end) || (term[0] != ':') || (term[1] != ' ')) { - log_module(MAIN_LOG, LOG_FATAL, "In helpfile condition '%.*s' expected prefix to end with ': '.", *end-start, start); + log_module(MAIN_LOG, LOG_FATAL, "In helpfile condition '%.*s' expected prefix to end with ': '.",(int)(*end-start), start); return -1; } start = term + 2; @@ -1116,10 +1170,27 @@ void helpfile_init(void) language_read_list(); } -void helpfile_finalize(void) +static void helpfile_read_languages(void) { dict_iterator_t it; + dict_t dict; + + language_read_list(); for (it = dict_first(languages); it; it = iter_next(it)) language_read(iter_key(it)); - reg_exit_func(language_cleanup); + + /* If the user has a strings.db in their languages directory, + * allow that to override C language strings. + */ + dict = parse_database("languages/strings.db"); + if (dict) { + language_set_messages(lang_C, dict); + free_database(dict); + } +} + +void helpfile_finalize(void) +{ + conf_register_reload(helpfile_read_languages); + reg_exit_func(language_cleanup, NULL); }