d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sh: Simplify setinteractive().

Browse Source 
setsignal() does nothing if the signal disposition is already set correctly.
This commit is contained in:
Jilles Tjoelker 2017-04-22 21:31:37 +00:00
parent 6e5e4dbd06
commit 3be4e97d2b
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=317298
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/sh/options.c
View File

@ -131,7 +131,7 @@ procargs(int argc, char **argv)
void void
optschanged(void) optschanged(void)
{ {
setinteractive(iflag); setinteractive();
#ifndef NO_HISTORY #ifndef NO_HISTORY
histedit(); histedit();
#endif #endif

9
bin/sh/trap.c
View File

@ -478,19 +478,14 @@ dotrap(void)
/* /*
* Controls whether the shell is interactive or not. * Controls whether the shell is interactive or not based on iflag.
*/ */
void void
setinteractive(int on) setinteractive(void)
{ {
static int is_interactive = -1;
if (on == is_interactive)
return;
setsignal(SIGINT); setsignal(SIGINT);
setsignal(SIGQUIT); setsignal(SIGQUIT);
setsignal(SIGTERM); setsignal(SIGTERM);
is_interactive = on;
} }

2
bin/sh/trap.h
View File

@ -43,6 +43,6 @@ void ignoresig(int);
int issigchldtrapped(void); int issigchldtrapped(void);
void onsig(int); void onsig(int);
void dotrap(void); void dotrap(void);
void setinteractive(int); void setinteractive(void);
void exitshell(int) __dead2; void exitshell(int) __dead2;
void exitshell_savedstatus(void) __dead2; void exitshell_savedstatus(void) __dead2;