diff options
| author | June McEnroe <june@causal.agency> | 2019-04-19 20:00:31 -0400 |
|---|---|---|
| committer | June McEnroe <june@causal.agency> | 2019-04-19 20:00:31 -0400 |
| commit | bcdb7dddd78f94fd835908574b8661e58e40f5d8 (patch) | |
| tree | 57f054912f0ab8d8e4f377646960a59669a90912 /bin | |
| parent | Simplify ENV default value in catsh.1 (diff) | |
| download | src-bcdb7dddd78f94fd835908574b8661e58e40f5d8.tar.gz src-bcdb7dddd78f94fd835908574b8661e58e40f5d8.zip | |
Set PS1 to \$ by default
Just a simplification of presumably old behavior.
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/catsh/catsh.1 | 4 | ||||
| -rw-r--r-- | bin/catsh/var.c | 14 |
2 files changed, 3 insertions, 15 deletions
diff --git a/bin/catsh/catsh.1 b/bin/catsh/catsh.1 index 6940007f..ab5c608e 100644 --- a/bin/catsh/catsh.1 +++ b/bin/catsh/catsh.1 @@ -1548,9 +1548,7 @@ may include any of the formatting sequences from . .It Va PS1 The primary prompt string, which defaults to -.Dq Li "$ " , -unless you are the superuser, in which case it defaults to -.Dq Li "# " . +.Dq Li "\e$ " . .Va PS1 may include any of the following formatting sequences, which are replaced by the given information: diff --git a/bin/catsh/var.c b/bin/catsh/var.c index f11ff8b7..435d3307 100644 --- a/bin/catsh/var.c +++ b/bin/catsh/var.c @@ -129,9 +129,8 @@ static const struct varinit varinit[] = { changepath }, { &vps0, VUNSET, "PS0=", NULL }, - /* - * vps1 depends on uid - */ + { &vps1, 0, "PS1=\\$ ", + NULL }, { &vps2, 0, "PS2=> ", NULL }, { &vps4, 0, "PS4=+ ", @@ -194,15 +193,6 @@ initvar(void) vp->flags = ip->flags | VSTRFIXED | VTEXTFIXED; vp->func = ip->func; } - /* - * PS1 depends on uid - */ - if (find_var("PS1", &vpp, &vps1.name_len) == NULL) { - vps1.next = *vpp; - *vpp = &vps1; - vps1.text = __DECONST(char *, geteuid() ? "PS1=$ " : "PS1=# "); - vps1.flags = VSTRFIXED|VTEXTFIXED; - } fmtstr(ppid, sizeof(ppid), "%d", (int)getppid()); setvarsafe("PPID", ppid, 0); for (envp = environ ; *envp ; envp++) { |