projects
/
srvx.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
1bf0d43
)
tidied up advtopic code
author
pk910
<philipp@zoelle1.de>
Sat, 3 Mar 2012 08:53:35 +0000
(09:53 +0100)
committer
pk910
<philipp@zoelle1.de>
Sat, 3 Mar 2012 08:53:35 +0000
(09:53 +0100)
src/chanserv.c
patch
|
blob
|
history
src/chanserv.h
patch
|
blob
|
history
diff --git
a/src/chanserv.c
b/src/chanserv.c
index d50c9147fbe56909b65f776179f763e99bb2ca8d..4e41784b0aa289a7506251bd28bb6667740dcf5a 100644
(file)
--- a/
src/chanserv.c
+++ b/
src/chanserv.c
@@
-4446,7
+4446,6
@@
static CHANSERV_FUNC(cmd_topic)
new_topic[dpos++] = *ptr; //is % again
break;
}
new_topic[dpos++] = *ptr; //is % again
break;
}
- ptr--;
advtopic_index--; //no zero base
if(!cData->advtopic[advtopic_index])
break; //just leave it empty
advtopic_index--; //no zero base
if(!cData->advtopic[advtopic_index])
break; //just leave it empty
@@
-4458,11
+4457,12
@@
static CHANSERV_FUNC(cmd_topic)
break;
case '\\':
ptr++; /* and fall through */
break;
case '\\':
ptr++; /* and fall through */
+ if(!*ptr) break;
default:
new_topic[dpos++] = *ptr;
default:
new_topic[dpos++] = *ptr;
+ ptr++;
break;
}
break;
}
- ptr++;
}
} else {
while((tchar = topic_mask[pos++]) && (dpos <= TOPICLEN))
}
} else {
while((tchar = topic_mask[pos++]) && (dpos <= TOPICLEN))
diff --git
a/src/chanserv.h
b/src/chanserv.h
index 2aba69cc1277bc3b42703723a5aa8ca4195cf6a5..638a77f2777eb93582fb7852cdc73af509deaf49 100644
(file)
--- a/
src/chanserv.h
+++ b/
src/chanserv.h
@@
-109,7
+109,7
@@
struct chanData
unsigned short lvlOpts[NUM_LEVEL_OPTIONS];
unsigned char chOpts[NUM_CHAR_OPTIONS];
unsigned short lvlOpts[NUM_LEVEL_OPTIONS];
unsigned char chOpts[NUM_CHAR_OPTIONS];
- char *advtopic[
9
];
+ char *advtopic[
MAXADVTOPICENTRIES
];
struct userData *users;
struct banData *bans;
struct userData *users;
struct banData *bans;