emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hush: fix $$ handling

Browse Source
This commit is contained in:
Denis Vlasenko 2008-06-17 12:28:44 +00:00
parent 13436ea0dd
commit 16c2fea280
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
shell/hush.c
View File

@ -395,6 +395,7 @@ struct globals {
int run_list_level; int run_list_level;
pid_t saved_task_pgrp; pid_t saved_task_pgrp;
pid_t saved_tty_pgrp; pid_t saved_tty_pgrp;
pid_t root_pid;
int last_jobid; int last_jobid;
struct pipe *job_list; struct pipe *job_list;
struct pipe *toplevel_list; struct pipe *toplevel_list;
@ -441,6 +442,7 @@ enum { run_list_level = 0 };
#define run_list_level (G.run_list_level ) #define run_list_level (G.run_list_level )
#define saved_task_pgrp (G.saved_task_pgrp ) #define saved_task_pgrp (G.saved_task_pgrp )
#define saved_tty_pgrp (G.saved_tty_pgrp ) #define saved_tty_pgrp (G.saved_tty_pgrp )
#define root_pid (G.root_pid )
#define last_jobid (G.last_jobid ) #define last_jobid (G.last_jobid )
#define job_list (G.job_list ) #define job_list (G.job_list )
#define toplevel_list (G.toplevel_list ) #define toplevel_list (G.toplevel_list )
@ -2353,7 +2355,7 @@ static int expand_vars_to_list(o_string *output, int n, char *arg, char or_mask)
/* Highest bit in first_ch indicates that var is double-quoted */ /* Highest bit in first_ch indicates that var is double-quoted */
case '$': /* pid */ case '$': /* pid */
/* FIXME: (echo $$) should still print pid of main shell */ /* FIXME: (echo $$) should still print pid of main shell */
val = utoa(getpid()); /* rootpid? */ val = utoa(root_pid);
break; break;
case '!': /* bg pid */ case '!': /* bg pid */
val = last_bg_pid ? utoa(last_bg_pid) : (char*)""; val = last_bg_pid ? utoa(last_bg_pid) : (char*)"";
@ -3752,6 +3754,8 @@ int hush_main(int argc, char **argv)
INIT_G(); INIT_G();
root_pid = getpid();
/* Deal with HUSH_VERSION */ /* Deal with HUSH_VERSION */
shell_ver = const_shell_ver; /* copying struct here */ shell_ver = const_shell_ver; /* copying struct here */
top_var = &shell_ver; top_var = &shell_ver;

1
shell/hush_test/hush-misc/pid.right Normal file
View File

@ -0,0 +1 @@
0

1
shell/hush_test/hush-misc/pid.tests Executable file
View File

@ -0,0 +1 @@
test `(echo $$)` = `echo $$`; echo $?