summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2020-03-09 19:17:31 -0400
committerJune McEnroe <june@causal.agency>2020-03-09 20:01:30 -0400
commitabcca23c148398af769067a4aa7a43f7f759b526 (patch)
treede5cd533a6990d1e2418980eca5cbf82b103bc1a
parentAdd PS0 pre-prompt string (diff)
downloadsrc-abcca23c148398af769067a4aa7a43f7f759b526.tar.gz
src-abcca23c148398af769067a4aa7a43f7f759b526.zip
Shorten $HOME to ~ in prompt expansion
Diffstat (limited to '')
-rw-r--r--bin/1sh/parser.c18
1 files changed, 14 insertions, 4 deletions
diff --git a/bin/1sh/parser.c b/bin/1sh/parser.c
index 080b84e7..3f73220f 100644
--- a/bin/1sh/parser.c
+++ b/bin/1sh/parser.c
@@ -1978,7 +1978,7 @@ pgetc_linecont(void)
 static char *
 expandprompt(const char *fmt) {
 	static char ps[PROMPTLEN];
-	const char *pwd;
+	const char *pwd, *home;
 	int i, trim;
 
 	/*
@@ -2015,17 +2015,27 @@ expandprompt(const char *fmt) {
 			case 'W':
 			case 'w':
 				pwd = lookupvar("PWD");
+				home = lookupvar("HOME");
 				if (pwd == NULL || *pwd == '\0')
 					pwd = "?";
+				if (home == NULL || *home == '\0')
+					home = "?";
 				if (*fmt == 'W' &&
-				    *pwd == '/' && pwd[1] != '\0')
+				    *pwd == '/' && pwd[1] != '\0' &&
+					strcmp(pwd, home) != 0) {
 					strlcpy(&ps[i], strrchr(pwd, '/') + 1,
 					    PROMPTLEN - i);
-				else
+				} else {
+					if (strncmp(pwd, home, strlen(home)) == 0) {
+						ps[i++] = '~';
+						pwd += strlen(home);
+					}
 					strlcpy(&ps[i], pwd, PROMPTLEN - i);
+				}
 				/* Skip to end of path. */
-				while (ps[i + 1] != '\0')
+				while (ps[i] != '\0')
 					i++;
+				--i;
 				break;
 
 				/*