diff options
Diffstat (limited to 'bin/sh')
-rw-r--r-- | bin/sh/alias.c | 4 | ||||
-rw-r--r-- | bin/sh/error.c | 4 | ||||
-rw-r--r-- | bin/sh/eval.c | 8 | ||||
-rw-r--r-- | bin/sh/exec.c | 4 | ||||
-rw-r--r-- | bin/sh/expand.c | 16 | ||||
-rw-r--r-- | bin/sh/histedit.c | 18 | ||||
-rw-r--r-- | bin/sh/input.c | 6 | ||||
-rw-r--r-- | bin/sh/jobs.c | 4 | ||||
-rw-r--r-- | bin/sh/main.c | 4 | ||||
-rw-r--r-- | bin/sh/mkinit.c | 4 | ||||
-rw-r--r-- | bin/sh/mksignames.c | 4 | ||||
-rw-r--r-- | bin/sh/options.c | 4 | ||||
-rw-r--r-- | bin/sh/parser.c | 14 | ||||
-rw-r--r-- | bin/sh/redir.c | 6 | ||||
-rw-r--r-- | bin/sh/trap.c | 10 | ||||
-rw-r--r-- | bin/sh/var.c | 6 |
16 files changed, 58 insertions, 58 deletions
diff --git a/bin/sh/alias.c b/bin/sh/alias.c index 97292af..c851287 100644 --- a/bin/sh/alias.c +++ b/bin/sh/alias.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: alias.c,v 1.2 1994/09/24 02:57:20 davidg Exp $ */ #ifndef lint @@ -227,7 +227,7 @@ unaliascmd(argc, argv) char **argv; { int i; - + while ((i = nextopt("a")) != '\0') { if (i == 'a') { rmaliases(); diff --git a/bin/sh/error.c b/bin/sh/error.c index 45795c9..c1c3b82 100644 --- a/bin/sh/error.c +++ b/bin/sh/error.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: error.c,v 1.2 1994/09/24 02:57:27 davidg Exp $ */ #ifndef lint @@ -53,7 +53,7 @@ static char sccsid[] = "@(#)error.c 8.1 (Berkeley) 5/31/93"; #ifdef __STDC__ #include "stdarg.h" #else -#include <varargs.h> +#include <varargs.h> #endif #include <errno.h> diff --git a/bin/sh/eval.c b/bin/sh/eval.c index 91576ca..d5637d1 100644 --- a/bin/sh/eval.c +++ b/bin/sh/eval.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: eval.c,v 1.2 1994/09/24 02:57:29 davidg Exp $ */ #ifndef lint @@ -134,8 +134,8 @@ SHELLPROC { * The eval commmand. */ -evalcmd(argc, argv) - char **argv; +evalcmd(argc, argv) + char **argv; { char *p; char *concat; @@ -233,7 +233,7 @@ evaltree(n, flags) evalsubshell(n, flags); break; case NIF: { - int status = 0; + int status = 0; evaltree(n->nif.test, EV_TESTED); if (evalskip) diff --git a/bin/sh/exec.c b/bin/sh/exec.c index 2dd178c..e9061e8 100644 --- a/bin/sh/exec.c +++ b/bin/sh/exec.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: exec.c,v 1.3 1994/09/24 02:57:32 davidg Exp $ */ #ifndef lint @@ -744,7 +744,7 @@ delete_cmd_entry() { void getcmdentry(name, entry) char *name; - struct cmdentry *entry; + struct cmdentry *entry; { struct tblentry *cmdp = cmdlookup(name, 0); diff --git a/bin/sh/expand.c b/bin/sh/expand.c index 11474aa..a5d69ce 100644 --- a/bin/sh/expand.c +++ b/bin/sh/expand.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: expand.c,v 1.2 1994/09/24 02:57:34 davidg Exp $ + * $Id: expand.c,v 1.3 1995/03/01 13:04:15 guido Exp $ */ #ifndef lint @@ -322,10 +322,10 @@ expari(flag) * scan backwards looking for the start of arithmetic. If the * next previous character is a CTLESC character, then we * have to rescan starting from the beginning since CTLESC - * characters have to be processed left to right. + * characters have to be processed left to right. */ CHECKSTRSPACE(8, expdest); - USTPUTC('\0', expdest); + USTPUTC('\0', expdest); start = stackblock(); p = expdest; while (*p != CTLARI && p >= start) @@ -372,7 +372,7 @@ expbackq(cmd, quoted, flag) saveifs = ifsfirst; savelastp = ifslastp; saveargbackq = argbackq; - saveherefd = herefd; + saveherefd = herefd; herefd = -1; p = grabstackstr(dest); evalbackcmd(cmd, &in); @@ -625,7 +625,7 @@ numvar: sep = '\0'; goto allargs; } - /* fall through */ + /* fall through */ case '*': sep = ' '; allargs: @@ -783,8 +783,8 @@ expandmeta(str, flag) expdir = NULL; INTON; if (exparg.lastp == savelastp) { - /* - * no matches + /* + * no matches */ nometa: *exparg.lastp = str; @@ -969,7 +969,7 @@ msort(list, len) if (len <= 1) return list; - half = len >> 1; + half = len >> 1; p = list; for (n = half ; --n >= 0 ; ) { q = p; diff --git a/bin/sh/histedit.c b/bin/sh/histedit.c index b369050..9cf8a23 100644 --- a/bin/sh/histedit.c +++ b/bin/sh/histedit.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: histedit.c,v 1.2 1994/09/24 02:57:36 davidg Exp $ + * $Id: histedit.c,v 1.3 1995/05/05 06:34:13 davidg Exp $ */ #ifndef lint @@ -140,7 +140,7 @@ sethistsize() { if (hist != NULL) { cp = lookupvar("HISTSIZE"); - if (cp == NULL || *cp == '\0' || + if (cp == NULL || *cp == '\0' || (histsize = atoi(cp)) < 0) histsize = 100; history(hist, H_EVENT, histsize); @@ -172,7 +172,7 @@ histcmd(argc, argv) if (hist == NULL) error("history not active"); - + if (argc == 1) error("missing history argument"); @@ -245,7 +245,7 @@ histcmd(argc, argv) /* * If executing, parse [old=new] now */ - if (lflg == 0 && argc > 0 && + if (lflg == 0 && argc > 0 && ((repl = strchr(argv[0], '=')) != NULL)) { pat = argv[0]; *repl++ = '\0'; @@ -283,7 +283,7 @@ histcmd(argc, argv) } /* * XXX - this should not depend on the event numbers - * always increasing. Add sequence numbers or offset + * always increasing. Add sequence numbers or offset * to the history element in next (diskbased) release. */ direction = first < last ? H_PREV : H_NEXT; @@ -319,7 +319,7 @@ histcmd(argc, argv) out1fmt("%5d ", he->num); out1str(he->str); } else { - char *s = pat ? + char *s = pat ? fc_replace(he->str, pat, repl) : (char *)he->str; if (sflg) { @@ -329,7 +329,7 @@ histcmd(argc, argv) evalstring(s); if (displayhist && hist) { /* - * XXX what about recursive and + * XXX what about recursive and * relative histnums. */ history(hist, H_ENTER, s); @@ -355,7 +355,7 @@ histcmd(argc, argv) readcmdfile(editfile); /* XXX - should read back - quick tst */ unlink(editfile); } - + if (lflg == 0 && active > 0) --active; if (displayhist) @@ -438,7 +438,7 @@ str_to_event(str, last) str); } else { /* - * pattern + * pattern */ he = history(hist, H_PREV_STR, str); if (he == NULL) diff --git a/bin/sh/input.c b/bin/sh/input.c index 0150c30..423d51b 100644 --- a/bin/sh/input.c +++ b/bin/sh/input.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: input.c,v 1.2 1994/09/24 02:57:39 davidg Exp $ */ #ifndef lint @@ -264,7 +264,7 @@ eof: done: if (parsefile->fd == 0 && hist && something) { INTOFF; - history(hist, whichprompt == 1 ? H_ENTER : H_ADD, + history(hist, whichprompt == 1 ? H_ENTER : H_ADD, parsefile->buf); INTON; } @@ -276,7 +276,7 @@ done: */ i = parsenleft + 1; p = parsefile->buf; - for (; i--; p++) + for (; i--; p++) out2c(*p) flushout(out2); } diff --git a/bin/sh/jobs.c b/bin/sh/jobs.c index a93722c..c950bd4 100644 --- a/bin/sh/jobs.c +++ b/bin/sh/jobs.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: jobs.c,v 1.2 1994/09/24 02:57:41 davidg Exp $ */ #ifndef lint @@ -488,7 +488,7 @@ makejob(node, nprocs) INTON; TRACE(("makejob(0x%x, %d) returns %%%d\n", (int)node, nprocs, jp - jobtab + 1)); return jp; -} +} /* diff --git a/bin/sh/main.c b/bin/sh/main.c index 0d33532..9d451d4 100644 --- a/bin/sh/main.c +++ b/bin/sh/main.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: main.c,v 1.2 1994/09/24 02:57:48 davidg Exp $ */ #ifndef lint @@ -153,7 +153,7 @@ main(argc, argv) char **argv; { state1: state = 2; read_profile(".profile"); - } + } state2: state = 3; if ((shinit = lookupvar("ENV")) != NULL && diff --git a/bin/sh/mkinit.c b/bin/sh/mkinit.c index 433bbf7..dc0170e 100644 --- a/bin/sh/mkinit.c +++ b/bin/sh/mkinit.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: mkinit.c,v 1.2 1994/09/24 02:57:54 davidg Exp $ + * $Id: mkinit.c,v 1.3 1994/11/06 06:27:04 pst Exp $ */ #ifndef lint @@ -91,7 +91,7 @@ struct text { int nleft; struct block *start; struct block *last; -}; +}; struct block { struct block *next; diff --git a/bin/sh/mksignames.c b/bin/sh/mksignames.c index f64aaff..5d7b9da 100644 --- a/bin/sh/mksignames.c +++ b/bin/sh/mksignames.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: mksignames.c,v 1.2 1994/09/24 02:57:56 davidg Exp $ */ #ifndef lint @@ -158,7 +158,7 @@ char writer[] = "\ main(argc, argv) char **argv; { - FILE *cfile, *hfile; + FILE *cfile, *hfile; struct sig *sigp; int maxsig; int i; diff --git a/bin/sh/options.c b/bin/sh/options.c index 17e029d..038ae5f 100644 --- a/bin/sh/options.c +++ b/bin/sh/options.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: options.c,v 1.2 1994/09/24 02:58:04 davidg Exp $ */ #ifndef lint @@ -201,7 +201,7 @@ minus_o(name, val) error("Illegal option -o %s", name); } } - + STATIC void setoption(flag, val) diff --git a/bin/sh/parser.c b/bin/sh/parser.c index cc9e0c4..0952ea3 100644 --- a/bin/sh/parser.c +++ b/bin/sh/parser.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: parser.c,v 1.4 1995/01/09 20:00:54 paul Exp $ + * $Id: parser.c,v 1.5 1995/01/11 07:07:00 paul Exp $ */ #ifndef lint @@ -472,7 +472,7 @@ TRACE(("expecting DO got %s %s\n", tokname[got], got == TWORD ? wordtext : "")); STATIC union node * -simplecmd(rpp, redir) +simplecmd(rpp, redir) union node **rpp, *redir; { union node *args, **app; @@ -486,10 +486,10 @@ simplecmd(rpp, redir) args = NULL; app = &args; - /* + /* * We save the incoming value, because we need this for shell * functions. There can not be a redirect or an argument between - * the function name and the open parenthesis. + * the function name and the open parenthesis. */ orig_rpp = rpp; @@ -630,7 +630,7 @@ readtoken() { #ifdef DEBUG int alreadyseen = tokpushback; #endif - + top: t = xxreadtoken(); @@ -926,7 +926,7 @@ readtoken1(firstc, syntax, eofmark, striptabs) } else USTPUTC(')', out); } else { - /* + /* * unbalanced parens * (don't 2nd guess - no error) */ @@ -1176,7 +1176,7 @@ parsebackq: { register c; int savelen; char *str; - + STARTSTACKSTR(out); while ((c = pgetc ()) != '`') { if (c == '\\') { diff --git a/bin/sh/redir.c b/bin/sh/redir.c index 1b4a282..efd1d3a 100644 --- a/bin/sh/redir.c +++ b/bin/sh/redir.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: redir.c,v 1.2 1994/09/24 02:58:10 davidg Exp $ */ #ifndef lint @@ -72,10 +72,10 @@ struct redirtab { MKINIT struct redirtab *redirlist; -/* +/* * We keep track of whether or not fd0 has been redirected. This is for * background commands, where we want to redirect fd0 to /dev/null only - * if it hasn't already been redirected. + * if it hasn't already been redirected. */ int fd0_redirected = 0; diff --git a/bin/sh/trap.c b/bin/sh/trap.c index f478180..a09a0cf9 100644 --- a/bin/sh/trap.c +++ b/bin/sh/trap.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: trap.c,v 1.2 1994/09/24 02:58:18 davidg Exp $ */ #ifndef lint @@ -187,13 +187,13 @@ setsignal(signo) { } } t = &sigmode[signo - 1]; - if (*t == 0) { - /* - * current setting unknown + if (*t == 0) { + /* + * current setting unknown */ sigact = getsigaction(signo); if (sigact == SIG_IGN) { - if (mflag && (signo == SIGTSTP || + if (mflag && (signo == SIGTSTP || signo == SIGTTIN || signo == SIGTTOU)) { *t = S_IGN; /* don't hard ignore these */ } else diff --git a/bin/sh/var.c b/bin/sh/var.c index 93ffce6..00420d5 100644 --- a/bin/sh/var.c +++ b/bin/sh/var.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: var.c,v 1.2 1994/09/24 02:58:22 davidg Exp $ */ #ifndef lint @@ -93,7 +93,7 @@ const struct varinit varinit[] = { {&vmail, VSTRFIXED|VTEXTFIXED|VUNSET, "MAIL="}, {&vmpath, VSTRFIXED|VTEXTFIXED|VUNSET, "MAILPATH="}, {&vpath, VSTRFIXED|VTEXTFIXED, "PATH=:/bin:/usr/bin"}, - /* + /* * vps1 depends on uid */ {&vps2, VSTRFIXED|VTEXTFIXED, "PS2=> "}, @@ -586,7 +586,7 @@ unsetcmd(argc, argv) char **argv; { } if (flg_func == 0 && flg_var == 0) flg_var = 1; - + for (ap = argptr; *ap ; ap++) { if (flg_func) ret |= unsetfunc(*ap); |