diff options
Diffstat (limited to 'bin/sh')
-rw-r--r-- | bin/sh/error.c | 2 | ||||
-rw-r--r-- | bin/sh/eval.c | 6 | ||||
-rw-r--r-- | bin/sh/expand.c | 16 | ||||
-rw-r--r-- | bin/sh/jobs.c | 4 | ||||
-rw-r--r-- | bin/sh/miscbltin.c | 2 |
5 files changed, 15 insertions, 15 deletions
diff --git a/bin/sh/error.c b/bin/sh/error.c index c30b1a6..0c981a3 100644 --- a/bin/sh/error.c +++ b/bin/sh/error.c @@ -118,7 +118,7 @@ onint(void) * This doesn't seem to be needed, since main() emits a newline. */ #if 0 - if (tcgetpgrp(0) == getpid()) + if (tcgetpgrp(0) == getpid()) write(STDERR_FILENO, "\n", 1); #endif if (rootshell && iflag) diff --git a/bin/sh/eval.c b/bin/sh/eval.c index 031cab3..9d92416 100644 --- a/bin/sh/eval.c +++ b/bin/sh/eval.c @@ -671,15 +671,15 @@ evalcommand(union node *cmd, int flags, struct backcmd *backcmd) for (sp = varlist.list ; sp ; sp = sp->next) if (strncmp(sp->text, PATH, sizeof(PATH) - 1) == 0) { path = sp->text + sizeof(PATH) - 1; - /* + /* * On `PATH=... command`, we need to make * sure that the command isn't using the * non-updated hash table of the outer PATH - * setting and we need to make sure that + * setting and we need to make sure that * the hash table isn't filled with items * from the temporary setting. * - * It would be better to forbit using and + * It would be better to forbit using and * updating the table while this command * runs, by the command finding mechanism * is heavily integrated with hash handling, diff --git a/bin/sh/expand.c b/bin/sh/expand.c index e980589..7fd2ba5 100644 --- a/bin/sh/expand.c +++ b/bin/sh/expand.c @@ -100,7 +100,7 @@ STATIC char *evalvar(char *, int); STATIC int varisset(char *, int); STATIC void varvalue(char *, int, int); STATIC void recordregion(int, int, int); -STATIC void removerecordregions(int); +STATIC void removerecordregions(int); STATIC void ifsbreakup(char *, struct arglist *); STATIC void expandmeta(struct strlist *, int); STATIC void expmeta(char *, char *); @@ -309,7 +309,7 @@ lose: } -STATIC void +STATIC void removerecordregions(int endoff) { if (ifslastp == NULL) @@ -332,7 +332,7 @@ removerecordregions(int endoff) } return; } - + ifslastp = &ifsfirst; while (ifslastp->next && ifslastp->next->begoff < endoff) ifslastp=ifslastp->next; @@ -576,7 +576,7 @@ subevalvar(char *p, char *str, int strloc, int subtype, int startloc, } loc--; if ((varflags & VSQUOTE) && loc > startp && - *(loc - 1) == CTLESC) { + *(loc - 1) == CTLESC) { for (q = startp; q < loc; q++) if (*q == CTLESC) q++; @@ -750,9 +750,9 @@ record: if (!set) { if (subevalvar(p, var, 0, subtype, startloc, varflags)) { varflags &= ~VSNUL; - /* - * Remove any recorded regions beyond - * start of variable + /* + * Remove any recorded regions beyond + * start of variable */ removerecordregions(startloc); goto again; @@ -972,7 +972,7 @@ ifsbreakup(char *string, struct arglist *arglist) do { p = string + ifsp->begoff; nulonly = ifsp->nulonly; - ifs = nulonly ? nullstr : + ifs = nulonly ? nullstr : ( ifsset() ? ifsval() : " \t\n" ); ifsspc = 0; while (p < string + ifsp->endoff) { diff --git a/bin/sh/jobs.c b/bin/sh/jobs.c index 71e80f4..7e1c2c5 100644 --- a/bin/sh/jobs.c +++ b/bin/sh/jobs.c @@ -353,7 +353,7 @@ showjob(struct job *jp, pid_t pid, int sformat, int lformat) WEXITSTATUS(ps->status)); } else { #if JOBS - if (WIFSTOPPED(ps->status)) + if (WIFSTOPPED(ps->status)) i = WSTOPSIG(ps->status); else #endif @@ -787,7 +787,7 @@ forkshell(struct job *jp, union node *n, int mode) ! fd0_redirected_p ()) { close(0); if (open(_PATH_DEVNULL, O_RDONLY) != 0) - error("Can't open %s: %s", + error("Can't open %s: %s", _PATH_DEVNULL, strerror(errno)); } } diff --git a/bin/sh/miscbltin.c b/bin/sh/miscbltin.c index 7c8981b..4ca4fcd 100644 --- a/bin/sh/miscbltin.c +++ b/bin/sh/miscbltin.c @@ -401,7 +401,7 @@ ulimitcmd(int argc __unused, char **argv __unused) } } if (all) { - for (l = limits; l->name; l++) { + for (l = limits; l->name; l++) { char optbuf[40]; if (getrlimit(l->cmd, &limit) < 0) error("can't get limit: %s", strerror(errno)); |