commit: 6cca4bce9020ca993a99003309d070efc91f9af3
parent 5aaf8b236b2656b059db0949011b16a7357c4dc3
Author: Michael Forney <mforney@mforney.org>
Date: Sun, 29 Nov 2020 21:35:08 -0800
catgirl: Update to 1.3
Diffstat:
2 files changed, 28 insertions(+), 28 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 8d21fed1729022bd31adb15014944c8ac2ca9da0 Mon Sep 17 00:00:00 2001
+From c955ed7a613b4b5208746a9c88352bf6cdf56d07 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 | 19 ++++++++++---------
+ command.c | 20 +++++++++++---------
complete.c | 4 ++--
handle.c | 45 +++++++++++++++++++++++++++------------------
ignore.c | 2 +-
ui.c | 7 ++++++-
- 6 files changed, 47 insertions(+), 33 deletions(-)
+ 6 files changed, 48 insertions(+), 33 deletions(-)
diff --git a/Makefile b/Makefile
index 2c3061d..b844712 100644
@@ -29,7 +29,7 @@ index 2c3061d..b844712 100644
-include config.mk
diff --git a/command.c b/command.c
-index 4c51433..aec1d4b 100644
+index 3af1246..1c633f8 100644
--- a/command.c
+++ b/command.c
@@ -69,8 +69,8 @@ static void splitMessage(char *cmd, uint id, char *params) {
@@ -61,7 +61,7 @@ index 4c51433..aec1d4b 100644
}
static void commandNick(uint id, char *params) {
-@@ -226,7 +226,7 @@ static void commandOp(uint id, char *params) {
+@@ -232,7 +232,7 @@ static void commandOp(uint id, char *params) {
}
static void commandDeop(uint id, char *params) {
@@ -70,7 +70,7 @@ index 4c51433..aec1d4b 100644
}
static void commandVoice(uint id, char *params) {
-@@ -238,7 +238,7 @@ static void commandVoice(uint id, char *params) {
+@@ -244,7 +244,7 @@ static void commandVoice(uint id, char *params) {
}
static void commandDevoice(uint id, char *params) {
@@ -79,7 +79,7 @@ index 4c51433..aec1d4b 100644
}
static void commandBan(uint id, char *params) {
-@@ -399,11 +399,12 @@ static void commandExec(uint id, char *params) {
+@@ -409,11 +409,12 @@ static void commandExec(uint id, char *params) {
if (pid < 0) err(EX_OSERR, "fork");
if (pid) return;
@@ -94,12 +94,13 @@ index 4c51433..aec1d4b 100644
execlp(shell, shell, "-c", params, NULL);
warn("%s", shell);
_exit(EX_UNAVAILABLE);
-@@ -418,7 +419,7 @@ static void commandHelp(uint id, char *params) {
+@@ -434,7 +435,8 @@ static void commandHelp(uint id, char *params) {
if (pid) return;
char buf[256];
-- snprintf(buf, sizeof(buf), "ip%s$", (params ?: "COMMANDS"));
-+ snprintf(buf, sizeof(buf), "ip%s$", (params ? params : "COMMANDS"));
+- snprintf(buf, sizeof(buf), "%spCOMMANDS$", (getenv("LESS") ?: ""));
++ const char *less = getenv("LESS");
++ snprintf(buf, sizeof(buf), "%spCOMMANDS$", (less ? less : ""));
setenv("LESS", buf, 1);
execlp("man", "man", "1", "catgirl", NULL);
dup2(utilPipe[1], STDERR_FILENO);
@@ -126,7 +127,7 @@ index 5835926..0e1de47 100644
}
diff --git a/handle.c b/handle.c
-index e5e370e..04b73d3 100644
+index 9c37f34..6a32908 100644
--- a/handle.c
+++ b/handle.c
@@ -280,9 +280,9 @@ static void handleReplyISupport(struct Message *msg) {
@@ -141,7 +142,7 @@ index e5e370e..04b73d3 100644
}
}
}
-@@ -329,7 +329,7 @@ static void handleJoin(struct Message *msg) {
+@@ -341,7 +341,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] ? "(" : ""),
@@ -150,7 +151,7 @@ index e5e370e..04b73d3 100644
(msg->params[2] ? ") " : ""),
hash(msg->params[0]), msg->params[0]
);
-@@ -361,12 +361,14 @@ static void handlePart(struct Message *msg) {
+@@ -373,12 +373,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],
@@ -167,7 +168,7 @@ index e5e370e..04b73d3 100644
);
}
-@@ -383,12 +385,14 @@ static void handleKick(struct Message *msg) {
+@@ -395,12 +397,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],
@@ -184,7 +185,7 @@ index e5e370e..04b73d3 100644
);
completeRemove(id, msg->params[1]);
if (kicked) completeClear(id);
-@@ -427,13 +431,15 @@ static void handleQuit(struct Message *msg) {
+@@ -439,13 +443,15 @@ static void handleQuit(struct Message *msg) {
id, heat, tagTime(msg),
"\3%02d%s\3\tleaves%s%s",
hash(msg->user), msg->nick,
@@ -202,7 +203,7 @@ index e5e370e..04b73d3 100644
);
}
completeRemove(None, msg->nick);
-@@ -605,7 +611,7 @@ static void handleReplyUserModeIs(struct Message *msg) {
+@@ -693,7 +699,7 @@ static void handleReplyUserModeIs(struct Message *msg) {
for (char *ch = msg->params[1]; *ch; ++ch) {
if (*ch == '+') continue;
const char *name = UserModes[(byte)*ch];
@@ -211,7 +212,7 @@ index e5e370e..04b73d3 100644
}
uiFormat(
Network, Warm, tagTime(msg),
-@@ -647,13 +653,13 @@ static void handleReplyChannelModeIs(struct Message *msg) {
+@@ -735,13 +741,13 @@ static void handleReplyChannelModeIs(struct Message *msg) {
assert(param < ParamCap);
catf(
&cat, ", +%c%s%s %s",
@@ -227,7 +228,7 @@ index e5e370e..04b73d3 100644
);
}
}
-@@ -680,7 +686,7 @@ static void handleMode(struct Message *msg) {
+@@ -768,7 +774,7 @@ static void handleMode(struct Message *msg) {
hash(msg->user), msg->nick,
(set ? "" : "un"),
self.color, msg->params[0],
@@ -236,7 +237,7 @@ index e5e370e..04b73d3 100644
);
}
return;
-@@ -837,7 +843,7 @@ static void handleErrorBanListFull(struct Message *msg) {
+@@ -925,7 +931,7 @@ static void handleErrorBanListFull(struct Message *msg) {
require(msg, false, 4);
uiFormat(
idFor(msg->params[1]), Cold, tagTime(msg),
@@ -245,7 +246,7 @@ index e5e370e..04b73d3 100644
);
}
-@@ -970,14 +976,15 @@ static void handleReplyWhoisIdle(struct Message *msg) {
+@@ -1058,14 +1064,15 @@ static void handleReplyWhoisIdle(struct Message *msg) {
}
}
char signon[sizeof("0000-00-00 00:00:00")];
@@ -263,7 +264,7 @@ index e5e370e..04b73d3 100644
);
}
-@@ -1010,7 +1017,9 @@ static void handleReplyWhoisGeneric(struct Message *msg) {
+@@ -1098,7 +1105,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],
@@ -274,7 +275,7 @@ index e5e370e..04b73d3 100644
);
}
-@@ -1063,7 +1072,7 @@ static bool isMention(const struct Message *msg) {
+@@ -1151,7 +1160,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] : ' ');
@@ -297,10 +298,10 @@ index f8e4d59..73d2d90 100644
for (size_t i = 0; i < ignore.len; ++i) {
if (fnmatch(ignore.patterns[i], match, FNM_CASEFOLD)) continue;
diff --git a/ui.c b/ui.c
-index 22ec02e..c01da59 100644
+index 2958c30..07a7569 100644
--- a/ui.c
+++ b/ui.c
-@@ -836,7 +836,6 @@ static void keyCode(int code) {
+@@ -834,7 +834,6 @@ static void keyCode(int code) {
break; case KeyMetaGt: windowScroll(window, -BufferCap);
break; case KeyMetaLt: windowScroll(window, +BufferCap);
@@ -308,7 +309,7 @@ index 22ec02e..c01da59 100644
break; case KeyMetaA: showAuto();
break; case KeyMetaB: edit(id, EditPrevWord, 0);
break; case KeyMetaD: edit(id, EditDeleteNextWord, 0);
-@@ -862,6 +861,12 @@ static void keyCode(int code) {
+@@ -860,6 +859,12 @@ static void keyCode(int code) {
break; case KEY_SEND: windowScroll(window, -BufferCap);
break; case KEY_SHOME: windowScroll(window, +BufferCap);
break; case KEY_UP: windowScroll(window, +1);
@@ -322,5 +323,5 @@ index 22ec02e..c01da59 100644
}
--
-2.28.0
+2.29.2
diff --git a/pkg/catgirl/ver b/pkg/catgirl/ver
@@ -1 +1 @@
-1.2 r0
-\ No newline at end of file
+1.3 r0
