aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2021-05-11 12:00:14 -0500
committerRob Landley <rob@landley.net>2021-05-11 12:00:14 -0500
commit2833b8b99ee3db8b3a43644c2d46593f944c6dcb (patch)
tree7225ce3549885468ec6c986782c10af3c8892c74
parent1de4b25999392fd72438177661c63a445a477cdf (diff)
downloadtoybox-2833b8b99ee3db8b3a43644c2d46593f944c6dcb.tar.gz
Add $BASHPID to show current process in () and such. ($$ is top level shell)
-rw-r--r--toys/pending/sh.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/toys/pending/sh.c b/toys/pending/sh.c
index ab2408a0..b4df9974 100644
--- a/toys/pending/sh.c
+++ b/toys/pending/sh.c
@@ -535,6 +535,7 @@ static char *getvar(char *s)
else if (c == 'R') sprintf(toybuf, "%ld", random()&((1<<16)-1));
else if (c == 'L') sprintf(toybuf, "%u", TT.ff->pl->lineno);
else if (c == 'G') sprintf(toybuf, "TODO: GROUPS");
+ else if (c == 'B') sprintf(toybuf, "%d", getpid());
return toybuf;
}
@@ -3602,7 +3603,7 @@ static void subshell_setup(void)
{
int ii, from, pid, ppid, zpid, myppid = getppid(), len, uid = getuid();
struct passwd *pw = getpwuid(uid);
- char *s, *ss, *magic[] = {"SECONDS", "RANDOM", "LINENO", "GROUPS"},
+ char *s, *ss, *magic[] = {"SECONDS", "RANDOM", "LINENO", "GROUPS", "BASHPID"},
*readonly[] = {xmprintf("EUID=%d", geteuid()), xmprintf("UID=%d", uid),
xmprintf("PPID=%d", myppid)};
struct stat st;
@@ -3616,8 +3617,8 @@ static void subshell_setup(void)
// Initialize magic and read only local variables
srandom(TT.SECONDS = millitime());
- for (ii = 0; ii<ARRAY_LEN(magic); ii++)
- initvar(magic[ii], "")->flags = VAR_MAGIC|(VAR_INT*('G'!=*magic[ii]));
+ for (ii = 0; ii<ARRAY_LEN(magic) && (s = magic[ii]); ii++)
+ initvar(s, "")->flags = VAR_MAGIC+VAR_INT*('G'!=*s)+VAR_READONLY*('B'==*s);
for (ii = 0; ii<ARRAY_LEN(readonly); ii++)
addvar(readonly[ii], TT.ff)->flags = VAR_READONLY|VAR_INT;