#include "client.h"
#include "hash.h"
#include "cache.h"
-#include "sprintf_irc.h"
#include "irc_dictionary.h"
#include "numeric.h"
+#include "send.h"
struct cachefile *user_motd = NULL;
struct cachefile *oper_motd = NULL;
{
/* allocate the emptyline */
emptyline = rb_malloc(sizeof(struct cacheline));
- emptyline->data[0] = ' ';
- emptyline->data[1] = '\0';
+ emptyline->data = rb_strdup(" ");
+
user_motd_changed[0] = '\0';
user_motd = cache_file(MPATH, "ircd.motd", 0);
help_dict_user = irc_dictionary_create(strcasecmp);
}
+/*
+ * removes tabs from src, replaces with 8 spaces, and returns the length
+ * of the new string. if the new string would be greater than destlen,
+ * it is truncated to destlen - 1
+ */
+static size_t
+untabify(char *dest, const char *src, size_t destlen)
+{
+ size_t x = 0, i;
+ const char *s = src;
+ char *d = dest;
+
+ while(*s != '\0' && x < destlen - 1)
+ {
+ if(*s == '\t')
+ {
+ for(i = 0; i < 8 && x < destlen - 1; i++, x++, d++)
+ *d = ' ';
+ s++;
+ } else
+ {
+ *d++ = *s++;
+ x++;
+ }
+ }
+ *d = '\0';
+ return x;
+}
+
/* cache_file()
*
* inputs - file to cache, files "shortname", flags to set
if(!EmptyString(line))
{
+ char untabline[BUFSIZE];
+
lineptr = rb_malloc(sizeof(struct cacheline));
- rb_strlcpy(lineptr->data, line, sizeof(lineptr->data));
+
+ untabify(untabline, line, sizeof(untabline));
+ lineptr->data = rb_strdup(untabline);
+
rb_dlinkAddTail(lineptr, &lineptr->linenode, &cacheptr->contents);
}
else
rb_dlinkAddTailAlloc(emptyline, &cacheptr->contents);
}
+ if (0 == rb_dlink_list_length(&cacheptr->contents))
+ {
+ /* No contents. Don't cache it after all. */
+ rb_free(cacheptr);
+ cacheptr = NULL;
+ }
+
fclose(in);
return cacheptr;
}
/* if the below is ever modified, change LINKSLINELEN */
links_line = rb_malloc(LINKSLINELEN);
rb_snprintf(links_line, LINKSLINELEN, "%s %s :1 %s",
- target_p->name, me.name,
- target_p->info[0] ? target_p->info :
+ target_p->name, me.name,
+ target_p->info[0] ? target_p->info :
"(Unknown Location)");
rb_dlinkAddTailAlloc(links_line, &links_cache_list);
RB_DLINK_FOREACH_SAFE(ptr, next_ptr, cacheptr->contents.head)
{
if(ptr->data != emptyline)
- rb_free(ptr->data);
+ {
+ struct cacheline *line = ptr->data;
+ rb_free(line->data);
+ rb_free(line);
+ }
}
rb_free(cacheptr);
{
DIR *helpfile_dir = NULL;
struct dirent *ldirent= NULL;
- char filename[MAXPATHLEN];
+ char filename[PATH_MAX];
struct cachefile *cacheptr;
struct DictionaryIter iter;
+#if defined(S_ISLNK) && defined(HAVE_LSTAT)
+ struct stat sb;
+#endif
+
DICTIONARY_FOREACH(cacheptr, &iter, help_dict_oper)
{
irc_dictionary_delete(help_dict_oper, cacheptr->name);
while((ldirent = readdir(helpfile_dir)) != NULL)
{
+ if(ldirent->d_name[0] == '.')
+ continue;
rb_snprintf(filename, sizeof(filename), "%s/%s", HPATH, ldirent->d_name);
cacheptr = cache_file(filename, ldirent->d_name, HELP_OPER);
irc_dictionary_add(help_dict_oper, cacheptr->name, cacheptr);
while((ldirent = readdir(helpfile_dir)) != NULL)
{
+ if(ldirent->d_name[0] == '.')
+ continue;
rb_snprintf(filename, sizeof(filename), "%s/%s", UHPATH, ldirent->d_name);
+#if defined(S_ISLNK) && defined(HAVE_LSTAT)
+ if(lstat(filename, &sb) < 0)
+ continue;
+
+ /* ok, if its a symlink, we work on the presumption if an
+ * oper help exists of that name, its a symlink to that --fl
+ */
+ if(S_ISLNK(sb.st_mode))
+ {
+ cacheptr = irc_dictionary_retrieve(help_dict_oper, ldirent->d_name);
+
+ if(cacheptr != NULL)
+ {
+ cacheptr->flags |= HELP_USER;
+ continue;
+ }
+ }
+#endif
+
cacheptr = cache_file(filename, ldirent->d_name, HELP_USER);
irc_dictionary_add(help_dict_user, cacheptr->name, cacheptr);
}
{
struct stat sb;
struct tm *local_tm;
-
- if(stat(MPATH, &sb) == 0)
+
+ if(stat(MPATH, &sb) == 0)
{
local_tm = localtime(&sb.st_mtime);
- if(local_tm != NULL)
+ if(local_tm != NULL)
{
rb_snprintf(user_motd_changed, sizeof(user_motd_changed),
"%d/%d/%d %d:%d",
1900 + local_tm->tm_year, local_tm->tm_hour,
local_tm->tm_min);
}
- }
+ }
free_cachefile(user_motd);
user_motd = cache_file(MPATH, "ircd.motd", 0);
}
if(oper_motd == NULL || rb_dlink_list_length(&oper_motd->contents) == 0)
return;
- sendto_one(source_p, form_str(RPL_OMOTDSTART),
+ sendto_one(source_p, form_str(RPL_OMOTDSTART),
me.name, source_p->name);
RB_DLINK_FOREACH(ptr, oper_motd->contents.head)
me.name, source_p->name, lineptr->data);
}
- sendto_one(source_p, form_str(RPL_ENDOFOMOTD),
+ sendto_one(source_p, form_str(RPL_ENDOFOMOTD),
me.name, source_p->name);
}