summaryrefslogtreecommitdiff
path: root/src/irc
diff options
context:
space:
mode:
authorTimo Sirainen <cras@irssi.org>2002-03-13 02:59:01 +0000
committercras <cras@dbcabf3a-b0e7-0310-adc4-f8d773084564>2002-03-13 02:59:01 +0000
commit4770c1c4eebf1d792301671540746ce4212d9179 (patch)
tree5ecd18b2cbf9c512f6eeabf5e055d9a21047240b /src/irc
parent006876a87c7caec5b44e09bbe294520f33324369 (diff)
downloadirssi-4770c1c4eebf1d792301671540746ce4212d9179.zip
*** empty log message ***
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2597 dbcabf3a-b0e7-0310-adc4-f8d773084564
Diffstat (limited to 'src/irc')
-rw-r--r--src/irc/Makefile.am3
-rw-r--r--src/irc/core/irc.c4
2 files changed, 6 insertions, 1 deletions
diff --git a/src/irc/Makefile.am b/src/irc/Makefile.am
index cdea8d60..3d803c35 100644
--- a/src/irc/Makefile.am
+++ b/src/irc/Makefile.am
@@ -11,3 +11,6 @@ SUBDIRS = core $(BOT) dcc flood notifylist $(PROXY)
noinst_LIBRARIES = libirc.a
libirc_a_SOURCES = irc.c
+
+distclean-generic:
+ rm -f irc.c
diff --git a/src/irc/core/irc.c b/src/irc/core/irc.c
index d7afaa23..0743dae2 100644
--- a/src/irc/core/irc.c
+++ b/src/irc/core/irc.c
@@ -322,12 +322,14 @@ static char *irc_parse_prefix(char *line, char **nick, char **address)
{
*nick = *address = NULL;
+ /* :<nick> [["!" <user>] "@" <host>] SPACE */
+
if (*line != ':')
return line;
*nick = ++line;
while (*line != '\0' && *line != ' ') {
- if (*line == '!') {
+ if (*line == '!' || *line == '@') {
*line++ = '\0';
*address = line;
while (*line != '\0' && *line != ' ')