diff options
| author | June McEnroe <june@causal.agency> | 2020-03-09 19:17:31 -0400 |
|---|---|---|
| committer | June McEnroe <june@causal.agency> | 2020-03-09 20:01:30 -0400 |
| commit | 473b9b6d747ecda456adea7ae7d3ff6d9bcf91ed (patch) | |
| tree | e86192608c4a55db542963686adb33c8cc995bae /bin | |
| parent | Add PS0 pre-prompt string (diff) | |
| download | src-473b9b6d747ecda456adea7ae7d3ff6d9bcf91ed.tar.gz src-473b9b6d747ecda456adea7ae7d3ff6d9bcf91ed.zip | |
Shorten $HOME to ~ in prompt expansion
Diffstat (limited to '')
| -rw-r--r-- | bin/1sh/parser.c | 18 |
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; /* |