commit: 6b96a155d78892ba5917be92a58627ed176c0c8d
parent ed643a6f06fb29db40e4bd6f8f5b6c83ca78a058
Author: Michael Forney <mforney@mforney.org>
Date: Wed, 14 Apr 2021 01:00:04 -0700
catgirl: Update to 1.7
Diffstat:
2 files changed, 32 insertions(+), 41 deletions(-)
diff --git a/pkg/catgirl/patch/0001-Revert-Use-gnu-case-range-and-gnu-conditional-omitte.patch b/pkg/catgirl/patch/0001-Revert-Use-gnu-case-range-and-gnu-conditional-omitte.patch
@@ -1,4 +1,4 @@
-From fceb6d1300a651bf4bb544978c743330f98d3ead Mon Sep 17 00:00:00 2001
+From fec230650b9a3f7b13add70a54105719850eb826 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Thu, 7 May 2020 00:36:14 -0700
Subject: [PATCH] Revert "Use gnu-case-range and
@@ -7,12 +7,12 @@ Subject: [PATCH] Revert "Use gnu-case-range and
This reverts commit 75a6aa9258270169f43f56e063f1bfb57eebe56b.
---
Makefile | 3 +--
- command.c | 32 ++++++++++++++++++--------------
+ command.c | 30 +++++++++++++++++-------------
complete.c | 4 ++--
handle.c | 45 +++++++++++++++++++++++++++------------------
ui.c | 9 +++++++--
url.c | 2 +-
- 6 files changed, 56 insertions(+), 39 deletions(-)
+ 6 files changed, 55 insertions(+), 38 deletions(-)
diff --git a/Makefile b/Makefile
index 5caa3ba..d164315 100644
@@ -29,10 +29,10 @@ index 5caa3ba..d164315 100644
-include config.mk
diff --git a/command.c b/command.c
-index 1154942..93b7478 100644
+index 0aefb2b..ccdf2ff 100644
--- a/command.c
+++ b/command.c
-@@ -69,8 +69,8 @@ static void splitMessage(char *cmd, uint id, char *params) {
+@@ -68,8 +68,8 @@ static int splitChunk(const char *cmd, uint id) {
int overhead = snprintf(
NULL, 0, ":%s!%*s@%*s %s %s :\r\n",
self.nick,
@@ -43,16 +43,7 @@ index 1154942..93b7478 100644
cmd, idNames[id]
);
assert(overhead > 0 && overhead < 512);
-@@ -109,7 +109,7 @@ static void commandNotice(uint id, char *params) {
-
- static void commandMe(uint id, char *params) {
- char buf[512];
-- snprintf(buf, sizeof(buf), "\1ACTION %s\1", (params ?: ""));
-+ snprintf(buf, sizeof(buf), "\1ACTION %s\1", (params ? params : ""));
- echoMessage("PRIVMSG", id, buf);
- }
-
-@@ -140,7 +140,7 @@ static void commandPart(uint id, char *params) {
+@@ -161,7 +161,7 @@ static void commandPart(uint id, char *params) {
static void commandQuit(uint id, char *params) {
(void)id;
@@ -61,7 +52,7 @@ index 1154942..93b7478 100644
}
static void commandNick(uint id, char *params) {
-@@ -238,7 +238,7 @@ static void commandOp(uint id, char *params) {
+@@ -259,7 +259,7 @@ static void commandOp(uint id, char *params) {
}
static void commandDeop(uint id, char *params) {
@@ -70,7 +61,7 @@ index 1154942..93b7478 100644
}
static void commandVoice(uint id, char *params) {
-@@ -250,7 +250,7 @@ static void commandVoice(uint id, char *params) {
+@@ -271,7 +271,7 @@ static void commandVoice(uint id, char *params) {
}
static void commandDevoice(uint id, char *params) {
@@ -79,7 +70,7 @@ index 1154942..93b7478 100644
}
static void commandBan(uint id, char *params) {
-@@ -392,7 +392,8 @@ static void commandFilter(enum Heat heat, uint id, char *params) {
+@@ -413,7 +413,8 @@ static void commandFilter(enum Heat heat, uint id, char *params) {
uiFormat(
id, Cold, NULL, "%sing \3%02d%s %s %s %s",
(heat == Hot ? "Highlight" : "Ignor"), Brown, filter.mask,
@@ -89,7 +80,7 @@ index 1154942..93b7478 100644
);
} else {
for (size_t i = 0; i < FilterCap && filters[i].mask; ++i) {
-@@ -400,8 +401,9 @@ static void commandFilter(enum Heat heat, uint id, char *params) {
+@@ -421,8 +422,9 @@ static void commandFilter(enum Heat heat, uint id, char *params) {
uiFormat(
Network, Warm, NULL, "%sing \3%02d%s %s %s %s",
(heat == Hot ? "Highlight" : "Ignor"), Brown, filters[i].mask,
@@ -101,7 +92,7 @@ index 1154942..93b7478 100644
);
}
}
-@@ -414,8 +416,8 @@ static void commandUnfilter(enum Heat heat, uint id, char *params) {
+@@ -435,8 +437,8 @@ static void commandUnfilter(enum Heat heat, uint id, char *params) {
uiFormat(
id, Cold, NULL, "%s %sing \3%02d%s %s %s %s",
(found ? "No longer" : "Not"), (heat == Hot ? "highlight" : "ignor"),
@@ -112,7 +103,7 @@ index 1154942..93b7478 100644
);
}
-@@ -439,11 +441,12 @@ static void commandExec(uint id, char *params) {
+@@ -460,11 +462,12 @@ static void commandExec(uint id, char *params) {
if (pid < 0) err(EX_OSERR, "fork");
if (pid) return;
@@ -127,7 +118,7 @@ index 1154942..93b7478 100644
execl(shell, shell, "-c", params, NULL);
warn("%s", shell);
_exit(EX_UNAVAILABLE);
-@@ -468,7 +471,8 @@ static void commandHelp(uint id, char *params) {
+@@ -489,7 +492,8 @@ static void commandHelp(uint id, char *params) {
if (pid) return;
char buf[256];
@@ -160,10 +151,10 @@ index 5835926..0e1de47 100644
}
diff --git a/handle.c b/handle.c
-index 44001bb..caba5ff 100644
+index d889f8e..ee45ed8 100644
--- a/handle.c
+++ b/handle.c
-@@ -290,9 +290,9 @@ static void handleReplyISupport(struct Message *msg) {
+@@ -292,9 +292,9 @@ static void handleReplyISupport(struct Message *msg) {
set(&network.setParamModes, setParam);
set(&network.channelModes, channel);
} else if (!strcmp(key, "EXCEPTS")) {
@@ -175,7 +166,7 @@ index 44001bb..caba5ff 100644
}
}
}
-@@ -345,7 +345,7 @@ static void handleJoin(struct Message *msg) {
+@@ -347,7 +347,7 @@ static void handleJoin(struct Message *msg) {
"\3%02d%s\3\t%s%s%sarrives in \3%02d%s\3",
hash(msg->user), msg->nick,
(msg->params[2] ? "(" : ""),
@@ -184,7 +175,7 @@ index 44001bb..caba5ff 100644
(msg->params[2] ? ") " : ""),
hash(msg->params[0]), msg->params[0]
);
-@@ -377,12 +377,14 @@ static void handlePart(struct Message *msg) {
+@@ -379,12 +379,14 @@ static void handlePart(struct Message *msg) {
id, heat, tagTime(msg),
"\3%02d%s\3\tleaves \3%02d%s\3%s%s",
hash(msg->user), msg->nick, hash(msg->params[0]), msg->params[0],
@@ -201,7 +192,7 @@ index 44001bb..caba5ff 100644
);
}
-@@ -399,12 +401,14 @@ static void handleKick(struct Message *msg) {
+@@ -401,12 +403,14 @@ static void handleKick(struct Message *msg) {
hash(msg->user), msg->nick,
completeColor(id, msg->params[1]), msg->params[1],
hash(msg->params[0]), msg->params[0],
@@ -218,7 +209,7 @@ index 44001bb..caba5ff 100644
);
completeRemove(id, msg->params[1]);
if (kicked) completeClear(id);
-@@ -455,13 +459,15 @@ static void handleQuit(struct Message *msg) {
+@@ -457,13 +461,15 @@ static void handleQuit(struct Message *msg) {
id, heat, tagTime(msg),
"\3%02d%s\3\tleaves%s%s",
hash(msg->user), msg->nick,
@@ -236,7 +227,7 @@ index 44001bb..caba5ff 100644
);
}
completeRemove(None, msg->nick);
-@@ -696,7 +702,7 @@ static void handleReplyUserModeIs(struct Message *msg) {
+@@ -711,7 +717,7 @@ static void handleReplyUserModeIs(struct Message *msg) {
for (char *ch = msg->params[1]; *ch; ++ch) {
if (*ch == '+') continue;
const char *name = UserModes[(byte)*ch];
@@ -245,7 +236,7 @@ index 44001bb..caba5ff 100644
}
uiFormat(
Network, Warm, tagTime(msg),
-@@ -735,13 +741,13 @@ static void handleReplyChannelModeIs(struct Message *msg) {
+@@ -750,13 +756,13 @@ static void handleReplyChannelModeIs(struct Message *msg) {
assert(param < ParamCap);
catf(
&cat, ", +%c%s%s %s",
@@ -261,7 +252,7 @@ index 44001bb..caba5ff 100644
);
}
}
-@@ -768,7 +774,7 @@ static void handleMode(struct Message *msg) {
+@@ -783,7 +789,7 @@ static void handleMode(struct Message *msg) {
hash(msg->user), msg->nick,
(set ? "" : "un"),
self.color, msg->params[0],
@@ -270,7 +261,7 @@ index 44001bb..caba5ff 100644
);
}
return;
-@@ -925,7 +931,7 @@ static void handleErrorBanListFull(struct Message *msg) {
+@@ -940,7 +946,7 @@ static void handleErrorBanListFull(struct Message *msg) {
require(msg, false, 4);
uiFormat(
idFor(msg->params[1]), Warm, tagTime(msg),
@@ -279,7 +270,7 @@ index 44001bb..caba5ff 100644
);
}
-@@ -1030,14 +1036,15 @@ static void handleReplyWhoisIdle(struct Message *msg) {
+@@ -1045,14 +1051,15 @@ static void handleReplyWhoisIdle(struct Message *msg) {
}
}
char signon[sizeof("0000-00-00 00:00:00")];
@@ -297,7 +288,7 @@ index 44001bb..caba5ff 100644
);
}
-@@ -1068,7 +1075,9 @@ static void handleReplyWhoisGeneric(struct Message *msg) {
+@@ -1083,7 +1090,9 @@ static void handleReplyWhoisGeneric(struct Message *msg) {
Network, Warm, tagTime(msg),
"\3%02d%s\3\t%s%s%s",
completeColor(Network, msg->params[1]), msg->params[1],
@@ -308,7 +299,7 @@ index 44001bb..caba5ff 100644
);
}
-@@ -1135,7 +1144,7 @@ static bool isMention(const struct Message *msg) {
+@@ -1150,7 +1159,7 @@ static bool isMention(const struct Message *msg) {
const char *match = msg->params[1];
while (NULL != (match = strstr(match, self.nick))) {
char a = (match > msg->params[1] ? match[-1] : ' ');
@@ -318,10 +309,10 @@ index 44001bb..caba5ff 100644
return true;
}
diff --git a/ui.c b/ui.c
-index 557d0dc..91a6993 100644
+index add6eb3..4673071 100644
--- a/ui.c
+++ b/ui.c
-@@ -470,7 +470,7 @@ static size_t windowTop(const struct Window *window) {
+@@ -476,7 +476,7 @@ static size_t windowTop(const struct Window *window) {
}
static size_t windowBottom(const struct Window *window) {
@@ -330,7 +321,7 @@ index 557d0dc..91a6993 100644
if (window->scroll) bottom -= SplitLines + MarkerLines;
return bottom;
}
-@@ -920,7 +920,6 @@ static void keyCode(int code) {
+@@ -948,7 +948,6 @@ static void keyCode(int code) {
break; case KeyMetaGt: scrollTo(window, 0);
break; case KeyMetaLt: scrollTop(window);
@@ -338,7 +329,7 @@ index 557d0dc..91a6993 100644
break; case KeyMetaA: showAuto();
break; case KeyMetaB: edit(id, EditPrevWord, 0);
break; case KeyMetaD: edit(id, EditDeleteNextWord, 0);
-@@ -947,6 +946,12 @@ static void keyCode(int code) {
+@@ -978,6 +977,12 @@ static void keyCode(int code) {
break; case KEY_SEND: scrollTo(window, 0);
break; case KEY_SHOME: scrollTo(window, BufferCap);
break; case KEY_UP: windowScroll(window, +1);
@@ -365,5 +356,5 @@ index 21f946c..1330d36 100644
if (error) return error;
}
--
-2.30.0
+2.30.1
diff --git a/pkg/catgirl/ver b/pkg/catgirl/ver
@@ -1 +1 @@
-1.6 r0
+1.7 r0
