Changeset b7bc432 in code

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 _

Files:

• cmd.c (modified) (7 diffs)
• icb.c (modified) (8 diffs)
• icb.h (modified) (1 diff)

cmd.c

@@ -87 +87 @@
         }
 
-        icb_vis(whom, arg, ICB_MAXNICKLEN);
+        icb_vis(whom, arg, ICB_MAXNICKLEN, VIS_SP);
 
         LIST_FOREACH(s, &ig->sess, entry) {
@@ -129 +129 @@
         }
 
-        icb_vis(whom, arg, ICB_MAXNICKLEN);
+        icb_vis(whom, arg, ICB_MAXNICKLEN, VIS_SP);
 
         /* who would be a target then? */
@@ -160 +160 @@
         }
 
-        icb_vis(group, arg, ICB_MAXGRPLEN);
+        icb_vis(group, arg, ICB_MAXGRPLEN, VIS_SP);
 
         LIST_FOREACH(ig, &groups, entry) {
@@ -237 +237 @@
         if (strlen(arg) > ICB_MAXNICKLEN)
                 arg[ICB_MAXNICKLEN - 1] = '\0';
-        icb_vis(nick, arg, ICB_MAXNICKLEN);
+        icb_vis(nick, arg, ICB_MAXNICKLEN, VIS_SP);
         LIST_FOREACH(s, &ig->sess, entry) {
                 if (strcmp(s->nick, nick) == 0) {
@@ -312 +312 @@
                         return;
                 }
-                icb_vis(whom, arg, ICB_MAXNICKLEN);
+                icb_vis(whom, arg, ICB_MAXNICKLEN, VIS_SP);
                 LIST_FOREACH(s, &ig->sess, entry) {
                         if (strcmp(s->nick, whom) == 0)
@@ -344 +344 @@
                         return;
                 }
-                icb_vis(topic, arg, ICB_MAXTOPICLEN);
+                icb_vis(topic, arg, ICB_MAXTOPICLEN, 0);
                 strlcpy(ig->topic, topic, sizeof ig->topic);
                 icb_status_group(ig, NULL, STATUS_TOPIC,
@@ -360 +360 @@
                 return icb_who(is, NULL);
 
-        icb_vis(group, arg, ICB_MAXGRPLEN);
+        icb_vis(group, arg, ICB_MAXGRPLEN, VIS_SP);
         LIST_FOREACH(ig, &groups, entry) {
                 if (strcmp(ig->name, group) == 0)

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 {

icb.h

@@ -139 +139 @@
                     int, const char *, ...);
 void             icb_who(struct icb_session *, struct icb_group *);
-int              icb_vis(char *, const char *, size_t);
+int              icb_vis(char *, const char *, size_t, int);
 
 /* callbacks from icbd.c */