X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/ae4091d2f9246e6b2bb73200f4392c5d9568f365..68ebdf7f1e10113662291faa75906e498482bd5e:/src/cache.c

diff --git a/src/cache.c b/src/cache.c
index e034580..04766b7 100644
--- a/src/cache.c
+++ b/src/cache.c
@@ -29,7 +29,6 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: cache.c 25119 2008-03-13 16:57:05Z androsyn $
  */
 
 #include "stdinc.h"
@@ -39,7 +38,6 @@
 #include "client.h"
 #include "hash.h"
 #include "cache.h"
-#include "sprintf_irc.h"
 #include "irc_dictionary.h"
 #include "numeric.h"
 
@@ -75,6 +73,35 @@ init_cache(void)
 	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
@@ -108,13 +135,20 @@ cache_file(const char *filename, const char *shortname, int flags)
 		if(!EmptyString(line))
 		{
 			lineptr = rb_malloc(sizeof(struct cacheline));
-			rb_strlcpy(lineptr->data, line, sizeof(lineptr->data));
+			untabify(lineptr->data, line, sizeof(lineptr->data));
 			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;
 }
@@ -196,6 +230,10 @@ load_help(void)
 	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);
@@ -214,6 +252,8 @@ load_help(void)
 
 	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);
@@ -227,8 +267,29 @@ load_help(void)
 
 	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);
 	}
@@ -288,3 +349,33 @@ cache_user_motd(void)
 	free_cachefile(user_motd);
 	user_motd = cache_file(MPATH, "ircd.motd", 0);
 }
+
+
+/* send_oper_motd()
+ *
+ * inputs	- client to send motd to
+ * outputs	- client is sent oper motd if exists
+ * side effects -
+ */
+void
+send_oper_motd(struct Client *source_p)
+{
+	struct cacheline *lineptr;
+	rb_dlink_node *ptr;
+
+	if(oper_motd == NULL || rb_dlink_list_length(&oper_motd->contents) == 0)
+		return;
+
+	sendto_one(source_p, form_str(RPL_OMOTDSTART), 
+		   me.name, source_p->name);
+
+	RB_DLINK_FOREACH(ptr, oper_motd->contents.head)
+	{
+		lineptr = ptr->data;
+		sendto_one(source_p, form_str(RPL_OMOTD),
+			   me.name, source_p->name, lineptr->data);
+	}
+
+	sendto_one(source_p, form_str(RPL_ENDOFOMOTD), 
+		   me.name, source_p->name);
+}