oasis

commit: a74855fc52794ce99230c036b0040e086dbe37b8
parent 030803441dc55320a2edf4e39d686417da0dfc13
Author: Michael Forney <mforney@mforney.org>
Date:   Thu, 18 Nov 2021 22:28:25 -0800

oksh: Remove tab completion patch

This has some issues when the pattern matches multiple files, so
remove for now.

Diffstat:
M
.gitmodules
1
-
D
pkg/oksh/patch/0001-Fix-tab-completion-with-escaped-characters.patch
97
-------------------------------------------------------------------------------
M
pkg/oksh/ver
2
+-

3 files changed, 1 insertion(+), 99 deletions(-)
diff --git a/.gitmodules b/.gitmodules
@@ -246,7 +246,6 @@
 [submodule "pkg/oksh/src"]
 	path = pkg/oksh/src
 	url = https://github.com/ibara/oksh.git
-	ignore = all
 [submodule "pkg/openssh/src"]
 	path = pkg/openssh/src
 	url = https://github.com/oasislinux/openssh.git
diff --git a/pkg/oksh/patch/0001-Fix-tab-completion-with-escaped-characters.patch b/pkg/oksh/patch/0001-Fix-tab-completion-with-escaped-characters.patch
@@ -1,97 +0,0 @@
-From 89946a1c9eb8c6b9704a0119d8eec8ecbfd27372 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Tue, 10 Nov 2020 16:18:47 -0800
-Subject: [PATCH] Fix tab completion with escaped characters
-
----
- emacs.c | 36 +++++++++++++++---------------------
- 1 file changed, 15 insertions(+), 21 deletions(-)
-
-diff --git a/emacs.c b/emacs.c
-index 2b70992..2ec4fc4 100644
---- a/emacs.c
-+++ b/emacs.c
-@@ -130,6 +130,7 @@ static	int	x_arg_set;
- static	char	*macro_args;
- static	int	prompt_skip;
- static	int	prompt_redraw;
-+static	int	completed;
- 
- static int	x_ins(char *);
- static void	x_delete(int, int);
-@@ -460,6 +461,7 @@ x_ins(char *s)
- 
- 	if (x_do_ins(s, strlen(s)) < 0)
- 		return -1;
-+	completed = 0;
- 	/*
- 	 * x_zots() may result in a call to x_adjust()
- 	 * we want xcp to reflect the new position.
-@@ -566,7 +568,7 @@ x_delete(int nc, int push)
- 	for (cp = x_lastcp(); cp > xcp; )
- 		x_bs(*--cp);
- 
--	return;
-+	completed = 0;
- }
- 
- static int
-@@ -1749,7 +1751,6 @@ do_complete(int flags,	/* XCF_{COMMAND,FILE,COMMAND_FILE} */
- 	int nwords;
- 	int start, end, nlen, olen;
- 	int is_command;
--	int completed = 0;
- 
- 	nwords = x_cf_glob(flags, xbuf, xep - xbuf, xcp - xbuf,
- 	    &start, &end, &words, &is_command);
-@@ -1759,7 +1760,7 @@ do_complete(int flags,	/* XCF_{COMMAND,FILE,COMMAND_FILE} */
- 		return;
- 	}
- 
--	if (type == CT_LIST) {
-+	if (type == CT_LIST || type == CT_COMPLIST && completed) {
- 		x_print_expansions(nwords, words, is_command);
- 		x_redraw(0);
- 		x_free_words(nwords, words);
-@@ -1769,27 +1770,20 @@ do_complete(int flags,	/* XCF_{COMMAND,FILE,COMMAND_FILE} */
- 	olen = end - start;
- 	nlen = x_longest_prefix(nwords, words);
- 	/* complete */
--	if (nwords == 1 || nlen > olen) {
--		x_goto(xbuf + start);
--		x_delete(olen, false);
--		x_escape(words[0], nlen, x_do_ins);
--		x_adjust();
--		completed = 1;
--	}
--	/* add space if single non-dir match */
--	if (nwords == 1 && words[0][nlen - 1] != '/') {
--		x_ins(" ");
--		completed = 1;
--	}
-+	x_goto(xbuf + start);
-+	x_delete(olen, false);
-+	x_escape(words[0], nlen, x_do_ins);
-+	x_adjust();
-+	completed = 1;
- 
--	if (type == CT_COMPLIST && !completed) {
--		x_print_expansions(nwords, words, is_command);
--		completed = 1;
-+	/* add space if single non-dir match */
-+	if (nwords == 1) {
-+		completed = 0;
-+		if (words[0][nlen - 1] != '/')
-+			x_ins(" ");
- 	}
- 
--	if (completed)
--		x_redraw(0);
--
-+	x_redraw(0);
- 	x_free_words(nwords, words);
- }
- 
--- 
-2.29.2
-
diff --git a/pkg/oksh/ver b/pkg/oksh/ver
@@ -1 +1 @@
-6.9 r0
+6.9 r1