Fixed some upper bounds stuff and do_reset

[irc/gameservirc.git] / gameserv / news.cpp

diff --git a/gameserv/news.cpp b/gameserv/news.cpp
index e558528ebe20c22de257a61c9b77938177f7b5c2..df06e70a59237e5320871e4f3735baff1c83c261 100644 (file)
--- a/gameserv/news.cpp
+++ b/gameserv/news.cpp
@@ -6,6 +6,7 @@ using std::ifstream;
 
 List<myString> todaysnews;
 void addNews(List<myString> &news, const char *fmt, ...);
+void clearNews(List<myString> &news) {news.deleteNodes();};
 void showNews(char *nick, List<myString> &news);
 void saveNews(char *filename, List<myString> &news);
 void loadNews(char *filename, List<myString> &news);
@@ -15,8 +16,6 @@ void addNews(List<myString> &news, const char *fmt, ...)
     if (fmt[0] == '\0')
         return;
 
-    log("Adding news item: fmt = %s", fmt);
-
     va_list args;
     char *input;
     input = new char[1024];
@@ -77,11 +76,9 @@ void showNews(char *nick, List<myString> &news)
 
 void saveNews(char *filename, List<myString> &news)
 {
-    if (news.isEmpty())
-       return;
-
     ofstream outfile;
     outfile.open(filename);
+
     if (outfile.fail())
     {
        log("Error opening %s", filename);
@@ -100,9 +97,6 @@ void saveNews(char *filename, List<myString> &news)
 
 void loadNews(char *filename, List<myString> &news)
 {
-    if (news.isEmpty())
-       return;
-
     // First clear the old news out
     ListNode<myString> *it, *temp;
     it = news.First();
@@ -129,6 +123,11 @@ void loadNews(char *filename, List<myString> &news)
 
     while (infile.getline(buf, 1024, '\n'))
     {
+       if (buf[0] == '\0' || buf[0] == '\n')
+       {
+           delete [] buf;
+           return;
+       }
        string = new myString(buf);
        news.insertAtBack(string);
        delete string;
@@ -136,3 +135,8 @@ void loadNews(char *filename, List<myString> &news)
 
     delete [] buf;
 }
+
+void do_news(char *u)
+{
+    showNews(u, todaysnews);
+}