diff options
Diffstat (limited to 'bin')
-rw-r--r-- | bin/cp/cp.c | 20 | ||||
-rw-r--r-- | bin/csh/USD.doc/csh.1 | 16 | ||||
-rw-r--r-- | bin/csh/const.c | 12 | ||||
-rw-r--r-- | bin/csh/csh.c | 16 | ||||
-rw-r--r-- | bin/csh/dir.c | 6 | ||||
-rw-r--r-- | bin/csh/dol.c | 10 | ||||
-rw-r--r-- | bin/csh/exec.c | 6 | ||||
-rw-r--r-- | bin/csh/file.c | 6 | ||||
-rw-r--r-- | bin/csh/func.c | 8 | ||||
-rw-r--r-- | bin/csh/glob.c | 12 | ||||
-rw-r--r-- | bin/csh/lex.c | 6 | ||||
-rw-r--r-- | bin/csh/parse.c | 18 | ||||
-rw-r--r-- | bin/csh/str.c | 12 | ||||
-rw-r--r-- | bin/ed/buf.c | 6 | ||||
-rw-r--r-- | bin/ed/main.c | 12 | ||||
-rw-r--r-- | bin/ed/re.c | 6 | ||||
-rw-r--r-- | bin/ed/sub.c | 6 | ||||
-rw-r--r-- | bin/expr/expr.c | 6 | ||||
-rw-r--r-- | bin/ksh/c_ksh.c | 22 | ||||
-rw-r--r-- | bin/ksh/c_sh.c | 6 | ||||
-rw-r--r-- | bin/ksh/c_test.c | 8 | ||||
-rw-r--r-- | bin/ksh/c_ulimit.c | 4 | ||||
-rw-r--r-- | bin/ksh/edit.c | 6 | ||||
-rw-r--r-- | bin/ksh/emacs.c | 38 | ||||
-rw-r--r-- | bin/ksh/eval.c | 4 | ||||
-rw-r--r-- | bin/ksh/exec.c | 10 | ||||
-rw-r--r-- | bin/ksh/io.c | 6 | ||||
-rw-r--r-- | bin/ksh/jobs.c | 6 | ||||
-rw-r--r-- | bin/ksh/lex.c | 4 | ||||
-rw-r--r-- | bin/ksh/main.c | 4 | ||||
-rw-r--r-- | bin/ksh/syn.c | 4 | ||||
-rw-r--r-- | bin/systrace/filter.c | 4 | ||||
-rw-r--r-- | bin/systrace/systrace.1 | 4 |
33 files changed, 157 insertions, 157 deletions
diff --git a/bin/cp/cp.c b/bin/cp/cp.c index 43d4f15b8c0..cbe40e293a0 100644 --- a/bin/cp/cp.c +++ b/bin/cp/cp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cp.c,v 1.18 2002/02/16 21:27:06 millert Exp $ */ +/* $OpenBSD: cp.c,v 1.19 2002/06/09 05:47:26 todd Exp $ */ /* $NetBSD: cp.c,v 1.14 1995/09/07 06:14:51 jtc Exp $ */ /* @@ -47,17 +47,17 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)cp.c 8.5 (Berkeley) 4/29/95"; #else -static char rcsid[] = "$OpenBSD: cp.c,v 1.18 2002/02/16 21:27:06 millert Exp $"; +static char rcsid[] = "$OpenBSD: cp.c,v 1.19 2002/06/09 05:47:26 todd Exp $"; #endif #endif /* not lint */ /* * Cp copies source files to target files. - * + * * The global PATH_T structure "to" always contains the path to the * current target file. Since fts(3) does not change directories, * this path can be either absolute or dot-relative. - * + * * The basic algorithm is to initialize "to" and use fts(3) to traverse * the file hierarchy rooted in the argument list. A trivial case is the * case of 'cp file1 file2'. The more interesting case is the case of @@ -220,7 +220,7 @@ main(argc, argv) /* * Case (1). Target is not a directory. */ - if (argc > 1) + if (argc > 1) usage(); /* * Need to detect the case: @@ -254,7 +254,7 @@ char * find_last_component(path) char *path; -{ +{ char *p; if ((p = strrchr(path, '/')) == NULL) @@ -308,8 +308,8 @@ copy(argv, type, fts_options) } /* - * If we are in case (2) or (3) above, we need to append the - * source name to the target name. + * If we are in case (2) or (3) above, we need to append the + * source name to the target name. */ if (type != FILE_TO_FILE) { /* @@ -435,8 +435,8 @@ copy(argv, type, fts_options) } /* * If not -p and directory didn't exist, set it to be - * the same as the from directory, unmodified by the - * umask; arguably wrong, but it's been that way + * the same as the from directory, unmodified by the + * umask; arguably wrong, but it's been that way * forever. */ if (pflag && setfile(curr->fts_statp, 0)) diff --git a/bin/csh/USD.doc/csh.1 b/bin/csh/USD.doc/csh.1 index 9d687d3456b..c0a924ae746 100644 --- a/bin/csh/USD.doc/csh.1 +++ b/bin/csh/USD.doc/csh.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: csh.1,v 1.4 1999/05/12 21:58:32 aaron Exp $ +.\" $OpenBSD: csh.1,v 1.5 2002/06/09 05:47:27 todd Exp $ .\" $NetBSD: csh.1,v 1.3 1995/03/21 09:03:33 cgd Exp $ .\" .\" Copyright (c) 1980, 1993 @@ -121,7 +121,7 @@ for it in the glossary. Acknowledgements .PP Numerous people have provided good input about previous versions -of +of .I csh and aided in its debugging and in the debugging of its documentation. I would especially like to thank Michael Ubell @@ -211,7 +211,7 @@ is to be read ``control-\fIx\fR'' and represents the striking of the \fIx\fR key while the control key is held down.) The mail program then echoed the characters `EOT' and transmitted our message. -The characters `% ' were printed before and after the mail command +The characters `% ' were printed before and after the mail command by the shell to indicate that input was needed. .PP After typing the `% ' prompt the shell was reading command input from @@ -294,7 +294,7 @@ rather than having a large number of hard to remember options. .NH 2 Output to files .PP -Commands that normally read input or write output on the terminal +Commands that normally read input or write output on the terminal can also be executed with this input and/or output done to a file. .PP @@ -681,7 +681,7 @@ beginning are treated specially. Neither `*' or `?' or the `[' `]' mechanism will match it. This prevents accidental matching of the filenames `.' and `..' in the working directory which have special meaning to the system, -as well as other files such as +as well as other files such as .I \&.cshrc which are not normally visible. @@ -734,7 +734,7 @@ as it is used less frequently. Quotation .PP We have already seen a number of metacharacters used by the shell. -These metacharacters pose a problem in that we cannot use them directly +These metacharacters pose a problem in that we cannot use them directly as parts of words. Thus the command .DS @@ -744,7 +744,7 @@ will not echo the character `*'. It will either echo an sorted list of filenames in the current .I "working directory," -or print the message `No match' if there are +or print the message `No match' if there are no files in the working directory. .PP The recommended mechanism for placing characters which are neither numbers, @@ -828,7 +828,7 @@ The shell also terminates when it gets an end-of-file printing `logout'; \s-2UNIX\s0 then logs you off the system. Since this means that typing too many ^D's can accidentally log us off, the shell has a mechanism for preventing this. -This +This .I ignoreeof option will be discussed in section 2.2. .PP diff --git a/bin/csh/const.c b/bin/csh/const.c index 58699d54191..3ceac4a89b1 100644 --- a/bin/csh/const.c +++ b/bin/csh/const.c @@ -1,4 +1,4 @@ -/* $OpenBSD: const.c,v 1.3 1997/07/23 14:36:48 kstailey Exp $ */ +/* $OpenBSD: const.c,v 1.4 2002/06/09 05:47:27 todd Exp $ */ /* $NetBSD: const.c,v 1.6 1995/03/21 09:02:31 cgd Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)const.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: const.c,v 1.3 1997/07/23 14:36:48 kstailey Exp $"; +static char rcsid[] = "$OpenBSD: const.c,v 1.4 2002/06/09 05:47:27 todd Exp $"; #endif #endif /* not lint */ @@ -77,7 +77,7 @@ Char STRcent2[] = { '%', '%', '\0' }; Char STRcenthash[] = { '%', '#', '\0' }; Char STRcentplus[] = { '%', '+', '\0' }; Char STRcentminus[] = { '%', '-', '\0' }; -Char STRchase_symlinks[] = { 'c', 'h', 'a', 's', 'e', '_', 's', 'y', 'm', 'l', +Char STRchase_symlinks[] = { 'c', 'h', 'a', 's', 'e', '_', 's', 'y', 'm', 'l', 'i', 'n', 'k', 's', '\0' }; Char STRchild[] = { 'c', 'h', 'i', 'l', 'd', '\0' }; Char STRcolon[] = { ':', '\0' }; @@ -95,7 +95,7 @@ Char STRfignore[] = { 'f', 'i', 'g', 'n', 'o', 'r', 'e', '\0' }; Char STRfilec[] = { 'f', 'i', 'l', 'e', 'c', '\0' }; #endif /* FILEC */ Char STRhistchars[] = { 'h', 'i', 's', 't', 'c', 'h', 'a', 'r', 's', '\0' }; -Char STRtildothist[] = { '~', '/', '.', 'h', 'i', 's', 't', 'o', 'r', +Char STRtildothist[] = { '~', '/', '.', 'h', 'i', 's', 't', 'o', 'r', 'y', '\0' }; Char STRhistfile[] = { 'h', 'i', 's', 't', 'f', 'i', 'l', 'e', '\0' }; Char STRhistory[] = { 'h', 'i', 's', 't', 'o', 'r', 'y', '\0' }; @@ -114,7 +114,7 @@ Char STRml[] = { '-', 'l', '\0' }; Char STRmn[] = { '-', 'n', '\0' }; Char STRmquestion[] = { '?' | QUOTE, ' ', '\0' }; Char STRnice[] = { 'n', 'i', 'c', 'e', '\0' }; -Char STRnoambiguous[] = { 'n', 'o', 'a', 'm', 'b', 'i', 'g', 'u', 'o', 'u', +Char STRnoambiguous[] = { 'n', 'o', 'a', 'm', 'b', 'i', 'g', 'u', 'o', 'u', 's', '\0' }; Char STRnobeep[] = { 'n', 'o', 'b', 'e', 'e', 'p', '\0' }; Char STRnoclobber[] = { 'n', 'o', 'c', 'l', 'o', 'b', 'b', 'e', 'r', '\0' }; @@ -126,7 +126,7 @@ Char STRnotify[] = { 'n', 'o', 't', 'i', 'f', 'y', '\0' }; Char STRor[] = { '|', '\0' }; Char STRor2[] = { '|', '|', '\0' }; Char STRpath[] = { 'p', 'a', 't', 'h', '\0' }; -Char STRprintexitvalue[] = { 'p', 'r', 'i', 'n', 't', 'e', 'x', 'i', 't', 'v', +Char STRprintexitvalue[] = { 'p', 'r', 'i', 'n', 't', 'e', 'x', 'i', 't', 'v', 'a', 'l', 'u', 'e', '\0' }; Char STRprompt[] = { 'p', 'r', 'o', 'm', 'p', 't', '\0' }; Char STRprompt2[] = { 'p', 'r', 'o', 'm', 'p', 't', '2', '\0' }; diff --git a/bin/csh/csh.c b/bin/csh/csh.c index 1f3f230f8e1..d0149a8f48f 100644 --- a/bin/csh/csh.c +++ b/bin/csh/csh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: csh.c,v 1.17 2002/06/09 05:03:59 deraadt Exp $ */ +/* $OpenBSD: csh.c,v 1.18 2002/06/09 05:47:27 todd Exp $ */ /* $NetBSD: csh.c,v 1.14 1995/04/29 23:21:28 mycroft Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)csh.c 8.2 (Berkeley) 10/12/93"; #else -static char rcsid[] = "$OpenBSD: csh.c,v 1.17 2002/06/09 05:03:59 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: csh.c,v 1.18 2002/06/09 05:47:27 todd Exp $"; #endif #endif /* not lint */ @@ -817,7 +817,7 @@ rechist() } if ((fp = open(short2str(hfile), O_WRONLY | O_CREAT | O_TRUNC, - 0600)) == -1) + 0600)) == -1) return; oldidfds = didfds; @@ -883,14 +883,14 @@ int sig; /* * We kill the last foreground process group. It then becomes - * responsible to propagate the SIGHUP to its progeny. + * responsible to propagate the SIGHUP to its progeny. */ { struct process *pp, *np; for (pp = proclist.p_next; pp; pp = pp->p_next) { np = pp; - /* + /* * Find if this job is in the foreground. It could be that * the process leader has exited and the foreground flag * is cleared for it. @@ -898,7 +898,7 @@ int sig; do /* * If a process is in the foreground; we try to kill - * it's process group. If we succeed, then the + * it's process group. If we succeed, then the * whole job is gone. Otherwise we keep going... * But avoid sending HUP to the shell again. */ @@ -1288,9 +1288,9 @@ vis_fputc(ch, fp) { char uenc[5]; /* 4 + NUL */ - if (ch & QUOTE) + if (ch & QUOTE) return fputc(ch & TRIM, fp); - /* + /* * XXX: When we are in AsciiOnly we want all characters >= 0200 to * be encoded, but currently there is no way in vis to do that. */ diff --git a/bin/csh/dir.c b/bin/csh/dir.c index 1f940916827..0a31e9eef72 100644 --- a/bin/csh/dir.c +++ b/bin/csh/dir.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dir.c,v 1.6 2002/02/19 19:39:35 millert Exp $ */ +/* $OpenBSD: dir.c,v 1.7 2002/06/09 05:47:27 todd Exp $ */ /* $NetBSD: dir.c,v 1.9 1995/03/21 09:02:42 cgd Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)dir.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: dir.c,v 1.6 2002/02/19 19:39:35 millert Exp $"; +static char rcsid[] = "$OpenBSD: dir.c,v 1.7 2002/06/09 05:47:27 todd Exp $"; #endif #endif /* not lint */ @@ -222,7 +222,7 @@ printdirs() } if (!(dirflag & DIR_LONG) && hp != NULL && !eq(hp, STRslash) && (len = Strlen(hp), Strncmp(hp, dp->di_name, len) == 0) && - (dp->di_name[len] == '\0' || dp->di_name[len] == '/')) + (dp->di_name[len] == '\0' || dp->di_name[len] == '/')) len = Strlen(s = (dp->di_name + len)) + 2; else len = Strlen(s = dp->di_name) + 1; diff --git a/bin/csh/dol.c b/bin/csh/dol.c index 316cf4b7467..00567ea7c39 100644 --- a/bin/csh/dol.c +++ b/bin/csh/dol.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dol.c,v 1.9 2002/02/19 19:39:35 millert Exp $ */ +/* $OpenBSD: dol.c,v 1.10 2002/06/09 05:47:27 todd Exp $ */ /* $NetBSD: dol.c,v 1.8 1995/09/27 00:38:38 jtc Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)dol.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: dol.c,v 1.9 2002/02/19 19:39:35 millert Exp $"; +static char rcsid[] = "$OpenBSD: dol.c,v 1.10 2002/06/09 05:47:27 todd Exp $"; #endif #endif /* not lint */ @@ -426,7 +426,7 @@ Dgetdol() if (dimen || bitset) stderror(ERR_SYNTAX); if (backpid != 0) { - if (dolbang) + if (dolbang) xfree((ptr_t) dolbang); setDolp(dolbang = putn(backpid)); } @@ -645,13 +645,13 @@ fixDolMod() dolwcnt = 10000; c = DgetC(0); } - if ((c == 'g' && dolmcnt != 10000) || + if ((c == 'g' && dolmcnt != 10000) || (c == 'a' && dolwcnt != 10000)) { if (c == 'g') dolmcnt = 10000; else dolwcnt = 10000; - c = DgetC(0); + c = DgetC(0); } if (c == 's') { /* [eichin:19910926.0755EST] */ diff --git a/bin/csh/exec.c b/bin/csh/exec.c index 02022d968ac..f7da9108d48 100644 --- a/bin/csh/exec.c +++ b/bin/csh/exec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exec.c,v 1.9 2002/02/19 19:39:35 millert Exp $ */ +/* $OpenBSD: exec.c,v 1.10 2002/06/09 05:47:27 todd Exp $ */ /* $NetBSD: exec.c,v 1.9 1996/09/30 20:03:54 christos Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)exec.c 8.3 (Berkeley) 5/23/95"; #else -static char rcsid[] = "$OpenBSD: exec.c,v 1.9 2002/02/19 19:39:35 millert Exp $"; +static char rcsid[] = "$OpenBSD: exec.c,v 1.10 2002/06/09 05:47:27 todd Exp $"; #endif #endif /* not lint */ @@ -702,7 +702,7 @@ tellmewhat(lexp, str) if (str == NULL) { if (aliased) prlex(cshout, lexp); - (void) fprintf(cshout, "%s: shell built-in command.\n", + (void) fprintf(cshout, "%s: shell built-in command.\n", vis_str(sp->word)); } else diff --git a/bin/csh/file.c b/bin/csh/file.c index 303dac5cfaf..ba8df9a1bc0 100644 --- a/bin/csh/file.c +++ b/bin/csh/file.c @@ -1,4 +1,4 @@ -/* $OpenBSD: file.c,v 1.9 2002/02/19 19:39:35 millert Exp $ */ +/* $OpenBSD: file.c,v 1.10 2002/06/09 05:47:27 todd Exp $ */ /* $NetBSD: file.c,v 1.11 1996/11/08 19:34:37 christos Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)file.c 8.2 (Berkeley) 3/19/94"; #else -static char rcsid[] = "$OpenBSD: file.c,v 1.9 2002/02/19 19:39:35 millert Exp $"; +static char rcsid[] = "$OpenBSD: file.c,v 1.10 2002/06/09 05:47:27 todd Exp $"; #endif #endif /* not lint */ @@ -528,7 +528,7 @@ again: /* search for matches */ return (numitems); } else { /* LIST */ - qsort((ptr_t) items, numitems, sizeof(items[0]), + qsort((ptr_t) items, numitems, sizeof(items[0]), (int (*)(const void *, const void *)) sortscmp); print_by_column(looking_for_lognames ? NULL : tilded_dir, items, numitems); diff --git a/bin/csh/func.c b/bin/csh/func.c index 625bb099fa3..c76c8bcc6c7 100644 --- a/bin/csh/func.c +++ b/bin/csh/func.c @@ -1,4 +1,4 @@ -/* $OpenBSD: func.c,v 1.14 2002/02/19 19:39:35 millert Exp $ */ +/* $OpenBSD: func.c,v 1.15 2002/06/09 05:47:27 todd Exp $ */ /* $NetBSD: func.c,v 1.11 1996/02/09 02:28:29 christos Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)func.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: func.c,v 1.14 2002/02/19 19:39:35 millert Exp $"; +static char rcsid[] = "$OpenBSD: func.c,v 1.15 2002/06/09 05:47:27 todd Exp $"; #endif #endif /* not lint */ @@ -873,12 +873,12 @@ wfree() if (wp->w_end.type != I_SEEK && wp->w_start.type == wp->w_end.type && wp->w_start.type == o.type) { if (wp->w_end.type == F_SEEK) { - if (o.f_seek >= wp->w_start.f_seek && + if (o.f_seek >= wp->w_start.f_seek && (wp->w_end.f_seek == 0 || o.f_seek < wp->w_end.f_seek)) break; } else { - if (o.a_seek >= wp->w_start.a_seek && + if (o.a_seek >= wp->w_start.a_seek && (wp->w_end.a_seek == 0 || o.a_seek < wp->w_end.a_seek)) break; } diff --git a/bin/csh/glob.c b/bin/csh/glob.c index 24bb3e2b5a2..d012450b43f 100644 --- a/bin/csh/glob.c +++ b/bin/csh/glob.c @@ -1,4 +1,4 @@ -/* $OpenBSD: glob.c,v 1.7 2002/02/19 19:39:35 millert Exp $ */ +/* $OpenBSD: glob.c,v 1.8 2002/06/09 05:47:27 todd Exp $ */ /* $NetBSD: glob.c,v 1.10 1995/03/21 09:03:01 cgd Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)glob.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: glob.c,v 1.7 2002/02/19 19:39:35 millert Exp $"; +static char rcsid[] = "$OpenBSD: glob.c,v 1.8 2002/06/09 05:47:27 todd Exp $"; #endif #endif /* not lint */ @@ -575,7 +575,7 @@ tglob(t) */ if (c == '`') { gflag |= G_CSH; - while (*p && *p != '`') + while (*p && *p != '`') if (*p++ == '\\') { if (*p) /* Quoted chars */ p++; @@ -807,7 +807,7 @@ pword() pnleft = MAXPATHLEN - 4; } -int +int Gmatch(string, pattern) Char *string, *pattern; { @@ -830,7 +830,7 @@ Gmatch(string, pattern) blkfree(blk); return(gres == gpol); -} +} static int pmatch(string, pattern) @@ -871,7 +871,7 @@ pmatch(string, pattern) (*(pattern-2) & TRIM) <= stringc); pattern++; } - else + else match = (stringc == (rangec & TRIM)); } if (rangec == 0) diff --git a/bin/csh/lex.c b/bin/csh/lex.c index c9b141c409b..84fbf766ee3 100644 --- a/bin/csh/lex.c +++ b/bin/csh/lex.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lex.c,v 1.6 2002/02/19 19:39:35 millert Exp $ */ +/* $OpenBSD: lex.c,v 1.7 2002/06/09 05:47:27 todd Exp $ */ /* $NetBSD: lex.c,v 1.9 1995/09/27 00:38:46 jtc Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)lex.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: lex.c,v 1.6 2002/02/19 19:39:35 millert Exp $"; +static char rcsid[] = "$OpenBSD: lex.c,v 1.7 2002/06/09 05:47:27 todd Exp $"; #endif #endif /* not lint */ @@ -878,7 +878,7 @@ dosub(sc, en, global) wdp = hp; while (--i >= 0) { - register struct wordent *new = + register struct wordent *new = (struct wordent *) xcalloc(1, sizeof *wdp); new->word = 0; diff --git a/bin/csh/parse.c b/bin/csh/parse.c index 7cd949554e1..e73a134d160 100644 --- a/bin/csh/parse.c +++ b/bin/csh/parse.c @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.c,v 1.5 2002/02/19 19:39:35 millert Exp $ */ +/* $OpenBSD: parse.c,v 1.6 2002/06/09 05:47:27 todd Exp $ */ /* $NetBSD: parse.c,v 1.6 1995/03/21 09:03:10 cgd Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)parse.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: parse.c,v 1.5 2002/02/19 19:39:35 millert Exp $"; +static char rcsid[] = "$OpenBSD: parse.c,v 1.6 2002/06/09 05:47:27 todd Exp $"; #endif #endif /* not lint */ @@ -53,19 +53,19 @@ static char rcsid[] = "$OpenBSD: parse.c,v 1.5 2002/02/19 19:39:35 millert Exp $ static void asyntax(struct wordent *, struct wordent *); static void asyn0(struct wordent *, struct wordent *); static void asyn3(struct wordent *, struct wordent *); -static struct wordent +static struct wordent *freenod(struct wordent *, struct wordent *); -static struct command +static struct command *syn0(struct wordent *, struct wordent *, int); -static struct command +static struct command *syn1(struct wordent *, struct wordent *, int); -static struct command +static struct command *syn1a(struct wordent *, struct wordent *, int); -static struct command +static struct command *syn1b(struct wordent *, struct wordent *, int); -static struct command +static struct command *syn2(struct wordent *, struct wordent *, int); -static struct command +static struct command *syn3(struct wordent *, struct wordent *, int); #define ALEFT 21 /* max of 20 alias expansions */ diff --git a/bin/csh/str.c b/bin/csh/str.c index d00a4fe2e67..7bbc8bf5ca3 100644 --- a/bin/csh/str.c +++ b/bin/csh/str.c @@ -1,4 +1,4 @@ -/* $OpenBSD: str.c,v 1.5 2002/02/19 19:39:35 millert Exp $ */ +/* $OpenBSD: str.c,v 1.6 2002/06/09 05:47:27 todd Exp $ */ /* $NetBSD: str.c,v 1.6 1995/03/21 09:03:24 cgd Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)str.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: str.c,v 1.5 2002/02/19 19:39:35 millert Exp $"; +static char rcsid[] = "$OpenBSD: str.c,v 1.6 2002/06/09 05:47:27 todd Exp $"; #endif #endif /* not lint */ @@ -450,21 +450,21 @@ vis_str(cp) if (cp == NULL) return (NULL); - + for (dp = cp; *dp++;) continue; n = ((dp - cp) << 2) + 1; /* 4 times + NULL */ if (dstsize < n) { - sdst = (char *) (dstsize ? + sdst = (char *) (dstsize ? xrealloc(sdst, (size_t) n * sizeof(char)) : xmalloc((size_t) n * sizeof(char))); dstsize = n; } - /* + /* * XXX: When we are in AsciiOnly we want all characters >= 0200 to * be encoded, but currently there is no way in vis to do that. */ (void) strvis(sdst, short2str(cp), VIS_NOSLASH); return (sdst); } - + diff --git a/bin/ed/buf.c b/bin/ed/buf.c index eca020a1c1f..bd2e14553c5 100644 --- a/bin/ed/buf.c +++ b/bin/ed/buf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: buf.c,v 1.12 2002/03/24 22:17:04 millert Exp $ */ +/* $OpenBSD: buf.c,v 1.13 2002/06/09 05:47:27 todd Exp $ */ /* $NetBSD: buf.c,v 1.15 1995/04/23 10:07:28 cgd Exp $ */ /* buf.c: This file contains the scratch-file buffer rountines for the @@ -33,7 +33,7 @@ #if 0 static char *rcsid = "@(#)buf.c,v 1.4 1994/02/01 00:34:35 alm Exp"; #else -static char rcsid[] = "$OpenBSD: buf.c,v 1.12 2002/03/24 22:17:04 millert Exp $"; +static char rcsid[] = "$OpenBSD: buf.c,v 1.13 2002/06/09 05:47:27 todd Exp $"; #endif #endif /* not lint */ @@ -261,7 +261,7 @@ init_buffers() { int i = 0; - /* Read stdin one character at a time to avoid i/o contention + /* Read stdin one character at a time to avoid i/o contention with shell escapes invoked by nonterminal input, e.g., ed - <<EOF !cat diff --git a/bin/ed/main.c b/bin/ed/main.c index 7fa68e17dc2..0469fd1c1b5 100644 --- a/bin/ed/main.c +++ b/bin/ed/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.26 2002/03/24 22:17:04 millert Exp $ */ +/* $OpenBSD: main.c,v 1.27 2002/06/09 05:47:27 todd Exp $ */ /* $NetBSD: main.c,v 1.3 1995/03/21 09:04:44 cgd Exp $ */ /* main.c: This file contains the main control and user-interface routines @@ -39,7 +39,7 @@ char *copyright = #if 0 static char *rcsid = "@(#)main.c,v 1.1 1994/02/01 00:34:42 alm Exp"; #else -static char rcsid[] = "$OpenBSD: main.c,v 1.26 2002/03/24 22:17:04 millert Exp $"; +static char rcsid[] = "$OpenBSD: main.c,v 1.27 2002/06/09 05:47:27 todd Exp $"; #endif #endif /* not lint */ @@ -47,7 +47,7 @@ static char rcsid[] = "$OpenBSD: main.c,v 1.26 2002/03/24 22:17:04 millert Exp $ * CREDITS * * This program is based on the editor algorithm described in - * Brian W. Kernighan and P. J. Plauger's book "Software Tools + * Brian W. Kernighan and P. J. Plauger's book "Software Tools * in Pascal," Addison-Wesley, 1981. * * The buffering algorithm is attributed to Rodney Ruddock of @@ -285,7 +285,7 @@ top: int first_addr, second_addr, addr_cnt; -/* extract_addr_range: get line addresses from the command buffer until an +/* extract_addr_range: get line addresses from the command buffer until an illegal address is seen; return status */ int extract_addr_range() @@ -946,7 +946,7 @@ check_addr_range(n, m) } -/* get_matching_node_addr: return the address of the next line matching a +/* get_matching_node_addr: return the address of the next line matching a pattern in a given direction. wrap around begin/end of editor buffer if necessary */ int @@ -1396,7 +1396,7 @@ strip_escapes(s) REALLOC(file, filesz, MAXPATHLEN, NULL); /* assert: no trailing escape */ - while ((file[i++] = (*s == '\\') ? *++s : *s) != '\0' && + while ((file[i++] = (*s == '\\') ? *++s : *s) != '\0' && i < MAXPATHLEN-1) s++; file[MAXPATHLEN-1] = '\0'; diff --git a/bin/ed/re.c b/bin/ed/re.c index a386de4c349..c12b3935214 100644 --- a/bin/ed/re.c +++ b/bin/ed/re.c @@ -1,4 +1,4 @@ -/* $OpenBSD: re.c,v 1.8 2001/01/16 03:04:46 deraadt Exp $ */ +/* $OpenBSD: re.c,v 1.9 2002/06/09 05:47:27 todd Exp $ */ /* $NetBSD: re.c,v 1.14 1995/03/21 09:04:48 cgd Exp $ */ /* re.c: This file contains the regular expression interface routines for @@ -33,7 +33,7 @@ #if 0 static char *rcsid = "@(#)re.c,v 1.6 1994/02/01 00:34:43 alm Exp"; #else -static char rcsid[] = "$OpenBSD: re.c,v 1.8 2001/01/16 03:04:46 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: re.c,v 1.9 2002/06/09 05:47:27 todd Exp $"; #endif #endif /* not lint */ @@ -44,7 +44,7 @@ extern int patlock; char errmsg[MAXPATHLEN + 40] = ""; -/* get_compiled_pattern: return pointer to compiled pattern from command +/* get_compiled_pattern: return pointer to compiled pattern from command buffer */ pattern_t * get_compiled_pattern() diff --git a/bin/ed/sub.c b/bin/ed/sub.c index ac5b8ca561e..33767fb1620 100644 --- a/bin/ed/sub.c +++ b/bin/ed/sub.c @@ -1,7 +1,7 @@ -/* $OpenBSD: sub.c,v 1.8 2002/03/24 22:17:04 millert Exp $ */ +/* $OpenBSD: sub.c,v 1.9 2002/06/09 05:47:27 todd Exp $ */ /* $NetBSD: sub.c,v 1.4 1995/03/21 09:04:50 cgd Exp $ */ -/* sub.c: This file contains the substitution routines for the ed +/* sub.c: This file contains the substitution routines for the ed line editor */ /*- * Copyright (c) 1993 Andrew Moore, Talke Studio. @@ -33,7 +33,7 @@ #if 0 static char *rcsid = "@(#)sub.c,v 1.1 1994/02/01 00:34:44 alm Exp"; #else -static char rcsid[] = "$OpenBSD: sub.c,v 1.8 2002/03/24 22:17:04 millert Exp $"; +static char rcsid[] = "$OpenBSD: sub.c,v 1.9 2002/06/09 05:47:27 todd Exp $"; #endif #endif /* not lint */ diff --git a/bin/expr/expr.c b/bin/expr/expr.c index 27c9de0f038..81391e3a458 100644 --- a/bin/expr/expr.c +++ b/bin/expr/expr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: expr.c,v 1.10 2002/02/16 21:27:07 millert Exp $ */ +/* $OpenBSD: expr.c,v 1.11 2002/06/09 05:47:27 todd Exp $ */ /* $NetBSD: expr.c,v 1.3.6.1 1996/06/04 20:41:47 cgd Exp $ */ /* @@ -94,7 +94,7 @@ is_integer(vp, r) } /* - * POSIX.2 defines an "integer" as an optional unary minus + * POSIX.2 defines an "integer" as an optional unary minus * followed by digits. */ s = vp->u.s; @@ -274,7 +274,7 @@ eval5() errx(2, "%s", errbuf); } - /* compare string against pattern -- remember that patterns + /* compare string against pattern -- remember that patterns are anchored to the beginning of the line */ if (regexec(&rp, l->u.s, 2, rm, 0) == 0 && rm[0].rm_so == 0) { if (rm[1].rm_so >= 0) { diff --git a/bin/ksh/c_ksh.c b/bin/ksh/c_ksh.c index 0b6c600193a..9459ae037d2 100644 --- a/bin/ksh/c_ksh.c +++ b/bin/ksh/c_ksh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: c_ksh.c,v 1.14 2001/02/19 09:49:50 camield Exp $ */ +/* $OpenBSD: c_ksh.c,v 1.15 2002/06/09 05:47:27 todd Exp $ */ /* * built-in Korn commands: c_* @@ -335,7 +335,7 @@ c_print(wp) while ((c = *s++) != '\0') { Xcheck(xs, xp); #ifdef OS2 - if ((flags & PO_FSLASH) && c == '\\') + if ((flags & PO_FSLASH) && c == '\\') if (*s == '\\') *s++; else @@ -608,7 +608,7 @@ c_typeset(wp) local = 1; break; } - + fieldstr = basestr = (char *) 0; builtin_opt.flags |= GF_PLUSOPT; /* at&t ksh seems to have 0-9 as options, which are multiplied @@ -704,7 +704,7 @@ c_typeset(wp) return 1; } if (wp[builtin_opt.optind]) { - /* Take care of exclusions. + /* Take care of exclusions. * At this point, flags in fset are cleared in fclr and vise * versa. This property should be preserved. */ @@ -824,19 +824,19 @@ c_typeset(wp) shprintf("-x "); if ((vp->flag&RDONLY)) shprintf("-r "); - if ((vp->flag&TRACE)) + if ((vp->flag&TRACE)) shprintf("-t "); - if ((vp->flag&LJUST)) + if ((vp->flag&LJUST)) shprintf("-L%d ", vp->u2.field); - if ((vp->flag&RJUST)) + if ((vp->flag&RJUST)) shprintf("-R%d ", vp->u2.field); - if ((vp->flag&ZEROFIL)) + if ((vp->flag&ZEROFIL)) shprintf("-Z "); - if ((vp->flag&LCASEV)) + if ((vp->flag&LCASEV)) shprintf("-l "); - if ((vp->flag&UCASEV_AL)) + if ((vp->flag&UCASEV_AL)) shprintf("-u "); - if ((vp->flag&INT_U)) + if ((vp->flag&INT_U)) shprintf("-U "); shprintf("%s\n", vp->name); if (vp->flag&ARRAY) diff --git a/bin/ksh/c_sh.c b/bin/ksh/c_sh.c index 7fe918affd0..0981ad90685 100644 --- a/bin/ksh/c_sh.c +++ b/bin/ksh/c_sh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: c_sh.c,v 1.13 1999/07/14 13:37:23 millert Exp $ */ +/* $OpenBSD: c_sh.c,v 1.14 2002/06/09 05:47:27 todd Exp $ */ /* * built-in Bourne commands @@ -603,7 +603,7 @@ c_brkcont(wp) */ if (n == quit) { warningf(TRUE, "%s: cannot %s", wp[0], wp[0]); - return 0; + return 0; } /* POSIX says if n is too big, the last enclosing loop * shall be used. Doesn't say to print an error but we @@ -850,7 +850,7 @@ c_exec(wp) fd_clexec(i); #endif /* KSH */ } - e->savefd = NULL; + e->savefd = NULL; } return 0; } diff --git a/bin/ksh/c_test.c b/bin/ksh/c_test.c index 915d709f2c1..f27a23269d3 100644 --- a/bin/ksh/c_test.c +++ b/bin/ksh/c_test.c @@ -1,4 +1,4 @@ -/* $OpenBSD: c_test.c,v 1.7 1999/07/14 13:37:23 millert Exp $ */ +/* $OpenBSD: c_test.c,v 1.8 2002/06/09 05:47:27 todd Exp $ */ /* * test(1); version 7-like -- author Erik Baalbergen @@ -126,9 +126,9 @@ c_test(wp) te.pos.wp = wp + 1; te.wp_end = wp + argc; - /* + /* * Handle the special cases from POSIX.2, section 4.62.4. - * Implementation of all the rules isn't necessary since + * Implementation of all the rules isn't necessary since * our parser does the right thing for the ommited steps. */ if (argc <= 5) { @@ -240,7 +240,7 @@ test_eval(te, op, opnd1, opnd2, do_eval) if (not) res = !res; } - return res; + return res; case TO_FILRD: /* -r */ return test_eaccess(opnd1, R_OK) == 0; case TO_FILWR: /* -w */ diff --git a/bin/ksh/c_ulimit.c b/bin/ksh/c_ulimit.c index c2bfced2508..a43a7f06660 100644 --- a/bin/ksh/c_ulimit.c +++ b/bin/ksh/c_ulimit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: c_ulimit.c,v 1.8 1999/06/15 01:18:33 millert Exp $ */ +/* $OpenBSD: c_ulimit.c,v 1.9 2002/06/09 05:47:27 todd Exp $ */ /* ulimit -- handle "ulimit" builtin @@ -196,7 +196,7 @@ c_ulimit(wp) val = limit.rlim_cur; else if (how & HARD) val = limit.rlim_max; - } else + } else #endif /* HAVE_SETRLIMIT */ #ifdef HAVE_ULIMIT { diff --git a/bin/ksh/edit.c b/bin/ksh/edit.c index 6dfc5ba7ec7..02bd31c17a7 100644 --- a/bin/ksh/edit.c +++ b/bin/ksh/edit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: edit.c,v 1.14 2002/02/16 17:18:08 millert Exp $ */ +/* $OpenBSD: edit.c,v 1.15 2002/06/09 05:47:27 todd Exp $ */ /* * Command line editing - common code @@ -323,7 +323,7 @@ x_mode(onoff) * * DESCRIPTION: * This function is based on a fix from guy@demon.co.uk - * It fixes a bug in that if PS1 contains '!', the length + * It fixes a bug in that if PS1 contains '!', the length * given by strlen() is probably wrong. * * RETURN VALUE: @@ -385,7 +385,7 @@ set_editmode(ed) }; char *rcp; int i; - + if ((rcp = ksh_strrchr_dirsep(ed))) ed = ++rcp; for (i = 0; i < NELEM(edit_flags); i++) diff --git a/bin/ksh/emacs.c b/bin/ksh/emacs.c index e0643e7ebf0..58536372c92 100644 --- a/bin/ksh/emacs.c +++ b/bin/ksh/emacs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: emacs.c,v 1.15 2001/07/17 12:39:31 camield Exp $ */ +/* $OpenBSD: emacs.c,v 1.16 2002/06/09 05:47:27 todd Exp $ */ /* * Emacs-like command line editing and history @@ -88,7 +88,7 @@ static char *xbp; /* start of visible portion of input buffer */ static char *xlp; /* last char visible on screen */ static int x_adj_ok; /* - * we use x_adj_done so that functions can tell + * we use x_adj_done so that functions can tell * whether x_adjust() has been called while they are active. */ static int x_adj_done; @@ -367,7 +367,7 @@ x_emacs(buf, len) return 0; f = x_curprefix == -1 ? XFUNC_insert - : x_tab[x_curprefix][c&CHARMASK]; + : x_tab[x_curprefix][c&CHARMASK]; if (!(x_ftab[f].xf_flags & XF_PREFIX) && x_last_command != XFUNC_set_arg) @@ -849,7 +849,7 @@ static int x_end_hist(c) int c; { x_load_hist(histptr); return KSTD;} static int x_prev_com(c) int c; { x_load_hist(x_histp - x_arg); return KSTD;} static int x_next_com(c) int c; { x_load_hist(x_histp + x_arg); return KSTD;} - + /* Goto a particular history number obtained from argument. * If no argument is given history 1 is probably not what you * want so we'll simply go to the oldest one. @@ -1064,7 +1064,7 @@ x_redraw(limit) x_adj_ok = 0; if (limit == -1) x_e_putc('\n'); - else + else x_e_putc('\r'); x_flush(); if (xbp == xbuf) @@ -1827,10 +1827,10 @@ do_complete(flags, type) * x_adjust - redraw the line adjusting starting point etc. * * DESCRIPTION: - * This function is called when we have exceeded the bounds - * of the edit window. It increments x_adj_done so that - * functions like x_ins and x_delete know that we have been - * called and can skip the x_bs() stuff which has already + * This function is called when we have exceeded the bounds + * of the edit window. It increments x_adj_done so that + * functions like x_ins and x_delete know that we have been + * called and can skip the x_bs() stuff which has already * been done by x_redraw. * * RETURN VALUE: @@ -1999,11 +1999,11 @@ x_comment(c) * x_prev_histword - recover word from prev command * * DESCRIPTION: - * This function recovers the last word from the previous - * command and inserts it into the current edit line. If a - * numeric arg is supplied then the n'th word from the - * start of the previous command is used. - * + * This function recovers the last word from the previous + * command and inserts it into the current edit line. If a + * numeric arg is supplied then the n'th word from the + * start of the previous command is used. + * * Bound to M-. * * RETURN VALUE: @@ -2034,7 +2034,7 @@ x_prev_histword(c) x_ins(rcp); } else { int c; - + rcp = cp; /* * ignore white-space at start of line @@ -2149,13 +2149,13 @@ x_fold_case(c) * x_lastcp() * * DESCRIPTION: - * This function returns a pointer to that char in the - * edit buffer that will be the last displayed on the + * This function returns a pointer to that char in the + * edit buffer that will be the last displayed on the * screen. The sequence: - * + * * for (cp = x_lastcp(); cp > xcp; cp) * x_bs(*--cp); - * + * * Will position the cursor correctly on the screen. * * RETURN VALUE: diff --git a/bin/ksh/eval.c b/bin/ksh/eval.c index 5ec7f433cba..af33e973127 100644 --- a/bin/ksh/eval.c +++ b/bin/ksh/eval.c @@ -1,4 +1,4 @@ -/* $OpenBSD: eval.c,v 1.9 1999/06/15 01:18:33 millert Exp $ */ +/* $OpenBSD: eval.c,v 1.10 2002/06/09 05:47:27 todd Exp $ */ /* * Expansion - quoting, separation, substitution, globbing @@ -430,7 +430,7 @@ expand(cp, wp, f) char *s = Xrestpos(ds, dp, st->base); errorf("%s: %s", st->var->name, - dp == s ? + dp == s ? "parameter null or not set" : (debunk(s, s), s)); } diff --git a/bin/ksh/exec.c b/bin/ksh/exec.c index 270857662f8..87d318b424c 100644 --- a/bin/ksh/exec.c +++ b/bin/ksh/exec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exec.c,v 1.25 2002/01/16 01:28:54 millert Exp $ */ +/* $OpenBSD: exec.c,v 1.26 2002/06/09 05:47:27 todd Exp $ */ /* * execute command tree @@ -101,7 +101,7 @@ execute(t, flags) newenv(E_EXEC); if (trap) runtraps(0); - + if (t->type == TCOM) { /* Clear subst_exstat before argument expansion. Used by * null commands (see comexec() and c_eval()) and by c_set(). @@ -1138,14 +1138,14 @@ search_access(path, mode, errnop) char *tp = mpath + strlen(mpath); char *p; char **sfx; - + /* If a suffix has been specified, check if it is one of the * suffixes that indicate the file is executable - if so, change * the access test to R_OK... * This code assumes OS/2 files can have only one suffix... */ if ((p = strrchr((p = ksh_strrchr_dirsep(mpath)) ? p : mpath, '.'))) { - if (mode == X_OK) + if (mode == X_OK) mode = R_OK; return search_access1(mpath, mode, errnop); } @@ -1221,7 +1221,7 @@ search(name, path, mode, errnop) } /* Look in current context always. (os2 style) */ - if (search_access(Xstring(xs, xp), mode, errnop) == 0) + if (search_access(Xstring(xs, xp), mode, errnop) == 0) return Xstring(xs, xp); /* not Xclose() - xp may be wrong */ #else /* OS2 */ if (ksh_strchr_dirsep(name)) { diff --git a/bin/ksh/io.c b/bin/ksh/io.c index 7113d6fa0b4..0516a16edb3 100644 --- a/bin/ksh/io.c +++ b/bin/ksh/io.c @@ -1,4 +1,4 @@ -/* $OpenBSD: io.c,v 1.10 2001/09/19 10:58:07 mpech Exp $ */ +/* $OpenBSD: io.c,v 1.11 2002/06/09 05:47:27 todd Exp $ */ /* * shell buffered IO and formatted output @@ -365,7 +365,7 @@ check_fd(name, mode, emsgp) } fl &= O_ACCMODE; #ifdef OS2 - if (mode == W_OK ) { + if (mode == W_OK ) { if (setmode(fd, O_TEXT) == -1) { if (emsgp) *emsgp = "couldn't set write mode"; @@ -375,7 +375,7 @@ check_fd(name, mode, emsgp) if (setmode(fd, O_BINARY) == -1) { if (emsgp) *emsgp = "couldn't set read mode"; - return -1; + return -1; } #else /* OS2 */ /* X_OK is a kludge to disable this check for dups (x<&1): diff --git a/bin/ksh/jobs.c b/bin/ksh/jobs.c index 2adea1be13b..99b857f5472 100644 --- a/bin/ksh/jobs.c +++ b/bin/ksh/jobs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: jobs.c,v 1.16 1999/08/04 16:56:42 millert Exp $ */ +/* $OpenBSD: jobs.c,v 1.17 2002/06/09 05:47:27 todd Exp $ */ /* * Process and job control @@ -1289,7 +1289,7 @@ j_waitj(j, flags, where) j_systime = j->systime; rv = j->status; - if (!(flags & JW_ASYNCNOTIFY) + if (!(flags & JW_ASYNCNOTIFY) && (!Flag(FMONITOR) || j->state != PSTOPPED)) { j_print(j, JP_SHORT, shl_out); @@ -1430,7 +1430,7 @@ check_job(j) #ifdef KSH /* Note when co-process dies: can't be done in j_wait() nor - * remove_job() since neither may be called for non-interactive + * remove_job() since neither may be called for non-interactive * shells. */ if (j->state == PEXITED || j->state == PSIGNALLED) { diff --git a/bin/ksh/lex.c b/bin/ksh/lex.c index d28c5aaec33..46e957dd43e 100644 --- a/bin/ksh/lex.c +++ b/bin/ksh/lex.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lex.c,v 1.15 2002/01/16 01:28:54 millert Exp $ */ +/* $OpenBSD: lex.c,v 1.16 2002/06/09 05:47:27 todd Exp $ */ /* * lexical analysis and source input @@ -218,7 +218,7 @@ yylex(cf) if (isalnum(c)) { *wp++ = CHAR, *wp++ = '\\'; *wp++ = CHAR, *wp++ = c; - } else + } else #endif if (c) /* trailing \ is lost */ *wp++ = QCHAR, *wp++ = c; diff --git a/bin/ksh/main.c b/bin/ksh/main.c index 85d2327599c..539847d556c 100644 --- a/bin/ksh/main.c +++ b/bin/ksh/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.20 2000/12/19 21:48:54 markus Exp $ */ +/* $OpenBSD: main.c,v 1.21 2002/06/09 05:47:27 todd Exp $ */ /* * startup, main loop, environments and error handling @@ -339,7 +339,7 @@ main(argc, argv) struct stat s_stdin; if (fstat(0, &s_stdin) >= 0 && S_ISCHR(s_stdin.st_mode) && - Flag(FTALKING)) + Flag(FTALKING)) reset_nonblock(0); } diff --git a/bin/ksh/syn.c b/bin/ksh/syn.c index 087e0f7063b..5dee5d41b3a 100644 --- a/bin/ksh/syn.c +++ b/bin/ksh/syn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: syn.c,v 1.12 1999/06/15 01:18:36 millert Exp $ */ +/* $OpenBSD: syn.c,v 1.13 2002/06/09 05:47:27 todd Exp $ */ /* * shell parser (C version) @@ -802,7 +802,7 @@ compile(s) * a=[ab] * $ x=typeset; $x a=[ab]; echo "$a" * a=a - * $ + * $ */ static int assign_command(s) diff --git a/bin/systrace/filter.c b/bin/systrace/filter.c index fe4f49a733c..ad5d71085f2 100644 --- a/bin/systrace/filter.c +++ b/bin/systrace/filter.c @@ -1,4 +1,4 @@ -/* $OpenBSD: filter.c,v 1.9 2002/06/07 18:05:20 provos Exp $ */ +/* $OpenBSD: filter.c,v 1.10 2002/06/09 05:47:27 todd Exp $ */ /* * Copyright 2002 Niels Provos <provos@citi.umich.edu> * All rights reserved. @@ -339,7 +339,7 @@ filter_ask(struct intercept_tlq *tls, struct filterq *fls, snprintf(compose, sizeof(compose), "%s%s eq \"%s\"", - tl->name, + tl->name, lst && !strcmp(tl->name, lst) ? "[1]" : "", l); diff --git a/bin/systrace/systrace.1 b/bin/systrace/systrace.1 index ba17a4cb66e..4326a243196 100644 --- a/bin/systrace/systrace.1 +++ b/bin/systrace/systrace.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: systrace.1,v 1.13 2002/06/07 19:29:00 provos Exp $ +.\" $OpenBSD: systrace.1,v 1.14 2002/06/09 05:47:27 todd Exp $ .\" .\" Copyright 2002 Niels Provos <provos@citi.umich.edu> .\" All rights reserved. @@ -121,7 +121,7 @@ Predicates have the following format: A rule is added to the configured policy only if its predicate evaluates to true. .Sh EXAMPLES -An excerpt from a sample +An excerpt from a sample .Xr ls 1 policy might look as follows: .Bd -literal -offset AAA |