logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git

0001-Revert-Use-gnu-case-range-and-gnu-conditional-omitte.patch (13080B)

    

  1. From beac90889183cb71ca3dfc8c9ada9175879b9c34 Mon Sep 17 00:00:00 2001
  2. From: Michael Forney <mforney@mforney.org>
  3. Date: Thu, 7 May 2020 00:36:14 -0700
  4. Subject: [PATCH] Revert "Use gnu-case-range and
  5.  gnu-conditional-omitted-operand extensions"
  7. This reverts commit 75a6aa9258270169f43f56e063f1bfb57eebe56b.
  8. ---
  9.  Makefile   |  2 --
  10.  command.c  | 33 +++++++++++++++++++--------------
  11.  complete.c |  4 ++--
  12.  edit.c     |  2 +-
  13.  handle.c   | 45 +++++++++++++++++++++++++++------------------
  14.  input.c    |  7 ++++++-
  15.  url.c      |  2 +-
  16.  window.c   |  2 +-
  17.  8 files changed, 57 insertions(+), 40 deletions(-)
  19. diff --git a/Makefile b/Makefile
  20. index 3abba03..9518cda 100644
  21. --- a/Makefile
  22. +++ b/Makefile
  23. @@ -2,9 +2,7 @@ PREFIX ?= /usr/local
  24.  BINDIR ?= ${PREFIX}/bin
  25.  MANDIR ?= ${PREFIX}/man
  26.  
  27. -CEXTS = gnu-case-range gnu-conditional-omitted-operand
  28.  CFLAGS += -std=c11 -Wall -Wextra -Wpedantic -Wmissing-prototypes
  29. -CFLAGS += ${CEXTS:%=-Wno-%}
  30.  LDADD.libtls = -ltls
  31.  LDADD.ncursesw = -lncursesw
  32.  
  33. diff --git a/command.c b/command.c
  34. index a127af3..f5be51b 100644
  35. --- a/command.c
  36. +++ b/command.c
  37. @@ -68,8 +68,8 @@ static int splitChunk(const char *cmd, uint id) {
  38.  	int overhead = snprintf(
  39.  		NULL, 0, ":%s!%*s@%*s %s %s :\r\n",
  40.  		self.nick,
  41. -		(self.user ? 0 : network.userLen), (self.user ?: "*"),
  42. -		(self.host ? 0 : network.hostLen), (self.host ?: "*"),
  43. +		(self.user ? 0 : network.userLen), (self.user ? self.user : "*"),
  44. +		(self.host ? 0 : network.hostLen), (self.host ? self.host : "*"),
  45.  		cmd, idNames[id]
  46.  	);
  47.  	assert(overhead > 0 && overhead < 512);
  48. @@ -171,7 +171,7 @@ static void commandPart(uint id, char *params) {
  49.  
  50.  static void commandQuit(uint id, char *params) {
  51.  	(void)id;
  52. -	set(&self.quit, (params ?: "nyaa~"));
  53. +	set(&self.quit, (params ? params : "nyaa~"));
  54.  }
  55.  
  56.  static void commandNick(uint id, char *params) {
  57. @@ -275,7 +275,7 @@ static void commandOp(uint id, char *params) {
  58.  }
  59.  
  60.  static void commandDeop(uint id, char *params) {
  61. -	channelListMode(id, '-', 'o', (params ?: self.nick));
  62. +	channelListMode(id, '-', 'o', (params ? params : self.nick));
  63.  }
  64.  
  65.  static void commandVoice(uint id, char *params) {
  66. @@ -287,7 +287,7 @@ static void commandVoice(uint id, char *params) {
  67.  }
  68.  
  69.  static void commandDevoice(uint id, char *params) {
  70. -	channelListMode(id, '-', 'v', (params ?: self.nick));
  71. +	channelListMode(id, '-', 'v', (params ? params : self.nick));
  72.  }
  73.  
  74.  static void commandBan(uint id, char *params) {
  75. @@ -362,12 +362,12 @@ static void commandWhowas(uint id, char *params) {
  76.  
  77.  static void commandNS(uint id, char *params) {
  78.  	(void)id;
  79. -	ircFormat("NS %s\r\n", (params ?: "HELP"));
  80. +	ircFormat("NS %s\r\n", (params ? params : "HELP"));
  81.  }
  82.  
  83.  static void commandCS(uint id, char *params) {
  84.  	(void)id;
  85. -	ircFormat("CS %s\r\n", (params ?: "HELP"));
  86. +	ircFormat("CS %s\r\n", (params ? params : "HELP"));
  87.  }
  88.  
  89.  static void commandQuery(uint id, char *params) {
  90. @@ -442,7 +442,8 @@ static void commandFilter(enum Heat heat, uint id, char *params) {
  91.  		uiFormat(
  92.  			id, Cold, NULL, "%sing \3%02d%s %s %s %s",
  93.  			(heat == Hot ? "Highlight" : "Ignor"), Brown, filter.mask,
  94. -			(filter.cmd ?: ""), (filter.chan ?: ""), (filter.mesg ?: "")
  95. +			(filter.cmd ? filter.cmd : ""), (filter.chan ? filter.chan : ""),
  96. +			(filter.mesg ? filter.mesg : "")
  97.  		);
  98.  	} else {
  99.  		for (size_t i = 0; i < FilterCap && filters[i].mask; ++i) {
  100. @@ -450,8 +451,9 @@ static void commandFilter(enum Heat heat, uint id, char *params) {
  101.  			uiFormat(
  102.  				Network, Warm, NULL, "%sing \3%02d%s %s %s %s",
  103.  				(heat == Hot ? "Highlight" : "Ignor"), Brown, filters[i].mask,
  104. -				(filters[i].cmd ?: ""), (filters[i].chan ?: ""),
  105. -				(filters[i].mesg ?: "")
  106. +				(filters[i].cmd ? filters[i].cmd : ""),
  107. +				(filters[i].chan ? filters[i].chan : ""),
  108. +				(filters[i].mesg ? filters[i].mesg : "")
  109.  			);
  110.  		}
  111.  	}
  112. @@ -464,8 +466,8 @@ static void commandUnfilter(enum Heat heat, uint id, char *params) {
  113.  	uiFormat(
  114.  		id, Cold, NULL, "%s %sing \3%02d%s %s %s %s",
  115.  		(found ? "No longer" : "Not"), (heat == Hot ? "highlight" : "ignor"),
  116. -		Brown, filter.mask, (filter.cmd ?: ""), (filter.chan ?: ""),
  117. -		(filter.mesg ?: "")
  118. +		Brown, filter.mask, (filter.cmd ? filter.cmd : ""),
  119. +		(filter.chan ? filter.chan : ""), (filter.mesg ? filter.mesg : "")
  120.  	);
  121.  }
  122.  
  123. @@ -494,7 +496,9 @@ static void commandExec(uint id, char *params) {
  124.  	dup2(execPipe[1], STDOUT_FILENO);
  125.  	dup2(utilPipe[1], STDERR_FILENO);
  126.  
  127. -	const char *shell = getenv("SHELL") ?: "/bin/sh";
  128. +	const char *shell = getenv("SHELL");
  129. +	if (!shell)
  130. +		shell = "/bin/sh";
  131.  	execl(shell, shell, "-c", params, NULL);
  132.  	warn("%s", shell);
  133.  	_exit(EX_UNAVAILABLE);
  134. @@ -519,7 +523,8 @@ static void commandHelp(uint id, char *params) {
  135.  	if (pid) return;
  136.  
  137.  	char buf[256];
  138. -	snprintf(buf, sizeof(buf), "%sp^COMMANDS$", (getenv("LESS") ?: ""));
  139. +	const char *less = getenv("LESS");
  140. +	snprintf(buf, sizeof(buf), "%sp^COMMANDS$", (less ? less : ""));
  141.  	setenv("LESS", buf, 1);
  142.  	execlp("man", "man", "1", "catgirl", NULL);
  143.  	dup2(utilPipe[1], STDERR_FILENO);
  144. diff --git a/complete.c b/complete.c
  145. index 9e59db5..9ea1192 100644
  146. --- a/complete.c
  147. +++ b/complete.c
  148. @@ -71,7 +71,7 @@ static struct Node *prepend(struct Node *node) {
  149.  	node->next = head;
  150.  	if (head) head->prev = node;
  151.  	head = node;
  152. -	tail = (tail ?: node);
  153. +	if (!tail) tail = node;
  154.  	return node;
  155.  }
  156.  
  157. @@ -80,7 +80,7 @@ static struct Node *append(struct Node *node) {
  158.  	node->prev = tail;
  159.  	if (tail) tail->next = node;
  160.  	tail = node;
  161. -	head = (head ?: node);
  162. +	if (!head) head = node;
  163.  	return node;
  164.  }
  165.  
  166. diff --git a/edit.c b/edit.c
  167. index bb92edf..07705dd 100644
  168. --- a/edit.c
  169. +++ b/edit.c
  170. @@ -69,7 +69,7 @@ int editReserve(struct Edit *e, size_t index, size_t count) {
  171.  		return -1;
  172.  	}
  173.  	if (e->len + count > e->cap) {
  174. -		size_t cap = (e->cap ?: 256);
  175. +		size_t cap = (e->cap ? e->cap : 256);
  176.  		while (cap < e->len + count) cap *= 2;
  177.  		wchar_t *buf = realloc(e->buf, sizeof(*buf) * cap);
  178.  		if (!buf) return -1;
  179. diff --git a/handle.c b/handle.c
  180. index 9f051c7..a4f1015 100644
  181. --- a/handle.c
  182. +++ b/handle.c
  183. @@ -301,9 +301,9 @@ static void handleReplyISupport(struct Message *msg) {
  184.  			set(&network.setParamModes, setParam);
  185.  			set(&network.channelModes, channel);
  186.  		} else if (!strcmp(key, "EXCEPTS")) {
  187. -			network.excepts = (msg->params[i] ?: "e")[0];
  188. +			network.excepts = (msg->params[i] ? msg->params[i][0] : 'e');
  189.  		} else if (!strcmp(key, "INVEX")) {
  190. -			network.invex = (msg->params[i] ?: "I")[0];
  191. +			network.invex = (msg->params[i] ? msg->params[i][0] : 'I');
  192.  		}
  193.  	}
  194.  }
  195. @@ -356,7 +356,7 @@ static void handleJoin(struct Message *msg) {
  196.  		"\3%02d%s\3\t%s%s%sarrives in \3%02d%s\3",
  197.  		hash(msg->user), msg->nick,
  198.  		(msg->params[2] ? "(" : ""),
  199. -		(msg->params[2] ?: ""),
  200. +		(msg->params[2] ? msg->params[2] : ""),
  201.  		(msg->params[2] ? "\17) " : ""),
  202.  		hash(msg->params[0]), msg->params[0]
  203.  	);
  204. @@ -388,12 +388,14 @@ static void handlePart(struct Message *msg) {
  205.  		id, heat, tagTime(msg),
  206.  		"\3%02d%s\3\tleaves \3%02d%s\3%s%s",
  207.  		hash(msg->user), msg->nick, hash(msg->params[0]), msg->params[0],
  208. -		(msg->params[1] ? ": " : ""), (msg->params[1] ?: "")
  209. +		(msg->params[1] ? ": " : ""),
  210. +		(msg->params[1] ? msg->params[1] : "")
  211.  	);
  212.  	logFormat(
  213.  		id, tagTime(msg), "%s leaves %s%s%s",
  214.  		msg->nick, msg->params[0],
  215. -		(msg->params[1] ? ": " : ""), (msg->params[1] ?: "")
  216. +		(msg->params[1] ? ": " : ""),
  217. +		(msg->params[1] ? msg->params[1] : "")
  218.  	);
  219.  }
  220.  
  221. @@ -410,12 +412,14 @@ static void handleKick(struct Message *msg) {
  222.  		hash(msg->user), msg->nick,
  223.  		completeColor(id, msg->params[1]), msg->params[1],
  224.  		hash(msg->params[0]), msg->params[0],
  225. -		(msg->params[2] ? ": " : ""), (msg->params[2] ?: "")
  226. +		(msg->params[2] ? ": " : ""),
  227. +		(msg->params[2] ? msg->params[2] : "")
  228.  	);
  229.  	logFormat(
  230.  		id, tagTime(msg), "%s kicks %s out of %s%s%s",
  231.  		msg->nick, msg->params[1], msg->params[0],
  232. -		(msg->params[2] ? ": " : ""), (msg->params[2] ?: "")
  233. +		(msg->params[2] ? ": " : ""),
  234. +		(msg->params[2] ? msg->params[2] : "")
  235.  	);
  236.  	completeRemove(id, msg->params[1]);
  237.  	if (kicked) completeClear(id);
  238. @@ -466,13 +470,15 @@ static void handleQuit(struct Message *msg) {
  239.  			id, heat, tagTime(msg),
  240.  			"\3%02d%s\3\tleaves%s%s",
  241.  			hash(msg->user), msg->nick,
  242. -			(msg->params[0] ? ": " : ""), (msg->params[0] ?: "")
  243. +			(msg->params[0] ? ": " : ""),
  244. +			(msg->params[0] ? msg->params[0] : "")
  245.  		);
  246.  		if (id == Network) continue;
  247.  		logFormat(
  248.  			id, tagTime(msg), "%s leaves%s%s",
  249.  			msg->nick,
  250. -			(msg->params[0] ? ": " : ""), (msg->params[0] ?: "")
  251. +			(msg->params[0] ? ": " : ""),
  252. +			(msg->params[0] ? msg->params[0] : "")
  253.  		);
  254.  	}
  255.  	completeRemove(None, msg->nick);
  256. @@ -734,7 +740,7 @@ static void handleReplyUserModeIs(struct Message *msg) {
  257.  		if (*ch == '+') continue;
  258.  		const char *name = UserModes[(byte)*ch];
  259.  		ptr = seprintf(
  260. -			ptr, end, ", +%c%s%s", *ch, (name ? " " : ""), (name ?: "")
  261. +			ptr, end, ", +%c%s%s", *ch, (name ? " " : ""), (name ? name : "")
  262.  		);
  263.  	}
  264.  	uiFormat(
  265. @@ -774,13 +780,13 @@ static void handleReplyChannelModeIs(struct Message *msg) {
  266.  			assert(param < ParamCap);
  267.  			ptr = seprintf(
  268.  				ptr, end, ", +%c%s%s %s",
  269. -				*ch, (name ? " " : ""), (name ?: ""),
  270. +				*ch, (name ? " " : ""), (name ? name : ""),
  271.  				msg->params[param++]
  272.  			);
  273.  		} else {
  274.  			ptr = seprintf(
  275.  				ptr, end, ", +%c%s%s",
  276. -				*ch, (name ? " " : ""), (name ?: "")
  277. +				*ch, (name ? " " : ""), (name ? name : "")
  278.  			);
  279.  		}
  280.  	}
  281. @@ -807,7 +813,7 @@ static void handleMode(struct Message *msg) {
  282.  				hash(msg->user), msg->nick,
  283.  				(set ? "" : "un"),
  284.  				self.color, msg->params[0],
  285. -				set["-+"], *ch, (name ? " " : ""), (name ?: "")
  286. +				set["-+"], *ch, (name ? " " : ""), (name ? name : "")
  287.  			);
  288.  		}
  289.  		return;
  290. @@ -964,7 +970,7 @@ static void handleErrorBanListFull(struct Message *msg) {
  291.  	require(msg, false, 4);
  292.  	uiFormat(
  293.  		idFor(msg->params[1]), Warm, tagTime(msg),
  294. -		"%s", (msg->params[4] ?: msg->params[3])
  295. +		"%s", (msg->params[4] ? msg->params[4] : msg->params[3])
  296.  	);
  297.  }
  298.  
  299. @@ -1069,14 +1075,15 @@ static void handleReplyWhoisIdle(struct Message *msg) {
  300.  		}
  301.  	}
  302.  	char signon[sizeof("0000-00-00 00:00:00")];
  303. -	time_t time = strtol((msg->params[3] ?: ""), NULL, 10);
  304. +	time_t time = (msg->params[3] ? strtol(msg->params[3], NULL, 10) : 0);
  305.  	strftime(signon, sizeof(signon), "%F %T", localtime(&time));
  306.  	uiFormat(
  307.  		Network, Warm, tagTime(msg),
  308.  		"\3%02d%s\3\tis idle for %lu %s%s%s%s",
  309.  		completeColor(Network, msg->params[1]), msg->params[1],
  310.  		idle, unit, (idle != 1 ? "s" : ""),
  311. -		(msg->params[3] ? ", signed on " : ""), (msg->params[3] ? signon : "")
  312. +		(msg->params[3] ? ", signed on " : ""),
  313. +		(msg->params[3] ? signon : "")
  314.  	);
  315.  }
  316.  
  317. @@ -1111,7 +1118,9 @@ static void handleReplyWhoisGeneric(struct Message *msg) {
  318.  		Network, Warm, tagTime(msg),
  319.  		"\3%02d%s\3\t%s%s%s",
  320.  		completeColor(Network, msg->params[1]), msg->params[1],
  321. -		msg->params[2], (msg->params[3] ? " " : ""), (msg->params[3] ?: "")
  322. +		msg->params[2],
  323. +		(msg->params[3] ? " " : ""),
  324. +		(msg->params[3] ? msg->params[3] : "")
  325.  	);
  326.  }
  327.  
  328. @@ -1186,7 +1195,7 @@ static bool isMention(const struct Message *msg) {
  329.  	const char *match = msg->params[1];
  330.  	while (NULL != (match = strstr(match, self.nick))) {
  331.  		char a = (match > msg->params[1] ? match[-1] : ' ');
  332. -		char b = (match[len] ?: ' ');
  333. +		char b = (match[len] ? match[len] : ' ');
  334.  		if ((isspace(a) || ispunct(a)) && (isspace(b) || ispunct(b))) {
  335.  			return true;
  336.  		}
  337. diff --git a/input.c b/input.c
  338. index f3813c4..820bf3c 100644
  339. --- a/input.c
  340. +++ b/input.c
  341. @@ -417,7 +417,6 @@ static void keyCode(int code) {
  342.  		break; case KeyMetaGt: windowScroll(ScrollAll, -1);
  343.  		break; case KeyMetaLt: windowScroll(ScrollAll, +1);
  344.  
  345. -		break; case KeyMeta0 ... KeyMeta9: windowShow(code - KeyMeta0);
  346.  		break; case KeyMetaA: windowAuto();
  347.  		break; case KeyMetaB: error = editFn(edit, EditPrevWord);
  348.  		break; case KeyMetaD: error = editFn(edit, EditDeleteNextWord);
  349. @@ -448,6 +447,12 @@ static void keyCode(int code) {
  350.  		break; case KEY_SEND: windowScroll(ScrollAll, -1);
  351.  		break; case KEY_SHOME: windowScroll(ScrollAll, +1);
  352.  		break; case KEY_UP: windowScroll(ScrollOne, +1);
  353. +
  354. +		break; default: {
  355. +			if (code >= KeyMeta0 && code <= KeyMeta9) {
  356. +				windowShow(code - KeyMeta0);
  357. +			}
  358. +		}
  359.  	}
  360.  	if (error) err(EX_OSERR, "editFn");
  361.  }
  362. diff --git a/url.c b/url.c
  363. index 219a83c..9c721e0 100644
  364. --- a/url.c
  365. +++ b/url.c
  366. @@ -249,7 +249,7 @@ int urlSave(FILE *file) {
  367.  		if (!url->url) continue;
  368.  		int error = 0
  369.  			|| writeString(file, idNames[url->id])
  370. -			|| writeString(file, (url->nick ?: ""))
  371. +			|| writeString(file, (url->nick ? url->nick : ""))
  372.  			|| writeString(file, url->url);
  373.  		if (error) return error;
  374.  	}
  375. diff --git a/window.c b/window.c
  376. index ee0911f..d7bc472 100644
  377. --- a/window.c
  378. +++ b/window.c
  379. @@ -220,7 +220,7 @@ static size_t windowTop(const struct Window *window) {
  380.  }
  381.  
  382.  static size_t windowBottom(const struct Window *window) {
  383. -	size_t bottom = BufferCap - (window->scroll ?: 1);
  384. +	size_t bottom = BufferCap - (window->scroll ? window->scroll : 1);
  385.  	if (window->scroll) bottom -= SplitLines + MarkerLines;
  386.  	return bottom;
  387.  }
  388. -- 
  389. 2.34.1