unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed

blob c3f65d3f3b58d6e3e65c6443186c5ae856cffac4 876 bytes (raw)
name: gnu/packages/patches/xterm-shell.patch 	 # note: path name is non-authoritative(*)

Accept the value of $SHELL or the shell in the user's password entry,
even if it's not found in /etc/shells.

Patch by Mark H Weaver <mhw@netris.org>.

--- xterm/main.c.orig	2014-01-15 21:12:25.000000000 -0500
+++ xterm/main.c	2014-02-13 01:55:04.840576171 -0500
@@ -4570,12 +4570,12 @@
 	    if (validShell(explicit_shname)) {
 		xtermSetenv("SHELL", explicit_shname);
 		shell_path = explicit_shname;
-	    } else if (validShell(shell_path = x_getenv("SHELL"))) {
+	    } else if (shell_path = x_getenv("SHELL")) {
 		;		/* OK */
 	    } else if ((!OkPasswd(&pw) && !x_getpwuid(screen->uid, &pw))
 		       || *(shell_path = x_strdup(pw.pw_shell)) == 0) {
 		shell_path = resetShell(shell_path);
-	    } else if (validShell(shell_path)) {
+	    } else if (x_nonempty(shell_path)) {
 		xtermSetenv("SHELL", shell_path);
 	    } else {
 		shell_path = resetShell(shell_path);

debug log:

solving c3f65d3 ...
found c3f65d3 in https://yhetil.org/guix-devel/87zjlvh276.fsf@netris.org/

applying [1/1] https://yhetil.org/guix-devel/87zjlvh276.fsf@netris.org/
diff --git a/gnu/packages/patches/xterm-shell.patch b/gnu/packages/patches/xterm-shell.patch
new file mode 100644
index 0000000..c3f65d3

1:15: space before tab in indent.
 	    if (validShell(explicit_shname)) {
1:16: space before tab in indent.
 		xtermSetenv("SHELL", explicit_shname);
1:17: space before tab in indent.
 		shell_path = explicit_shname;
1:20: space before tab in indent.
 		;		/* OK */
1:21: space before tab in indent.
 	    } else if ((!OkPasswd(&pw) && !x_getpwuid(screen->uid, &pw))
Checking patch gnu/packages/patches/xterm-shell.patch...
Applied patch gnu/packages/patches/xterm-shell.patch cleanly.
warning: squelched 5 whitespace errors
warning: 10 lines add whitespace errors.

index at:
100644 c3f65d3f3b58d6e3e65c6443186c5ae856cffac4	gnu/packages/patches/xterm-shell.patch

(*) Git path names are given by the tree(s) the blob belongs to.
    Blobs themselves have no identifier aside from the hash of its contents.^

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).