Fix crash when providing bad command line argument

[clinton/bobotpp.git] / source / DCCParser.C

diff --git a/source/DCCParser.C b/source/DCCParser.C
index 859ce79..f04c0f6 100644 (file)
--- a/source/DCCParser.C
+++ b/source/DCCParser.C
@@ -1,6 +1,6 @@
 // DCCParser.C  -*- C++ -*-
 // Copyright (c) 1998 Etienne BERNARD
-// Copyright (C) 2002 Clinton Ebadi
+// Copyright (C) 2002,2005 Clinton Ebadi
 
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -14,18 +14,24 @@
 
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+// 02110-1301, USA.
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include "DCCParser.H"
+
+#include "DCCConnection.H"
 #include "DCCPerson.H"
 #include "Parser.H"
-#include "BotInterp.H"
 #include "Utils.H"
 
+#ifdef USESCRIPTS
+#include "BotInterp.H"
+#endif
+
 void
 DCCParser::parseLine(DCCConnection *cnx, String line)
 {
@@ -34,10 +40,10 @@ DCCParser::parseLine(DCCConnection *cnx, String line)
   // Call hooks/dcc/chat-message hook functions
   cnx->get_bot()->botInterp->RunHooks (Hook::DCC_CHAT_MESSAGE, 
                                 from->getAddress () + " " + line,
-                                scm_list_n (Utils::
-                                            string2SCM (from->getAddress ()),
-                                            Utils::string2SCM (line),
-                                            SCM_UNDEFINED));
+                                scm_list_n 
+                                      (Utils::str2scm (from->getAddress ()),
+                                       Utils::str2scm (line),
+                                       SCM_UNDEFINED));
 #endif
   Parser::parseMessage(cnx->get_bot()->serverConnection, 
                       from, cnx->get_bot()->nickName,