summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2004-04-08 17:39:04 +0000
committerbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2004-04-08 17:39:04 +0000
commit9be94a9a9cf3a7946171994c97bcf4041dd8dd48 (patch)
tree1f902973ef85b6fb3f7710baee08f28af6158523
parent64f837e0d3fb6f9d495e5a9e2930a9d76dc3748c (diff)
Attempted fixes to make ModuleReader::ReadValue return "" if string does not exist
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@455 e03df62e-2008-0410-955e-edbf42e46eb7
-rw-r--r--src/InspIRCd.layout18
-rw-r--r--src/inspircd.cpp4
-rw-r--r--src/inspircd_io.cpp3
3 files changed, 12 insertions, 13 deletions
diff --git a/src/InspIRCd.layout b/src/InspIRCd.layout
index da4a53abf..3af24613b 100644
--- a/src/InspIRCd.layout
+++ b/src/InspIRCd.layout
@@ -1,5 +1,5 @@
[Editors]
-Focused=1
+Focused=2
Order=7,3,2,6,25,24,4,5,1,0,-1
[Editor_0]
@@ -12,18 +12,18 @@ LeftChar=1
[Editor_1]
Open=1
-Top=1
-CursorCol=3
-CursorRow=5544
-TopLine=5465
+Top=0
+CursorCol=1
+CursorRow=4808
+TopLine=4662
LeftChar=1
[Editor_2]
Open=1
-Top=0
-CursorCol=42
-CursorRow=225
-TopLine=184
+Top=1
+CursorCol=28
+CursorRow=306
+TopLine=281
LeftChar=1
[Editor_3]
diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index f7fd1fa72..96212d7fb 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -4797,8 +4797,6 @@ void process_command(userrec *user, char* cmd)
}
}
- log(DEBUG,"A %d %s",strlen(cmd),cmd);
-
cmd_found = 0;
if (strlen(command)>MAXCOMMAND)
@@ -4807,8 +4805,6 @@ void process_command(userrec *user, char* cmd)
return;
}
- log(DEBUG,"A %d %s",strlen(cmd),cmd);
-
for (int x = 0; x < strlen(command); x++)
{
if (((command[x] < 'A') || (command[x] > 'Z')) && (command[x] != '.'))
diff --git a/src/inspircd_io.cpp b/src/inspircd_io.cpp
index f1f11d265..18bee1f18 100644
--- a/src/inspircd_io.cpp
+++ b/src/inspircd_io.cpp
@@ -292,6 +292,7 @@ int ReadConf(std::stringstream *config, const char* tag, const char* var, int in
if (!key)
{
/* value not found in tag */
+ strcpy(result,"");
return 0;
}
else
@@ -302,6 +303,7 @@ int ReadConf(std::stringstream *config, const char* tag, const char* var, int in
if (!strlen(key))
{
/* missing quote */
+ strcpy(result,"");
return 0;
}
key++;
@@ -339,6 +341,7 @@ int ReadConf(std::stringstream *config, const char* tag, const char* var, int in
}
}
}
+ strcpy(result,""); // value or its tag not found at all
return 0;
}