diff options
Diffstat (limited to 'shell')
-rw-r--r-- | shell/hush.c | 4 | ||||
-rw-r--r-- | shell/lash.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/shell/hush.c b/shell/hush.c index 5bc83bc41..666604dd9 100644 --- a/shell/hush.c +++ b/shell/hush.c | |||
@@ -2044,7 +2044,7 @@ static int reserved_word(o_string *dest, struct p_context *ctx) | |||
2044 | *ctx = *old; /* physical copy */ | 2044 | *ctx = *old; /* physical copy */ |
2045 | free(old); | 2045 | free(old); |
2046 | } | 2046 | } |
2047 | b_reset (dest); | 2047 | b_reset(dest); |
2048 | return 1; | 2048 | return 1; |
2049 | } | 2049 | } |
2050 | } | 2050 | } |
@@ -2666,7 +2666,7 @@ static void setup_job_control(void) | |||
2666 | static pid_t shell_pgrp; | 2666 | static pid_t shell_pgrp; |
2667 | /* Loop until we are in the foreground. */ | 2667 | /* Loop until we are in the foreground. */ |
2668 | while (tcgetpgrp (shell_terminal) != (shell_pgrp = getpgrp ())) | 2668 | while (tcgetpgrp (shell_terminal) != (shell_pgrp = getpgrp ())) |
2669 | kill (- shell_pgrp, SIGTTIN); | 2669 | kill(- shell_pgrp, SIGTTIN); |
2670 | 2670 | ||
2671 | /* Ignore interactive and job-control signals. */ | 2671 | /* Ignore interactive and job-control signals. */ |
2672 | signal(SIGINT, SIG_IGN); | 2672 | signal(SIGINT, SIG_IGN); |
diff --git a/shell/lash.c b/shell/lash.c index 192900bb6..f9d9deb62 100644 --- a/shell/lash.c +++ b/shell/lash.c | |||
@@ -582,7 +582,7 @@ static int setup_redirects(struct child_prog *prog, int squirrel[]) | |||
582 | if (openfd != redir->fd) { | 582 | if (openfd != redir->fd) { |
583 | if (squirrel && redir->fd < 3) { | 583 | if (squirrel && redir->fd < 3) { |
584 | squirrel[redir->fd] = dup(redir->fd); | 584 | squirrel[redir->fd] = dup(redir->fd); |
585 | fcntl (squirrel[redir->fd], F_SETFD, FD_CLOEXEC); | 585 | fcntl(squirrel[redir->fd], F_SETFD, FD_CLOEXEC); |
586 | } | 586 | } |
587 | dup2(openfd, redir->fd); | 587 | dup2(openfd, redir->fd); |
588 | close(openfd); | 588 | close(openfd); |
@@ -763,7 +763,7 @@ static int expand_arguments(char *command) | |||
763 | free(tmpcmd); /* Free mem allocated by strsep_space */ | 763 | free(tmpcmd); /* Free mem allocated by strsep_space */ |
764 | if (retval == GLOB_NOSPACE) { | 764 | if (retval == GLOB_NOSPACE) { |
765 | /* Mem may have been allocated... */ | 765 | /* Mem may have been allocated... */ |
766 | globfree (&expand_result); | 766 | globfree(&expand_result); |
767 | bb_error_msg(out_of_space); | 767 | bb_error_msg(out_of_space); |
768 | return FALSE; | 768 | return FALSE; |
769 | } else if (retval != 0) { | 769 | } else if (retval != 0) { |
@@ -786,7 +786,7 @@ static int expand_arguments(char *command) | |||
786 | strcat(command+total_length, expand_result.gl_pathv[i]); | 786 | strcat(command+total_length, expand_result.gl_pathv[i]); |
787 | total_length += length; | 787 | total_length += length; |
788 | } | 788 | } |
789 | globfree (&expand_result); | 789 | globfree(&expand_result); |
790 | } | 790 | } |
791 | } | 791 | } |
792 | free(cmd_copy); | 792 | free(cmd_copy); |
@@ -1478,7 +1478,7 @@ static void setup_job_control(void) | |||
1478 | if (status == (shell_pgrp = getpgrp ())) { | 1478 | if (status == (shell_pgrp = getpgrp ())) { |
1479 | break; | 1479 | break; |
1480 | } | 1480 | } |
1481 | kill (- shell_pgrp, SIGTTIN); | 1481 | kill(- shell_pgrp, SIGTTIN); |
1482 | } | 1482 | } |
1483 | 1483 | ||
1484 | /* Ignore interactive and job-control signals. */ | 1484 | /* Ignore interactive and job-control signals. */ |