summary refs log tree commit diff
path: root/bin
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2019-11-20 20:13:24 -0500
committerJune McEnroe <june@causal.agency>2019-11-20 20:13:24 -0500
commit9415561a615599cb75e1db5e3679f5551f0da947 (patch)
treef45888755aac082f48db3fbd41d495bc4d63e917 /bin
parentRemove color from 1sh prompts (diff)
downloadsrc-9415561a615599cb75e1db5e3679f5551f0da947.tar.gz
src-9415561a615599cb75e1db5e3679f5551f0da947.zip
Remove PSlit
Diffstat (limited to 'bin')
-rw-r--r--bin/1sh/1sh.116
-rw-r--r--bin/1sh/histedit.c24
-rw-r--r--bin/1sh/myhistedit.h1
-rw-r--r--bin/1sh/var.c3
4 files changed, 0 insertions, 44 deletions
diff --git a/bin/1sh/1sh.1 b/bin/1sh/1sh.1
index 42d683a8..65e0bda9 100644
--- a/bin/1sh/1sh.1
+++ b/bin/1sh/1sh.1
@@ -1585,22 +1585,6 @@ is active).
 The default is
 .Dq Li "+ " .
 .
-.It Va PSlit
-Defines the character which may be embedded in pairs, in
-.Va PS1 ,
-.Va PS2 ,
-.Va RPS1
-or
-.Va RPS2
-to indicate to
-.Xr editline 7
-that the characters between each pair of occurrences of the
-.Va PSlit
-character will not appear in the visible prompt, and will not
-cause the terminal's cursor to change position, but rather set terminal
-attributes for the following prompt character(s) at least one of
-which must be present.
-.
 .It Va RPS1
 The primary right prompt string.
 .Va RPS1
diff --git a/bin/1sh/histedit.c b/bin/1sh/histedit.c
index 08339a00..0d23e9aa 100644
--- a/bin/1sh/histedit.c
+++ b/bin/1sh/histedit.c
@@ -224,30 +224,6 @@ sethistsize(const char *hs)
 }
 
 void
-setpslit(const char *lit_ch) {
-	wchar_t wc;
-
-	if (!(iflag && editing && el))
-		return;
-
-	if (lit_ch == NULL) {
-		el_set(el, EL_PROMPT, getprompt);
-		el_set(el, EL_RPROMPT, getrprompt);
-		return;
-	}
-
-	mbtowc(&wc, NULL, 1);		/* state init */
-
-	if (mbtowc(&wc, lit_ch, strlen(lit_ch)) <= 0) {
-		el_set(el, EL_PROMPT, getprompt);
-		el_set(el, EL_RPROMPT, getrprompt);
-	} else {
-		el_set(el, EL_PROMPT_ESC, getprompt, (int)wc);
-		el_set(el, EL_RPROMPT_ESC, getrprompt, (int)wc);
-	}
-}
-
-void
 setterm(const char *term)
 {
 	if (rootshell && el != NULL && term != NULL)
diff --git a/bin/1sh/myhistedit.h b/bin/1sh/myhistedit.h
index 6eebe521..feb4803e 100644
--- a/bin/1sh/myhistedit.h
+++ b/bin/1sh/myhistedit.h
@@ -41,6 +41,5 @@ extern int displayhist;
 void histedit(void);
 void sethistfile(const char *);
 void sethistsize(const char *);
-void setpslit(const char *);
 void setterm(const char *);
 
diff --git a/bin/1sh/var.c b/bin/1sh/var.c
index 83e48732..6cfeefe4 100644
--- a/bin/1sh/var.c
+++ b/bin/1sh/var.c
@@ -87,7 +87,6 @@ struct varinit {
 #ifndef NO_HISTORY
 struct var vhistfile;
 struct var vhistsize;
-struct var vpslit;
 struct var vterm;
 #endif
 struct var venv;
@@ -140,8 +139,6 @@ static const struct varinit varinit[] = {
 	{ &vrps2,	VUNSET,				"RPS2=",
 	  NULL },
 #ifndef NO_HISTORY
-	{ &vpslit,	VUNSET,				"PSlit=",
-	  setpslit },
 	{ &vterm,	VUNSET,				"TERM=",
 	  setterm },
 #endif
gned-off-by: Christian Hesse <mail@eworm.de> 2019-05-20ui-shared: restrict to 15 levelsJason A. Donenfeld Perhaps a more ideal version of this would be to not print breadcrumbs at all for paths that don't exist in the given repo at the given oid. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> Reported-by: Fydor Wire Snark <wsnark@tuta.io> 2019-02-23ui-diff,ui-tag: don't use htmlf with non-formatted stringsChris Mayo Signed-off-by: Chris Mayo <aklhfex@gmail.com> 2019-02-23ui-ssdiff: resolve HTML5 validation errorsChris Mayo - Remove ids from anchor elements. They were unusable because they were duplicated between files and versions of files. - Always close span, with html(). - Fix missing / on closing tr element in cgit_ssdiff_header_end(). Signed-off-by: Chris Mayo <aklhfex@gmail.com> 2019-01-03filters: migrate from luacrypto to luaosslJason A. Donenfeld luaossl has no upstream anymore and doesn't support OpenSSL 1.1, whereas luaossl is quite active. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 2019-01-02ui-shared: fix broken sizeof in title setting and rewriteJason A. Donenfeld The old algorithm was totally incorrect. While we're at it, use « instead of \, since it makes more sense. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 2018-12-09git: update to v2.20.0Christian Hesse Update to git version v2.20.0. Required changes follow upstream commits: * 00436bf1b1c2a8fe6cf5d2c2457d419d683042f4 (archive: initialize archivers earlier) * 611e42a5980a3a9f8bb3b1b49c1abde63c7a191e (xdiff: provide a separate emit callback for hunks) Signed-off-by: Christian Hesse <mail@eworm.de> 2018-11-25ui-blame: set repo for sbJason A. Donenfeld Otherwise recent git complains and crashes with: "BUG: blame.c:1787: repo is NULL". Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 2018-11-25auth-filter: pass url with query string attachedJason A. Donenfeld Otherwise redirections come out wrong. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 2018-11-21git: use xz compressed archive for downloadChristian Hesse Upstream will stop providing gz compressed source tarballs [0], so stop using them. [0] https://lists.zx2c4.com/pipermail/cgit/2018-November/004254.html Signed-off-by: Christian Hesse <mail@eworm.de> 2018-10-12git: update to v2.19.1Christian Hesse Update to git version v2.19.1. Required changes follow upstream commits: * commit: add repository argument to get_cached_commit_buffer (3ce85f7e5a41116145179f0fae2ce6d86558d099) * commit: add repository argument to lookup_commit_reference (2122f6754c93be8f02bfb5704ed96c88fc9837a8) * object: add repository argument to parse_object (109cd76dd3467bd05f8d2145b857006649741d5c) * tag: add repository argument to deref_tag (a74093da5ed601a09fa158e5ba6f6f14c1142a3e) * tag: add repository argument to lookup_tag (ce71efb713f97f476a2d2ab541a0c73f684a5db3) * tree: add repository argument to lookup_tree (f86bcc7b2ce6cad68ba1a48a528e380c6126705e) * archive.c: avoid access to the_index (b612ee202a48f129f81f8f6a5af6cf71d1a9caef) * for_each_*_object: move declarations to object-store.h (0889aae1cd18c1804ba01c1a4229e516dfb9fe9b) Signed-off-by: Christian Hesse <mail@eworm.de> 2018-09-11ui-ssdiff: ban strcat()Christian Hesse Git upstream bans strcat() with commit: banned.h: mark strcat() as banned 1b11b64b815db62f93a04242e4aed5687a448748 Signed-off-by: Christian Hesse <mail@eworm.de> 2018-09-11ui-ssdiff: ban strncpy()Christian Hesse Git upstream bans strncpy() with commit: banned.h: mark strncpy() as banned e488b7aba743d23b830d239dcc33d9ca0745a9ad Signed-off-by: Christian Hesse <mail@eworm.de> 2018-09-11ui-shared: ban strcat()Christian Hesse Git upstream bans strcat() with commit: banned.h: mark strcat() as banned 1b11b64b815db62f93a04242e4aed5687a448748 To avoid compiler warnings from gcc 8.1.x we get the hard way. Signed-off-by: Christian Hesse <mail@eworm.de> 2018-09-11ui-patch: ban sprintf()Christian Hesse Git upstream bans sprintf() with commit: banned.h: mark sprintf() as banned cc8fdaee1eeaf05d8dd55ff11f111b815f673c58 Signed-off-by: Christian Hesse <mail@eworm.de> 2018-09-11ui-log: ban strncpy()Christian Hesse Git upstream bans strncpy() with commit: banned.h: mark strncpy() as banned e488b7aba743d23b830d239dcc33d9ca0745a9ad Signed-off-by: Christian Hesse <mail@eworm.de> 2018-09-11ui-log: ban strcpy()Christian Hesse Git upstream bans strcpy() with commit: automatically ban strcpy() c8af66ab8ad7cd78557f0f9f5ef6a52fd46ee6dd Signed-off-by: Christian Hesse <mail@eworm.de> 2018-09-11parsing: ban sprintf()Christian Hesse Git upstream bans sprintf() with commit: banned.h: mark sprintf() as banned cc8fdaee1eeaf05d8dd55ff11f111b815f673c58 Signed-off-by: Christian Hesse <mail@eworm.de> 2018-09-11parsing: ban strncpy()Christian Hesse Git upstream bans strncpy() with commit: banned.h: mark strncpy() as banned e488b7aba743d23b830d239dcc33d9ca0745a9ad Signed-off-by: Christian Hesse <mail@eworm.de> 2018-08-28filters: generate anchor links from markdownChristian Hesse This makes the markdown filter generate anchor links for headings. Signed-off-by: Christian Hesse <mail@eworm.de> Tested-by: jean-christophe manciot <actionmystique@gmail.com> 2018-08-03Bump version.Jason A. Donenfeld Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 2018-08-03clone: fix directory traversalJason A. Donenfeld This was introduced in the initial version of this code, way back when in 2008. $ curl http://127.0.0.1/cgit/repo/objects/?path=../../../../../../../../../etc/passwd root:x:0:0:root:/root:/bin/sh ... Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> Reported-by: Jann Horn <jannh@google.com> 2018-08-03config: record repo.snapshot-prefix in the per-repo configKonstantin Ryabitsev