diff options
| author | Eric van Gyzen <vangyzen@FreeBSD.org> | 2016-05-04 02:06:46 +0000 |
|---|---|---|
| committer | Eric van Gyzen <vangyzen@FreeBSD.org> | 2016-05-04 02:06:46 +0000 |
| commit | 8e3543eebcbded967c4d921272064691880174d2 (patch) | |
| tree | 8287a7c6693f4917393dd8323612dd64f9039fc0 /bin | |
| parent | cdd2592ffd82d39de6430346c4807a20bd1a79eb (diff) | |
| download | src-8e3543eebcbded967c4d921272064691880174d2.tar.gz src-8e3543eebcbded967c4d921272064691880174d2.zip | |
sh: Handle empty hostname and $PWD when building prompt
If the hostname is empty and \h is used in $PS1,
the remainder of the prompt following \h will be empty.
Likewise for $PWD and \w. Fix it.
Reviewed by: jilles
MFC after: 1 week
Sponsored by: Dell Inc.
Differential Revision: https://reviews.freebsd.org/D6188
Notes
Notes:
svn path=/head/; revision=299035
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/sh/parser.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/bin/sh/parser.c b/bin/sh/parser.c index 26c1362c7d2a..f3cc98d43cb0 100644 --- a/bin/sh/parser.c +++ b/bin/sh/parser.c @@ -2014,8 +2014,9 @@ getprompt(void *unused __unused) gethostname(&ps[i], PROMPTLEN - i); /* Skip to end of hostname. */ trim = (*fmt == 'h') ? '.' : '\0'; - while ((ps[i+1] != '\0') && (ps[i+1] != trim)) + while ((ps[i] != '\0') && (ps[i] != trim)) i++; + --i; break; /* @@ -2027,7 +2028,7 @@ getprompt(void *unused __unused) case 'W': case 'w': pwd = lookupvar("PWD"); - if (pwd == NULL) + if (pwd == NULL || *pwd == '\0') pwd = "?"; if (*fmt == 'W' && *pwd == '/' && pwd[1] != '\0') |