Changeset b7bc432 in code for icb.c

Timestamp:

Mar 4, 2014, 11:17:15 PM (11 years ago)

Author:

Stuart Henderson <stu@…>

Branches:

master

Children:

efa8586

Parents:

626f420

Message:

permit whitespace in topic, otherwise sanitize to _

File:

• icb.c (modified) (8 diffs)

icb.c

@@ -25 +25 @@
 #include <ctype.h>
 #include <event.h>
+#include <vis.h>
 
 #include "icb.h"
@@ -150 +151 @@
 
         if (!nick || strlen(nick) == 0 ||
-            icb_vis(is->nick, nick, ICB_MAXNICKLEN)) {
+            icb_vis(is->nick, nick, ICB_MAXNICKLEN, VIS_SP)) {
                 icb_error(is, "Invalid nick");
                 icb_drop(is, NULL);
@@ -158 +159 @@
                 strlcpy(group, defgrp, ICB_MAXGRPLEN);
         else
-                icb_vis(group, grp, ICB_MAXNICKLEN);
+                icb_vis(group, grp, ICB_MAXNICKLEN, VIS_SP);
         LIST_FOREACH(ig, &groups, entry) {
                 if (strcmp(ig->name, group) == 0)
@@ -186 +187 @@
 
         if (client && strlen(client) > 0)
-                icb_vis(is->client, client, sizeof is->client);
+                icb_vis(is->client, client, sizeof is->client, VIS_SP);
         strlcpy(is->nick, nick, sizeof is->nick);
         is->group = ig;
@@ -251 +252 @@
         char whom[ICB_MAXNICKLEN];
 
-        icb_vis(whom, to, ICB_MAXNICKLEN);
+        icb_vis(whom, to, ICB_MAXNICKLEN, VIS_SP);
 
         LIST_FOREACH(s, &ig->sess, entry) {
@@ -273 +274 @@
         char command[32]; /* XXX */
 
-        icb_vis(command, cmd, sizeof command);
+        icb_vis(command, cmd, sizeof command, VIS_SP);
 
         if ((handler = icb_cmd_lookup(command)) == NULL) {
@@ -614 +615 @@
  */
 int
-icb_vis(char *dst, const char *src, size_t dstsize)
+icb_vis(char *dst, const char *src, size_t dstsize, int flags)
 {
         int si = 0, di = 0, td;
@@ -621 +622 @@
                 if (src[si] == '%')
                         dst[di++] = '%', dst[di] = '%';
-                else if (isgraph(src[si]))
+                else if (src[si] == ' ' && flags & VIS_SP)
+                        dst[di] = '_';
+                else if (isgraph(src[si]) || src[si] == ' ')
                         dst[di] = src[si];
                 else {