d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make sh(1) collapse $HOME into "~" in PS1.

Browse Source 
Reviewed by:	jilles
MFC after:	2 weeks
Sponsored by:	DARPA, AFRL
Differential Revision:	https://reviews.freebsd.org/D18663
This commit is contained in:
Edward Tomasz Napierala 2018-12-28 17:51:40 +00:00
parent f6d3cd4b9e
commit 20c9381c98
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
bin/sh/parser.c
View File

@ -1978,7 +1978,9 @@ getprompt(void *unused __unused)
{
static char ps[PROMPTLEN];
const char *fmt;
const char *home;
const char *pwd;
size_t homelen;
int i, trim;
static char internal_error[] = "??";
@ -2039,8 +2041,24 @@ getprompt(void *unused __unused)
*pwd == '/' && pwd[1] != '\0')
strlcpy(&ps[i], strrchr(pwd, '/') + 1,
PROMPTLEN - i);
else
strlcpy(&ps[i], pwd, PROMPTLEN - i);
else {
home = lookupvar("HOME");
if (home != NULL)
homelen = strlen(home);
if (home != NULL &&
strcmp(home, "/") != 0 &&
strncmp(pwd, home, homelen) == 0 &&
(pwd[homelen] == '/' ||
pwd[homelen] == '\0')) {
strlcpy(&ps[i], "~",
PROMPTLEN - i);
strlcpy(&ps[i + 1],
pwd + homelen,
PROMPTLEN - i - 1);
} else {
strlcpy(&ps[i], pwd, PROMPTLEN - i);
}
}
/* Skip to end of path. */
while (ps[i + 1] != '\0')
i++;