From f8231d64d8bb6ca5c7329adba7f94a2cf26382fc Mon Sep 17 00:00:00 2001 From: "psyc://psyced.org/~lynX" <@> Date: Fri, 10 Jun 2011 08:34:40 +0200 Subject: [PATCH] back to old irc splitting code that works with OTR --- install.sh | 2 ++ world/net/irc/common.c | 10 +++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/install.sh b/install.sh index c5be9e3..6e677a2 100755 --- a/install.sh +++ b/install.sh @@ -283,6 +283,8 @@ echo "[binary directory is $ARCH_DIR]" ## uname -m returns "Power Macintosh" on macosx. very unuseful. ##get ARCH_DIR "$BASE_DIR/bin-`uname -m`" ## why did we call uname twice anyway? uname -s returns such a nice "darwin" +## on linux it returns the actual processor type (i686, x86_64, etc) +## which these days needs to be considered.. FIXME ## #get ARCH_DIR "$BASE_DIR/bin-$arch" #ask "Binary installation directory" ARCH_DIR diff --git a/world/net/irc/common.c b/world/net/irc/common.c index 061b705..1c9e06a 100644 --- a/world/net/irc/common.c +++ b/world/net/irc/common.c @@ -336,7 +336,11 @@ emit(string output) { } foreach(line : outlines) if (strlen(line)) { while (strlen(line) > cut) { -#if 1 +#if 0 //{{{ + // this is supposed to be the more elegant + // message continuation strategy but it + // breaks OTR over IRC! thx alice + // // we shall look for last whitespace instead t = rindex(line, ' ', cut); if (t > 9) { @@ -364,7 +368,7 @@ emit(string output) { // we might aswell use the old // backslash splitting code below here } -#else //{{{ +#else //}}} t = line[cut] == '\r' ? cut-1 : cut; // msa's CTCP character @@ -382,7 +386,7 @@ emit(string output) { + "\\\r\n"); line = line[cut+1..]; } -#endif //}}} +#endif } P4(("irc:emit each %O\n", line)) EMIT(split_prefix + line +"\r\n");