fix printing of join/part messages when cdef is a substring of the actual channel name (#99)

kdkasad · web-flow · commit 02bbbe8389b4 · 2021-02-10T06:58:30.000-05:00
diff --git a/kirc.c b/kirc.c
@@ -485,7 +485,7 @@ static void paramPrintNick(struct Param * p) {
 
 static void paramPrintPart(struct Param * p) {
     printf("%*s<-- \x1b[34;1m%s\x1b[0m", p->nicklen - 3, "", p->nickname);
-    if (p->channel != NULL && strstr(p->channel, cdef) == NULL)
+    if (p->channel != NULL && strcmp(p->channel+1, cdef))
         printf(" [\x1b[33m%s\x1b[0m] ", p->channel);
 }
 
@@ -495,7 +495,7 @@ static void paramPrintQuit(struct Param * p) {
 
 static void paramPrintJoin(struct Param * p) {
     printf("%*s--> \x1b[32;1m%s\x1b[0m", p->nicklen - 3, "", p->nickname);
-    if (p->channel != NULL && strstr(p->channel, cdef) == NULL)
+    if (p->channel != NULL && strcmp(p->channel+1, cdef))
         printf(" [\x1b[33m%s\x1b[0m] ", p->channel);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -485,7 +485,7 @@ static void paramPrintNick(struct Param * p) {`
`485`	`485`
`486`	`486`	`static void paramPrintPart(struct Param * p) {`
`487`	`487`	`printf("%*s<-- \x1b[34;1m%s\x1b[0m", p->nicklen - 3, "", p->nickname);`
`488`		`- if (p->channel != NULL && strstr(p->channel, cdef) == NULL)`
	`488`	`+ if (p->channel != NULL && strcmp(p->channel+1, cdef))`
`489`	`489`	`printf(" [\x1b[33m%s\x1b[0m] ", p->channel);`
`490`	`490`	`}`
`491`	`491`
`@@ -495,7 +495,7 @@ static void paramPrintQuit(struct Param * p) {`
`495`	`495`
`496`	`496`	`static void paramPrintJoin(struct Param * p) {`
`497`	`497`	`printf("%*s--> \x1b[32;1m%s\x1b[0m", p->nicklen - 3, "", p->nickname);`
`498`		`- if (p->channel != NULL && strstr(p->channel, cdef) == NULL)`
	`498`	`+ if (p->channel != NULL && strcmp(p->channel+1, cdef))`
`499`	`499`	`printf(" [\x1b[33m%s\x1b[0m] ", p->channel);`
`500`	`500`	`}`
`501`	`501`