Use strtok_r instead of strchr in IRC_JOIN.

This patch does significant cleanup on the join code by using strtok_r
instead of mangling strchr to parse channel names and keys in parallel when
a JOIN command contains a list of channels and keys.

Also adds an strtok_r implementation to libportab.

1 files changed, 27 insertions, 0 deletions

diff --git a/src/portab/strtok_r.c b/src/portab/strtok_r.c
new file mode 100644
index 00000000..852c8f70
--- /dev/null
+++ b/src/portab/strtok_r.c
@@ -0,0 +1,27 @@
+#include "portab.h"
+#include <string.h>
+
+#ifndef HAVE_STRTOK_R
+
+char *
+strtok_r(char *str, const char *delim, char **saveptr)
+{
+	char *tmp;
+
+	if (!str)
+		str = *saveptr;
+	str += strspn(str, delim);
+	if (*str == 0)
+		return NULL;
+
+	tmp = str + strcspn(str, delim); /* get end of token */
+	if (*tmp) { /* another delimiter */
+		*tmp = 0;
+		tmp++;
+	}
+	*saveptr = tmp;
+	return str;
+}
+
+#endif
+