From 713dd62834d401cc7b9b394a4b916ab9e5e3d4d5 Mon Sep 17 00:00:00 2001 From: kris Date: Sat, 8 May 1999 10:22:15 +0000 Subject: Various spelling/formatting changes. Submitted by: Philippe Charnier --- bin/cat/cat.1 | 4 ++-- bin/chmod/chmod.1 | 4 ++-- bin/cp/cp.1 | 9 +++++---- bin/cp/cp.c | 4 ++-- bin/cp/utils.c | 4 ++-- bin/csh/csh.1 | 4 ++-- bin/csh/csh.c | 4 ++-- bin/csh/csh.h | 6 +++--- bin/csh/err.c | 4 ++-- bin/csh/func.c | 4 ++-- bin/csh/lex.c | 4 ++-- bin/csh/proc.c | 4 ++-- bin/csh/sem.c | 4 ++-- bin/csh/set.c | 8 ++++---- bin/csh/time.c | 6 +++--- bin/date/date.1 | 6 ++++-- bin/dd/args.c | 4 ++-- bin/dd/dd.1 | 6 +++--- bin/echo/echo.1 | 4 ++-- bin/ed/buf.c | 4 ++-- bin/ed/cbc.c | 4 ++-- bin/ed/undo.c | 4 ++-- bin/ls/ls.1 | 4 ++-- bin/ls/ls.c | 4 ++-- bin/mkdir/mkdir.1 | 9 +++++---- bin/mv/mv.1 | 4 ++-- bin/pax/ar_io.c | 14 +++++++------- bin/pax/ar_subs.c | 12 ++++++------ bin/pax/buf_subs.c | 12 ++++++------ bin/pax/cache.c | 6 +++--- bin/pax/cache.h | 4 ++-- bin/pax/cpio.c | 4 ++-- bin/pax/file_subs.c | 6 +++--- bin/pax/ftree.c | 8 ++++---- bin/pax/options.c | 4 ++-- bin/pax/pax.1 | 4 ++-- bin/pax/pax.c | 16 ++++++++-------- bin/pax/pax.h | 10 +++++----- bin/pax/sel_subs.c | 6 +++--- bin/pax/tables.c | 10 +++++----- bin/pax/tables.h | 4 ++-- bin/pax/tar.c | 12 ++++++------ bin/pax/tar.h | 6 +++--- bin/pax/tty_subs.c | 4 ++-- bin/ps/ps.1 | 6 +++--- bin/pwd/pwd.1 | 10 ++++++---- bin/sh/alias.c | 4 ++-- bin/sh/error.h | 4 ++-- bin/sh/eval.c | 4 ++-- bin/sh/expand.c | 6 +++--- bin/sh/jobs.c | 4 ++-- bin/sh/main.c | 4 ++-- bin/sh/miscbltin.c | 4 ++-- bin/sh/trap.c | 4 ++-- bin/sleep/sleep.1 | 4 ++-- bin/stty/stty.1 | 6 +++--- bin/test/test.c | 4 ++-- 57 files changed, 169 insertions(+), 163 deletions(-) (limited to 'bin') diff --git a/bin/cat/cat.1 b/bin/cat/cat.1 index 351ed8f..f6b4a22 100644 --- a/bin/cat/cat.1 +++ b/bin/cat/cat.1 @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)cat.1 8.3 (Berkeley) 5/2/95 -.\" $Id: cat.1,v 1.7 1998/05/06 06:49:13 charnier Exp $ +.\" $Id: cat.1,v 1.8 1998/05/13 07:16:36 charnier Exp $ .\" .Dd May 2, 1995 .Dt CAT 1 @@ -91,7 +91,7 @@ characters (with the high bit set) are printed as .Ql M- (for meta) followed by the character for the low 7 bits. .El -.Pp +.Sh DIAGNOSTICS The .Nm utility exits 0 on success, and >0 if an error occurs. diff --git a/bin/chmod/chmod.1 b/bin/chmod/chmod.1 index b711a26..966aaab 100644 --- a/bin/chmod/chmod.1 +++ b/bin/chmod/chmod.1 @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)chmod.1 8.4 (Berkeley) 3/31/94 -.\" $Id: chmod.1,v 1.9 1998/05/06 06:50:06 charnier Exp $ +.\" $Id: chmod.1,v 1.10 1998/05/19 06:24:50 jkoshy Exp $ .\" .Dd March 31, 1994 .Dt CHMOD 1 @@ -97,7 +97,7 @@ command's actions are determined by the last one specified. .Pp Only the owner of a file or the super-user is permitted to change the mode of a file. -.Pp +.Sh DIAGNOSTICS The .Nm utility exits 0 on success, and >0 if an error occurs. diff --git a/bin/cp/cp.1 b/bin/cp/cp.1 index 000f2ca..b9d047e 100644 --- a/bin/cp/cp.1 +++ b/bin/cp/cp.1 @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)cp.1 8.3 (Berkeley) 4/18/94 -.\" $Id: cp.1,v 1.10 1998/05/06 06:50:19 charnier Exp $ +.\" $Id: cp.1,v 1.11 1998/10/13 08:52:29 jkoshy Exp $ .\" .Dd April 18, 1994 .Dt CP 1 @@ -197,9 +197,10 @@ options are ignored unless the option is specified. In addition, these options override each other and the command's actions are determined by the last one specified. -.Pp -.Nm Cp -exits 0 on success, >0 if an error occurred. +.Sh DIAGNOSTICS +The +.Nm +utility exits 0 on success, and >0 if an error occurs. .Sh COMPATIBILITY Historic versions of the .Nm diff --git a/bin/cp/cp.c b/bin/cp/cp.c index e3ddbfa..e873d4d 100644 --- a/bin/cp/cp.c +++ b/bin/cp/cp.c @@ -45,7 +45,7 @@ static char const copyright[] = static char sccsid[] = "@(#)cp.c 8.2 (Berkeley) 4/1/94"; #endif static const char rcsid[] = - "$Id: cp.c,v 1.17 1998/06/09 13:42:51 dt Exp $"; + "$Id: cp.c,v 1.18 1999/04/25 21:13:32 imp Exp $"; #endif /* not lint */ /* @@ -286,7 +286,7 @@ copy(argv, type, fts_options) * is the case where the target exists. * * Also, check for "..". This is for correct path - * concatentation for paths ending in "..", e.g. + * concatenation for paths ending in "..", e.g. * cp -R .. /tmp * Paths ending in ".." are changed to ".". This is * tricky, but seems the easiest way to fix the problem. diff --git a/bin/cp/utils.c b/bin/cp/utils.c index 9118efc..162a446 100644 --- a/bin/cp/utils.c +++ b/bin/cp/utils.c @@ -36,7 +36,7 @@ static char sccsid[] = "@(#)utils.c 8.3 (Berkeley) 4/1/94"; #endif static const char rcsid[] = - "$Id: utils.c,v 1.21 1998/11/18 11:47:45 bde Exp $"; + "$Id: utils.c,v 1.22 1999/04/25 21:13:32 imp Exp $"; #endif /* not lint */ #include @@ -171,7 +171,7 @@ copy_file(entp, dne) /* * Don't remove the target even after an error. The target might * not be a regular file, or its attributes might be important, - * or its contents might be irreplacable. It would only be safe + * or its contents might be irreplaceable. It would only be safe * to remove it if we created it and its length is 0. */ diff --git a/bin/csh/csh.1 b/bin/csh/csh.1 index 904aadd..abdc4e8 100644 --- a/bin/csh/csh.1 +++ b/bin/csh/csh.1 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)csh.1 8.2 (Berkeley) 1/21/94 -.\" $Id: csh.1,v 1.10 1998/05/06 06:50:38 charnier Exp $ +.\" $Id: csh.1,v 1.11 1998/07/27 21:31:19 nectar Exp $ .\" .Dd January 21, 1994 .Dt CSH 1 @@ -2167,7 +2167,7 @@ and user name completion (see and a C-like syntax. There are now many shells that also have these mechanisms, plus a few more (and maybe some bugs too), which are available through the -usenet. +Usenet. .Sh BUGS When a command is restarted from a stop, the shell prints the directory it started in if this is different diff --git a/bin/csh/csh.c b/bin/csh/csh.c index 46b792c..e879e5c 100644 --- a/bin/csh/csh.c +++ b/bin/csh/csh.c @@ -42,7 +42,7 @@ static const char copyright[] = static char sccsid[] = "@(#)csh.c 8.2 (Berkeley) 10/12/93"; #else static const char rcsid[] = - "$Id: csh.c,v 1.12 1997/12/10 22:18:21 eivind Exp $"; + "$Id: csh.c,v 1.13 1998/02/28 10:49:52 jraynard Exp $"; #endif #endif /* not lint */ @@ -1223,7 +1223,7 @@ gethdir(home) /* * When didfds is set, we do I/O from 0, 1, 2 otherwise from 15, 16, 17 - * We also check if the shell has already changed the decriptor to point to + * We also check if the shell has already changed the descriptor to point to * 0, 1, 2 when didfds is set. */ #define DESC(a) (*((int *) (a)) - (didfds && *((int *) a) >= FSHIN ? FSHIN : 0)) diff --git a/bin/csh/csh.h b/bin/csh/csh.h index f88f622..7193dcb 100644 --- a/bin/csh/csh.h +++ b/bin/csh/csh.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)csh.h 8.1 (Berkeley) 5/31/93 - * $Id: csh.h,v 1.5 1997/08/07 21:42:04 steve Exp $ + * $Id: csh.h,v 1.6 1997/08/08 00:53:59 steve Exp $ */ /* @@ -306,7 +306,7 @@ Char *lap; * * Each command is parsed to a tree of command structures and * flags are set bottom up during this process, to be propagated down - * as needed during the semantics/exeuction pass (sh.sem.c). + * as needed during the semantics/execution pass (sh.sem.c). */ struct command { short t_dtyp; /* Type of node */ @@ -535,7 +535,7 @@ Char **evalvec; Char *evalp; /* word_chars is set by default to WORD_CHARS but can be overridden by - the worchars variable--if unset, reverts to WORD_CHARS */ + the wordchars variable--if unset, reverts to WORD_CHARS */ Char *word_chars; diff --git a/bin/csh/err.c b/bin/csh/err.c index f1770fb..82b03a1 100644 --- a/bin/csh/err.c +++ b/bin/csh/err.c @@ -36,7 +36,7 @@ static char sccsid[] = "@(#)err.c 8.1 (Berkeley) 5/31/93"; #else static const char rcsid[] = - "$Id: err.c,v 1.7 1998/05/06 06:50:41 charnier Exp $"; + "$Id: err.c,v 1.8 1998/05/13 07:28:55 charnier Exp $"; #endif #endif /* not lint */ @@ -327,7 +327,7 @@ seterror(id, va_alist) * in bname * * This routine always resets or exits. The flag haderr - * is set so the routine who catches the unwind can propogate + * is set so the routine who catches the unwind can propagate * it if they want. * * Note that any open files at the point of error will eventually diff --git a/bin/csh/func.c b/bin/csh/func.c index f5cbe52..0b1326a 100644 --- a/bin/csh/func.c +++ b/bin/csh/func.c @@ -36,7 +36,7 @@ static char sccsid[] = "@(#)func.c 8.1 (Berkeley) 5/31/93"; #else static const char rcsid[] = - "$Id: func.c,v 1.11 1998/07/27 21:15:52 nectar Exp $"; + "$Id: func.c,v 1.12 1999/04/25 21:13:32 imp Exp $"; #endif #endif /* not lint */ @@ -1397,7 +1397,7 @@ dosuspend(v, t) /* This is the dreaded EVAL built-in. * If you don't fiddle with file descriptors, and reset didfds, * this command will either ignore redirection inside or outside - * its aguments, e.g. eval "date >x" vs. eval "date" >x + * its arguments, e.g. eval "date >x" vs. eval "date" >x * The stuff here seems to work, but I did it by trial and error rather * than really knowing what was going on. If tpgrp is zero, we are * probably a background eval, e.g. "eval date &", and we want to diff --git a/bin/csh/lex.c b/bin/csh/lex.c index 56acc41..c234b98 100644 --- a/bin/csh/lex.c +++ b/bin/csh/lex.c @@ -36,7 +36,7 @@ static char sccsid[] = "@(#)lex.c 8.1 (Berkeley) 5/31/93"; #else static const char rcsid[] = - "$Id: lex.c,v 1.10 1998/05/13 07:29:05 charnier Exp $"; + "$Id: lex.c,v 1.11 1999/04/25 21:13:32 imp Exp $"; #endif #endif /* not lint */ @@ -1179,7 +1179,7 @@ gethent(sc) case '-': back = 1; c = getC(0); - /* FALLSTHROUGH */ + /* FALLTHROUGH */ default: if (any("(=~", c)) { diff --git a/bin/csh/proc.c b/bin/csh/proc.c index 776b056..503681b 100644 --- a/bin/csh/proc.c +++ b/bin/csh/proc.c @@ -36,7 +36,7 @@ static char sccsid[] = "@(#)proc.c 8.1 (Berkeley) 5/31/93"; #else static const char rcsid[] = - "$Id: proc.c,v 1.8 1998/02/28 10:49:59 jraynard Exp $"; + "$Id: proc.c,v 1.9 1998/05/06 06:50:58 charnier Exp $"; #endif #endif /* not lint */ @@ -76,7 +76,7 @@ static void okpcntl __P((void)); * pchild - called at interrupt level by the SIGCHLD signal * indicating that at least one child has terminated or stopped * thus at least one wait system call will definitely return a - * childs status. Top level routines (like pwait) must be sure + * child's status. Top level routines (like pwait) must be sure * to mask interrupts when playing with the proclist data structures! */ /* ARGUSED */ diff --git a/bin/csh/sem.c b/bin/csh/sem.c index f9fedda..33047f7 100644 --- a/bin/csh/sem.c +++ b/bin/csh/sem.c @@ -36,7 +36,7 @@ static char sccsid[] = "@(#)sem.c 8.1 (Berkeley) 5/31/93"; #else static const char rcsid[] = - "$Id: sem.c,v 1.8 1998/05/06 06:51:00 charnier Exp $"; + "$Id: sem.c,v 1.9 1999/04/25 21:13:32 imp Exp $"; #endif #endif /* not lint */ @@ -472,7 +472,7 @@ int i; * If more than one word is generated, then update the command vector. * * This is done differently in all the shells: - * 1. in the bourne shell and ksh globbing is not performed + * 1. in the Bourne shell and ksh globbing is not performed * 2. Bash/csh say ambiguous * 3. zsh does i/o to/from all the files * 4. itcsh concatenates the words. diff --git a/bin/csh/set.c b/bin/csh/set.c index c3745e6..82785d1 100644 --- a/bin/csh/set.c +++ b/bin/csh/set.c @@ -36,7 +36,7 @@ static char sccsid[] = "@(#)set.c 8.1 (Berkeley) 5/31/93"; #else static const char rcsid[] = - "$Id: set.c,v 1.9 1998/05/06 06:51:04 charnier Exp $"; + "$Id: set.c,v 1.10 1998/05/13 07:29:15 charnier Exp $"; #endif #endif /* not lint */ @@ -163,7 +163,7 @@ doset(v, t) cp = Strsave(value(vp)); /* get the old value back */ /* - * convert to cononical pathname (possibly resolving symlinks) + * convert to canonical pathname (possibly resolving symlinks) */ cp = dcanon(cp, cp); @@ -745,7 +745,7 @@ balance(p, f, d) break; case 1: /* was already right heavy */ switch (p->v_right->v_bal) { - case 1: /* sigle rotate */ + case 1: /* single rotate */ pp->v_link[ff] = rleft(p); p->v_left->v_bal = 0; p->v_bal = 0; @@ -783,7 +783,7 @@ balance(p, f, d) p->v_right->v_bal = 0; p->v_bal = 0; break; - case 0: /* signle rotate */ + case 0: /* single rotate */ pp->v_link[ff] = rright(p); p->v_right->v_bal = -1; p->v_bal = 1; diff --git a/bin/csh/time.c b/bin/csh/time.c index 1d9b37e..95620ff 100644 --- a/bin/csh/time.c +++ b/bin/csh/time.c @@ -36,7 +36,7 @@ static char sccsid[] = "@(#)time.c 8.1 (Berkeley) 5/31/93"; #else static const char rcsid[] = - "$Id: time.c,v 1.7 1997/02/22 14:02:09 peter Exp $"; + "$Id: time.c,v 1.8 1997/08/07 21:42:17 steve Exp $"; #endif #endif /* not lint */ @@ -219,7 +219,7 @@ prusage(r0, r1, e, b) (void) fprintf(cshout, "%ld", r1->ru_oublock - r0->ru_oublock); break; - case 'r': /* socket messages recieved */ + case 'r': /* socket messages received */ (void) fprintf(cshout, "%ld", r1->ru_msgrcv - r0->ru_msgrcv); break; @@ -227,7 +227,7 @@ prusage(r0, r1, e, b) (void) fprintf(cshout, "%ld", r1->ru_msgsnd - r0->ru_msgsnd); break; - case 'k': /* number of signals recieved */ + case 'k': /* number of signals received */ (void) fprintf(cshout, "%ld", r1->ru_nsignals-r0->ru_nsignals); break; diff --git a/bin/date/date.1 b/bin/date/date.1 index 11a59d6..271a684 100644 --- a/bin/date/date.1 +++ b/bin/date/date.1 @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)date.1 8.3 (Berkeley) 4/28/95 -.\" $Id: date.1,v 1.26 1999/01/13 07:01:07 danny Exp $ +.\" $Id: date.1,v 1.27 1999/03/09 09:38:53 brian Exp $ .\" .Dd November 17, 1993 .Dt DATE 1 @@ -278,7 +278,9 @@ a record of the user setting the time .%A S. Zatti .Re .Sh DIAGNOSTICS -Exit status is 0 on success, 1 if unable to set the date, and 2 +The +.Nm +utility exits 0 on success, 1 if unable to set the date, and 2 if able to set the local date, but unable to set it globally. .Pp Occasionally, when diff --git a/bin/dd/args.c b/bin/dd/args.c index 56c51fd..0f65b3d 100644 --- a/bin/dd/args.c +++ b/bin/dd/args.c @@ -40,7 +40,7 @@ static char sccsid[] = "@(#)args.c 8.3 (Berkeley) 4/2/94"; #endif static const char rcsid[] = - "$Id: args.c,v 1.12 1998/05/06 06:51:29 charnier Exp $"; + "$Id: args.c,v 1.13 1998/05/13 07:33:36 charnier Exp $"; #endif /* not lint */ #include @@ -328,7 +328,7 @@ c_conv(a, b) * 4) A positive decimal number followed by a m (mult by 512). * 5) A positive decimal number followed by a w (mult by sizeof int) * 6) Two or more positive decimal numbers (with/without k,b or w). - * seperated by x (also * for backwards compatibility), specifying + * separated by x (also * for backwards compatibility), specifying * the product of the indicated values. */ static u_long diff --git a/bin/dd/dd.1 b/bin/dd/dd.1 index 67d6b37..e4be5ac 100644 --- a/bin/dd/dd.1 +++ b/bin/dd/dd.1 @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)dd.1 8.2 (Berkeley) 1/13/94 -.\" $Id: dd.1,v 1.7 1998/05/06 06:51:35 charnier Exp $ +.\" $Id: dd.1,v 1.8 1998/11/29 13:54:20 bde Exp $ .\" .Dd January 13, 1994 .Dt DD 1 @@ -329,10 +329,10 @@ be written to the standard error output in the same format as the standard completion message and .Nm will exit. -.Pp +.Sh DIAGNOSTICS The .Nm -utility exits 0 on success or >0 if an error occurred. +utility exits 0 on success or >0 if an error occurs. .Sh SEE ALSO .Xr cp 1 , .Xr mt 1 , diff --git a/bin/echo/echo.1 b/bin/echo/echo.1 index eca9232..765c143 100644 --- a/bin/echo/echo.1 +++ b/bin/echo/echo.1 @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)echo.1 8.1 (Berkeley) 7/22/93 -.\" $Id: echo.1,v 1.5 1997/02/22 14:03:05 peter Exp $ +.\" $Id: echo.1,v 1.6 1998/05/13 07:39:07 charnier Exp $ .\" .Dd July 22, 1993 .Dt ECHO 1 @@ -59,7 +59,7 @@ Do not print the trailing newline character. This may also be achieved by appending `\ec' to the end of the string, as is done by iBCS2 compatible systems. .El -.Pp +.Sh DIAGNOSTICS The .Nm utility exits 0 on success, and >0 if an error occurs. diff --git a/bin/ed/buf.c b/bin/ed/buf.c index 511d83a..f3ee70b 100644 --- a/bin/ed/buf.c +++ b/bin/ed/buf.c @@ -1,4 +1,4 @@ -/* buf.c: This file contains the scratch-file buffer rountines for the +/* buf.c: This file contains the scratch-file buffer routines for the ed line editor. */ /*- * Copyright (c) 1993 Andrew Moore, Talke Studio. @@ -31,7 +31,7 @@ static char * const rcsid = "@(#)buf.c,v 1.4 1994/02/01 00:34:35 alm Exp"; #else static char * const rcsid = - "$Id: buf.c,v 1.14 1997/10/09 11:05:16 eivind Exp $"; + "$Id: buf.c,v 1.15 1997/12/31 12:25:33 helbig Exp $"; #endif #endif /* not lint */ diff --git a/bin/ed/cbc.c b/bin/ed/cbc.c index dbae5f9..fba3609 100644 --- a/bin/ed/cbc.c +++ b/bin/ed/cbc.c @@ -42,7 +42,7 @@ static char * const rcsid = "@(#)cbc.c,v 1.2 1994/02/01 00:34:36 alm Exp"; #else static char * const rcsid = - "$Id: cbc.c,v 1.9 1997/02/22 14:03:12 peter Exp $"; + "$Id: cbc.c,v 1.10 1997/08/07 21:33:40 steve Exp $"; #endif #endif /* not lint */ @@ -124,7 +124,7 @@ init_des_cipher() /* initialize the initialization vector */ MEMZERO(ivec, 8); - /* intialize the padding vector */ + /* initialize the padding vector */ srand((unsigned) time((time_t *) 0)); for (i = 0; i < 8; i++) CHAR(pvec, i) = (char) (rand()/RAND_DIV); diff --git a/bin/ed/undo.c b/bin/ed/undo.c index 549a354..93fef88 100644 --- a/bin/ed/undo.c +++ b/bin/ed/undo.c @@ -30,7 +30,7 @@ static char * const rcsid = "@(#)undo.c,v 1.1 1994/02/01 00:34:44 alm Exp"; #else static char * const rcsid = - "$Id: undo.c,v 1.6 1997/02/22 14:03:20 peter Exp $"; + "$Id: undo.c,v 1.7 1997/08/07 21:33:47 steve Exp $"; #endif #endif /* not lint */ @@ -42,7 +42,7 @@ undo_t *ustack = NULL; /* undo stack */ long usize = 0; /* stack size variable */ long u_p = 0; /* undo stack pointer */ -/* push_undo_stack: return pointer to intialized undo node */ +/* push_undo_stack: return pointer to initialized undo node */ undo_t * push_undo_stack(type, from, to) int type; diff --git a/bin/ls/ls.1 b/bin/ls/ls.1 index 17e5845..2975f98 100644 --- a/bin/ls/ls.1 +++ b/bin/ls/ls.1 @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 -.\" $Id: ls.1,v 1.26 1998/11/30 22:56:44 billf Exp $ +.\" $Id: ls.1,v 1.27 1999/04/27 23:33:52 hoek Exp $ .\" .Dd July 29, 1994 .Dt LS 1 @@ -341,7 +341,7 @@ or .Xr sticky 8 . ) .El .El -.Pp +.Sh DIAGNOSTICS The .Nm utility exits 0 on success, and >0 if an error occurs. diff --git a/bin/ls/ls.c b/bin/ls/ls.c index a5e8ed7..25c1ed2 100644 --- a/bin/ls/ls.c +++ b/bin/ls/ls.c @@ -45,7 +45,7 @@ static const char copyright[] = static char sccsid[] = "@(#)ls.c 8.5 (Berkeley) 4/2/94"; #else static const char rcsid[] = - "$Id: ls.c,v 1.22 1998/07/29 00:46:09 hoek Exp $"; + "$Id: ls.c,v 1.23 1998/08/02 22:47:11 hoek Exp $"; #endif #endif /* not lint */ @@ -407,7 +407,7 @@ display(p, list) * directory p has no children, or that fts_children() returned an * error. We ignore the error case since it will be replicated * on the next call to fts_read() on the post-order visit to the - * directory p, and will be signalled in traverse(). + * directory p, and will be signaled in traverse(). */ if (list == NULL) return; diff --git a/bin/mkdir/mkdir.1 b/bin/mkdir/mkdir.1 index 4ddfb7b..269c096 100644 --- a/bin/mkdir/mkdir.1 +++ b/bin/mkdir/mkdir.1 @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)mkdir.1 8.2 (Berkeley) 1/25/94 -.\" $Id: mkdir.1,v 1.6 1997/02/22 14:04:08 peter Exp $ +.\" $Id: mkdir.1,v 1.7 1998/05/15 06:23:43 charnier Exp $ .\" .Dd January 25, 1994 .Dt MKDIR 1 @@ -80,9 +80,10 @@ permission for the owner. .El .Pp The user must have write permission in the parent directory. -.Pp -.Nm Mkdir -exits 0 if successful, and >0 if an error occurred. +.Sh DIAGNOSTICS +The +.Nm +utility exits 0 on success, and >0 if an error occurs. .Sh SEE ALSO .Xr rmdir 1 .Sh STANDARDS diff --git a/bin/mv/mv.1 b/bin/mv/mv.1 index c706dcc..664bac4 100644 --- a/bin/mv/mv.1 +++ b/bin/mv/mv.1 @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)mv.1 8.1 (Berkeley) 5/31/93 -.\" $Id: mv.1,v 1.10 1997/10/26 10:33:02 helbig Exp $ +.\" $Id: mv.1,v 1.11 1998/05/15 06:25:16 charnier Exp $ .\" .Dd May 31, 1993 .Dt MV 1 @@ -122,7 +122,7 @@ rm -f destination_path && \e \tcp -pRP source_file destination && \e \trm -rf source_file .Ed -.Pp +.Sh DIAGNOSTICS The .Nm utility exits 0 on success, and >0 if an error occurs. diff --git a/bin/pax/ar_io.c b/bin/pax/ar_io.c index 5289aa7..50551a2 100644 --- a/bin/pax/ar_io.c +++ b/bin/pax/ar_io.c @@ -40,7 +40,7 @@ static char sccsid[] = "@(#)ar_io.c 8.2 (Berkeley) 4/18/94"; #endif static const char rcsid[] = - "$Id$"; + "$Id: ar_io.c,v 1.10 1998/05/15 06:27:34 charnier Exp $"; #endif /* not lint */ #include @@ -65,8 +65,8 @@ static const char rcsid[] = #define EXT_MODE O_RDONLY /* open mode for list/extract */ #define AR_MODE (O_WRONLY | O_CREAT | O_TRUNC) /* mode for archive */ #define APP_MODE O_RDWR /* mode for append */ -#define STDO "" /* psuedo name for stdout */ -#define STDN "" /* psuedo name for stdin */ +#define STDO "" /* pseudo name for stdout */ +#define STDN "" /* pseudo name for stdin */ static int arfd = -1; /* archive file descriptor */ static int artyp = ISREG; /* archive type: file/FIFO/tape */ static int arvol = 1; /* archive volume number */ @@ -263,7 +263,7 @@ ar_open(name) if ((arsb.st_size % rdblksz) == 0) break; /* - * When we cannont find a match, we may have a flawed archive. + * When we cannot find a match, we may have a flawed archive. */ if (rdblksz <= 0) rdblksz = FILEBLK; @@ -690,7 +690,7 @@ ar_write(buf, bsz) /* * Better tell the user the bad news... * if this is a block aligned archive format, we may have a bad archive - * if the format wants the header to start at a BLKMULT boundry. While + * if the format wants the header to start at a BLKMULT boundary. While * we can deal with the mis-aligned data, it violates spec and other * archive readers will likely fail. if the format is not block * aligned, the user may be lucky (and the archive is ok). @@ -763,7 +763,7 @@ ar_rdsync() * if the last i/o was a successful data transfer, we assume * the fault is just a bad record on the tape that we are now * past. If we did not get any data since the last resync try - * to move the tape foward one PHYSICAL record past any + * to move the tape forward one PHYSICAL record past any * damaged tape section. Some tape drives are stubborn and need * to be pushed. */ @@ -870,7 +870,7 @@ ar_fow(sksz, skipped) if (lseek(arfd, mpos, SEEK_SET) >= 0) return(0); } - sys_warn(1, errno, "Foward positioning operation on archive failed"); + sys_warn(1, errno, "Forward positioning operation on archive failed"); lstrval = -1; return(-1); } diff --git a/bin/pax/ar_subs.c b/bin/pax/ar_subs.c index e94cc19..e4bc37b 100644 --- a/bin/pax/ar_subs.c +++ b/bin/pax/ar_subs.c @@ -40,7 +40,7 @@ static char sccsid[] = "@(#)ar_subs.c 8.2 (Berkeley) 4/18/94"; #endif static const char rcsid[] = - "$Id$"; + "$Id: ar_subs.c,v 1.11 1998/05/15 06:27:36 charnier Exp $"; #endif /* not lint */ #include @@ -254,7 +254,7 @@ extract() } /* - * Non standard -Y and -Z flag. When the exisiting file is + * Non standard -Y and -Z flag. When the existing file is * same age or newer skip */ if ((Yflag || Zflag) && ((lstat(arcn->name, &sb) == 0))) { @@ -510,7 +510,7 @@ wr_archive(arcn, is_app) } /* - * tell format to write trailer; pad to block boundry; reset directory + * tell format to write trailer; pad to block boundary; reset directory * mode/access times, and check if all patterns supplied by the user * were matched. block off signals to avoid chance for multiple entry * into the cleanup code @@ -543,7 +543,7 @@ wr_archive(arcn, is_app) * It is really difficult to splice in members without either re-writing * the entire archive (from the point were the old version was), or having * assistance of the format specification in terms of a special update - * header that invalidates a previous archive record. The posix spec left + * header that invalidates a previous archive record. The POSIX spec left * the method used to implement -u unspecified. This pax is able to * over write existing files that it creates. */ @@ -568,7 +568,7 @@ append() /* * Do not allow an append operation if the actual archive is of a - * different format than the user specified foramt. + * different format than the user specified format. */ if (get_arc() < 0) return; @@ -664,7 +664,7 @@ append() lnk_end(); /* - * try to postion for write, if this fails quit. if any error occurs, + * try to position for write, if this fails quit. if any error occurs, * we will refuse to write */ if (appnd_start(tlen) < 0) diff --git a/bin/pax/buf_subs.c b/bin/pax/buf_subs.c index 73cc058..cd11bae 100644 --- a/bin/pax/buf_subs.c +++ b/bin/pax/buf_subs.c @@ -40,7 +40,7 @@ static char sccsid[] = "@(#)buf_subs.c 8.2 (Berkeley) 4/18/94"; #endif static const char rcsid[] = - "$Id$"; + "$Id: buf_subs.c,v 1.10 1998/05/15 06:27:37 charnier Exp $"; #endif /* not lint */ #include @@ -102,7 +102,7 @@ wr_start() if (!wrblksz) wrblksz = frmt->bsz; if (wrblksz > MAXBLK) { - pax_warn(1, "Write block size of %d too large, maximium is: %d", + pax_warn(1, "Write block size of %d too large, maximum is: %d", wrblksz, MAXBLK); return(-1); } @@ -147,7 +147,7 @@ rd_start() buf = &(bufmem[BLKMULT]); if ((act == APPND) && wrblksz) { if (wrblksz > MAXBLK) { - pax_warn(1,"Write block size %d too large, maximium is: %d", + pax_warn(1,"Write block size %d too large, maximum is: %d", wrblksz, MAXBLK); return(-1); } @@ -609,7 +609,7 @@ rd_wrbuf(in, cpcnt) /* * wr_skip() - * skip foward during a write. In other words add padding to the file. + * skip forward during a write. In other words add padding to the file. * we add zero filled padding as it makes flawed archives much easier to * recover from. the caller tells us how many bytes of padding to add * This routine was not designed to add HUGE amount of padding, just small @@ -799,7 +799,7 @@ rd_wrfile(arcn, ofd, left) /* * if the last block has a file hole (all zero), we must make sure this * gets updated in the file. We force the last block of zeros to be - * written. just closing with the file offset moved foward may not put + * written. just closing with the file offset moved forward may not put * a hole at the end of the file. */ if (isem && (arcn->sb.st_size > 0L)) @@ -899,7 +899,7 @@ cp_file(arcn, fd1, fd2) /* * if the last block has a file hole (all zero), we must make sure this * gets updated in the file. We force the last block of zeros to be - * written. just closing with the file offset moved foward may not put + * written. just closing with the file offset moved forward may not put * a hole at the end of the file. */ if (!no_hole && isem && (arcn->sb.st_size > 0L)) diff --git a/bin/pax/cache.c b/bin/pax/cache.c index 36a1e87..9c9d95d 100644 --- a/bin/pax/cache.c +++ b/bin/pax/cache.c @@ -40,7 +40,7 @@ static char sccsid[] = "@(#)cache.c 8.1 (Berkeley) 5/31/93"; #endif static const char rcsid[] = - "$Id$"; + "$Id: cache.c,v 1.10 1998/05/15 06:27:37 charnier Exp $"; #endif /* not lint */ #include @@ -235,7 +235,7 @@ name_uid(uid, frc) if ((pw = getpwuid(uid)) == NULL) { /* * no match for this uid in the local password file - * a string that is the uid in numberic format + * a string that is the uid in numeric format */ if (ptr == NULL) return(""); @@ -312,7 +312,7 @@ name_gid(gid, frc) if ((gr = getgrgid(gid)) == NULL) { /* * no match for this gid in the local group file, put in - * a string that is the gid in numberic format + * a string that is the gid in numeric format */ if (ptr == NULL) return(""); diff --git a/bin/pax/cache.h b/bin/pax/cache.h index 5c01ef4..7d682a2 100644 --- a/bin/pax/cache.h +++ b/bin/pax/cache.h @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * @(#)cache.h 8.1 (Berkeley) 5/31/93 - * $Id$ + * $Id: cache.h,v 1.4 1997/02/22 14:04:22 peter Exp $ */ /* @@ -43,7 +43,7 @@ * caches. Traditional passwd/group cache routines perform quite poorly with * archives. The chances of hitting a valid lookup with an archive is quite a * bit worse than with files already resident on the file system. These misses - * create a MAJOR performance cost. To adress this problem, these routines + * create a MAJOR performance cost. To address this problem, these routines * cache both hits and misses. * * NOTE: name lengths must be as large as those stored in ANY PROTOCOL and diff --git a/bin/pax/cpio.c b/bin/pax/cpio.c index df6f3f1..96f16f8 100644 --- a/bin/pax/cpio.c +++ b/bin/pax/cpio.c @@ -40,7 +40,7 @@ static char sccsid[] = "@(#)cpio.c 8.1 (Berkeley) 5/31/93"; #endif static const char rcsid[] = - "$Id$"; + "$Id: cpio.c,v 1.10 1998/05/15 06:27:38 charnier Exp $"; #endif /* not lint */ #include @@ -1012,7 +1012,7 @@ bcpio_rd(arcn, buf) hd = (HD_BCPIO *)buf; if (swp_head) { /* - * header has swapped bytes on 16 bit boundries + * header has swapped bytes on 16 bit boundaries */ arcn->sb.st_dev = (dev_t)(RSHRT_EXT(hd->h_dev)); arcn->sb.st_ino = (ino_t)(RSHRT_EXT(hd->h_ino)); diff --git a/bin/pax/file_subs.c b/bin/pax/file_subs.c index 1ddb59d..f712c29 100644 --- a/bin/pax/file_subs.c +++ b/bin/pax/file_subs.c @@ -40,7 +40,7 @@ static char sccsid[] = "@(#)file_subs.c 8.1 (Berkeley) 5/31/93"; #endif static const char rcsid[] = - "$Id$"; + "$Id: file_subs.c,v 1.10 1998/05/15 06:27:39 charnier Exp $"; #endif /* not lint */ #include @@ -94,7 +94,7 @@ file_creat(arcn) * detect this, we use O_EXCL. For example when trying to create a * file and a character device or fifo exists with the same name, we * can accidently open the device by mistake (or block waiting to open) - * If we find that the open has failed, then figure spend the effore to + * If we find that the open has failed, then figure spend the effort to * figure out why. This strategy was found to have better average * performance in common use than checking the file (and the path) * first with lstat. @@ -235,7 +235,7 @@ cross_lnk(arcn) #endif { /* - * try to make a link to orginal file (-l flag in copy mode). make sure + * try to make a link to original file (-l flag in copy mode). make sure * we do not try to link to directories in case we are running as root * (and it might succeed). */ diff --git a/bin/pax/ftree.c b/bin/pax/ftree.c index b9f32e3..dde85da 100644 --- a/bin/pax/ftree.c +++ b/bin/pax/ftree.c @@ -40,7 +40,7 @@ static char sccsid[] = "@(#)ftree.c 8.2 (Berkeley) 4/18/94"; #endif static const char rcsid[] = - "$Id: ftree.c,v 1.10 1998/05/15 06:27:42 charnier Exp $"; + "$Id: ftree.c,v 1.11 1998/06/09 03:38:43 imp Exp $"; #endif /* not lint */ #include @@ -70,7 +70,7 @@ static const char rcsid[] = * pax, they are read from stdin */ -static FTS *ftsp = NULL; /* curent FTS handle */ +static FTS *ftsp = NULL; /* current FTS handle */ static int ftsopts; /* options to be used on fts_open */ static char *farray[2]; /* array for passing each arg to fts */ static FTREE *fthead = NULL; /* head of linked list of file args */ @@ -328,7 +328,7 @@ ftree_arg() * watch it, fts wants the file arg stored in a array of char * ptrs, with the last one a null. we use a two element array * and set farray[0] to point at the buffer with the file name - * in it. We cannnot pass all the file args to fts at one shot + * in it. We cannot pass all the file args to fts at one shot * as we need to keep a handle on which file arg generates what * files (the -n and -d flags need this). If the open is * successful, return a 0. @@ -515,7 +515,7 @@ next_file(arcn) } /* * set link name length, watch out readlink does not - * allways NUL terminate the link path + * always NUL terminate the link path */ arcn->ln_name[cnt] = '\0'; arcn->ln_nlen = cnt; diff --git a/bin/pax/options.c b/bin/pax/options.c index 4022626..c34677a 100644 --- a/bin/pax/options.c +++ b/bin/pax/options.c @@ -40,7 +40,7 @@ static char sccsid[] = "@(#)options.c 8.2 (Berkeley) 4/18/94"; #endif static const char rcsid[] = - "$Id$"; + "$Id: options.c,v 1.11 1998/05/15 06:27:43 charnier Exp $"; #endif /* not lint */ #include @@ -904,7 +904,7 @@ bad_opt() * opt_add() * breaks the value supplied to -o into a option name and value. options * are given to -o in the form -o name-value,name=value - * mulltiple -o may be specified. + * multiple -o may be specified. * Return: * 0 if format in name=value format, -1 if -o is passed junk */ diff --git a/bin/pax/pax.1 b/bin/pax/pax.1 index a54a013..a5366df 100644 --- a/bin/pax/pax.1 +++ b/bin/pax/pax.1 @@ -34,7 +34,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)pax.1 8.4 (Berkeley) 4/18/94 -.\" $Id: pax.1,v 1.7 1998/05/15 06:27:45 charnier Exp $ +.\" $Id: pax.1,v 1.8 1998/05/31 22:43:57 steve Exp $ .\" .Dd April 18, 1994 .Dt PAX 1 @@ -1124,7 +1124,7 @@ standard. .Sh AUTHORS .An Keith Muller at the University of California, San Diego -.Sh ERRORS +.Sh DIAGNOSTICS .Nm Pax will exit with one of the following values: .Bl -tag -width 2n diff --git a/bin/pax/pax.c b/bin/pax/pax.c index 4caecf9..bfd1f3d 100644 --- a/bin/pax/pax.c +++ b/bin/pax/pax.c @@ -46,7 +46,7 @@ static char const copyright[] = static char sccsid[] = "@(#)pax.c 8.2 (Berkeley) 4/18/94"; #endif static const char rcsid[] = - "$Id$"; + "$Id: pax.c,v 1.11 1998/05/15 06:27:45 charnier Exp $"; #endif /* not lint */ #include @@ -143,14 +143,14 @@ sigset_t s_mask; /* signal mask for cleanup critical sect */ * -U options. * 1.10 Files can be selected based on group (group name or gid) via one o * more -G options. - * 1.11 File modification time can be checked against exisiting file after + * 1.11 File modification time can be checked against existing file after * name modification (-Z) * * 2 WRITE ENHANCEMENTS * 2.1 Write operation will stop instead of allowing a user to create a flawed * flawed archive (due to any problem). - * 2.2 Archives writtens by pax are forced to strictly conform to both the - * archive and pax the spceific format specifications. + * 2.2 Archives written by pax are forced to strictly conform to both the + * archive and pax the specific format specifications. * 2.3 Blocking size and format is rigidly enforced on writes. * 2.4 Formats which may exhibit header overflow problems (they have fields * too small for large file systems, such as inode number storage), use @@ -163,7 +163,7 @@ sigset_t s_mask; /* signal mask for cleanup critical sect */ * 2.6 A archive volume record limit allows the user to specify the number * of bytes stored on an archive volume. When reached the user is * prompted for the next archive volume. This is specified with the - * non-standard -B flag. THe limit is rounded up to the next blocksize. + * non-standard -B flag. The limit is rounded up to the next blocksize. * 2.7 All archive padding during write use zero filled sections. This makes * it much easier to pull data out of flawed archive during read * operations. @@ -198,11 +198,11 @@ sigset_t s_mask; /* signal mask for cleanup critical sect */ * more -G options. * 3.8 Symlinks which appear on the command line can be followed (without * following other symlinks; -H flag) - * 3.9 File inode change time can be checked against exisiting file before + * 3.9 File inode change time can be checked against existing file before * name modification (-D) - * 3.10 File inode change time can be checked against exisiting file after + * 3.10 File inode change time can be checked against existing file after * name modification (-Y) - * 3.11 File modification time can be checked against exisiting file after + * 3.11 File modification time can be checked against existing file after * name modification (-Z) * * 4 GENERAL ENHANCEMENTS diff --git a/bin/pax/pax.h b/bin/pax/pax.h index 644f4d1..41ef0bf 100644 --- a/bin/pax/pax.h +++ b/bin/pax/pax.h @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * @(#)pax.h 8.2 (Berkeley) 4/18/94 - * $Id$ + * $Id: pax.h,v 1.6 1997/02/22 14:04:40 peter Exp $ */ /* @@ -49,7 +49,7 @@ /* Don't even think of changing this */ #define DEVBLK 8192 /* default read blksize for devices */ #define FILEBLK 10240 /* default read blksize for files */ -#define PAXPATHLEN 3072 /* maximium path length for pax. MUST be */ +#define PAXPATHLEN 3072 /* maximum path length for pax. MUST be */ /* longer than the system MAXPATHLEN */ /* @@ -77,7 +77,7 @@ * The format specific routine table allows new archive formats to be quickly * added. Overall pax operation is independent of the actual format used to * form the archive. Only those routines which deal directly with the archive - * are tailored to the oddities of the specifc format. All other routines are + * are tailored to the oddities of the specific format. All other routines are * independent of the archive format. Data flow in and out of the format * dependent routines pass pointers to ARCHD structure (described below). */ @@ -103,7 +103,7 @@ typedef struct { int hlk; /* does archive store hard links info? if */ /* not, we do not bother to look for them */ /* during archive write operations */ - int blkalgn; /* writes must be aligned to blkalgn boundry */ + int blkalgn; /* writes must be aligned to blkalgn boundary */ int inhead; /* is the trailer encoded in a valid header? */ /* if not, trailers are assumed to be found */ /* in invalid headers (i.e like tar) */ @@ -141,7 +141,7 @@ typedef struct { /* a flawed archive header. */ int (*end_wr)(); /* end write. write the trailer and do any */ /* other format specific functions needed */ - /* at the ecnd of a archive write */ + /* at the end of a archive write */ int (*trail)(); /* returns 0 if a valid trailer, -1 if not */ /* For formats which encode the trailer */ /* outside of a valid header, a return value */ diff --git a/bin/pax/sel_subs.c b/bin/pax/sel_subs.c index 8c9642b..d707ebf 100644 --- a/bin/pax/sel_subs.c +++ b/bin/pax/sel_subs.c @@ -40,7 +40,7 @@ static char sccsid[] = "@(#)sel_subs.c 8.1 (Berkeley) 5/31/93"; #endif static const char rcsid[] = - "$Id$"; + "$Id: sel_subs.c,v 1.9 1998/05/15 06:27:46 charnier Exp $"; #endif /* not lint */ #include @@ -73,7 +73,7 @@ static GRPT **grptb = NULL; /* group selection table */ /* * sel_chk() - * check if this file matches a specfied uid, gid or time range + * check if this file matches a specified uid, gid or time range * Return: * 0 if this archive member should be processed, 1 if it should be skipped */ @@ -99,7 +99,7 @@ sel_chk(arcn) * * Routines to handle user selection of files based on the file uid/gid. To * add an entry, the user supplies either then name or the uid/gid starting with - * a # on the command line. A \# will eascape the #. + * a # on the command line. A \# will escape the #. */ /* diff --git a/bin/pax/tables.c b/bin/pax/tables.c index 11d4d64..f711af6 100644 --- a/bin/pax/tables.c +++ b/bin/pax/tables.c @@ -40,7 +40,7 @@ static char sccsid[] = "@(#)tables.c 8.1 (Berkeley) 5/31/93"; #endif static const char rcsid[] = - "$Id$"; + "$Id: tables.c,v 1.11 1998/05/15 06:27:46 charnier Exp $"; #endif /* not lint */ #include @@ -61,13 +61,13 @@ static const char rcsid[] = * keeps. Tables are dynamically created only when they are needed. The * goal was speed and the ability to work with HUGE archives. The databases * were kept simple, but do have complex rules for when the contents change. - * As of this writing, the posix library functions were more complex than + * As of this writing, the POSIX library functions were more complex than * needed for this application (pax databases have very short lifetimes and * do not survive after pax is finished). Pax is required to handle very * large archives. These database routines carefully combine memory usage and * temporary file storage in ways which will not significantly impact runtime * performance while allowing the largest possible archives to be handled. - * Trying to force the fit to the posix databases routines was not considered + * Trying to force the fit to the POSIX databases routines was not considered * time well spent. */ @@ -508,7 +508,7 @@ chk_ftime(arcn) * Interactive rename table routines * * The interactive rename table keeps track of the new names that the user - * assignes to files from tty input. Since this map is unique for each file + * assigns to files from tty input. Since this map is unique for each file * we must store it in case there is a reference to the file later in archive * (a link). Otherwise we will be unable to find the file we know was * extracted. The remapping of these files is stored in a memory based hash @@ -762,7 +762,7 @@ add_dev(arcn) * check for a device value in the device table. If not found and the add * flag is set, it is added. This does NOT assign any mapping values, just * adds the device number as one that need to be remapped. If this device - * is alread mapped, just return with a pointer to that entry. + * is already mapped, just return with a pointer to that entry. * Return: * pointer to the entry for this device in the device map table. Null * if the add flag is not set and the device is not in the table (it is diff --git a/bin/pax/tables.h b/bin/pax/tables.h index 5c20776..a7c73be 100644 --- a/bin/pax/tables.h +++ b/bin/pax/tables.h @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * @(#)tables.h 8.1 (Berkeley) 5/31/93 - * $Id$ + * $Id: tables.h,v 1.5 1997/02/22 14:04:44 peter Exp $ */ /* @@ -80,7 +80,7 @@ typedef struct hrdlnk { typedef struct ftm { int namelen; /* file name length */ time_t mtime; /* files last modification time */ - off_t seek; /* loacation in scratch file */ + off_t seek; /* location in scratch file */ struct ftm *fow; } FTM; diff --git a/bin/pax/tar.c b/bin/pax/tar.c index ba8c6b0..97a731a 100644 --- a/bin/pax/tar.c +++ b/bin/pax/tar.c @@ -40,7 +40,7 @@ static char sccsid[] = "@(#)tar.c 8.2 (Berkeley) 4/18/94"; #endif static const char rcsid[] = - "$Id: tar.c,v 1.10 1998/05/15 06:27:47 charnier Exp $"; + "$Id: tar.c,v 1.11 1998/10/20 05:52:33 msmith Exp $"; #endif /* not lint */ #include @@ -289,7 +289,7 @@ uqd_oct(val, str, len, term) /* * tar_chksm() * calculate the checksum for a tar block counting the checksum field as - * all blanks (BLNKSUM is that value pre-calculated, the sume of 8 blanks). + * all blanks (BLNKSUM is that value pre-calculated, the sum of 8 blanks). * NOTE: we use len to short circuit summing 0's on write since we ALWAYS * pad headers with 0. * Return: @@ -308,7 +308,7 @@ tar_chksm(blk, len) { register char *stop; register char *pt; - u_long chksm = BLNKSUM; /* inital value is checksum field sum */ + u_long chksm = BLNKSUM; /* initial value is checksum field sum */ /* * add the part of the block before the checksum field @@ -517,7 +517,7 @@ tar_rd(arcn, buf) } else { /* * have a file that will be followed by data. Set the - * skip value to the size field and caluculate the size + * skip value to the size field and calculate the size * of the padding. */ arcn->type = PAX_REG; @@ -848,7 +848,7 @@ ustar_rd(arcn, buf) * If we can find the ascii names for gname and uname in the password * and group files we will use the uid's and gid they bind. Otherwise * we use the uid and gid values stored in the header. (This is what - * the posix spec wants). + * the POSIX spec wants). */ hd->gname[sizeof(hd->gname) - 1] = '\0'; if (gid_name(hd->gname, &(arcn->sb.st_gid)) < 0) @@ -1161,7 +1161,7 @@ name_split(name, len) /* * we start looking at the biggest sized piece that fits in the name - * field. We walk foward looking for a slash to split at. The idea is + * field. We walk forward looking for a slash to split at. The idea is * to find the biggest piece to fit in the name field (or the smallest * prefix we can find) */ diff --git a/bin/pax/tar.h b/bin/pax/tar.h index 5533a07..be24450 100644 --- a/bin/pax/tar.h +++ b/bin/pax/tar.h @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * @(#)tar.h 8.2 (Berkeley) 4/18/94 - * $Id$ + * $Id: tar.h,v 1.4 1997/02/22 14:04:46 peter Exp $ */ /* @@ -45,13 +45,13 @@ #define TNMSZ 100 /* size of name field */ #ifdef _PAX_ #define NULLCNT 2 /* number of null blocks in trailer */ -#define CHK_OFFSET 148 /* start of chksum field */ +#define CHK_OFFSET 148 /* start of checksum field */ #define BLNKSUM 256L /* sum of checksum field using ' ' */ #endif /* _PAX_ */ /* * Values used in typeflag field in all tar formats - * (only REGTYPE, LNKTYPE and SYMTYPE are used in old bsd tar headers) + * (only REGTYPE, LNKTYPE and SYMTYPE are used in old BSD tar headers) */ #define REGTYPE '0' /* Regular File */ #define AREGTYPE '\0' /* Regular File */ diff --git a/bin/pax/tty_subs.c b/bin/pax/tty_subs.c index c862116..53017b8 100644 --- a/bin/pax/tty_subs.c +++ b/bin/pax/tty_subs.c @@ -40,7 +40,7 @@ static char sccsid[] = "@(#)tty_subs.c 8.2 (Berkeley) 4/18/94"; #endif static const char rcsid[] = - "$Id$"; + "$Id: tty_subs.c,v 1.9 1998/05/15 06:27:48 charnier Exp $"; #endif /* not lint */ #include @@ -68,7 +68,7 @@ static FILE *ttyinf = NULL; /* input pointing at control tty */ /* * tty_init() - * try to open the controlling termina (if any) for this process. if the + * try to open the controlling terminal (if any) for this process. if the * open fails, future ops that require user input will get an EOF */ diff --git a/bin/ps/ps.1 b/bin/ps/ps.1 index 5283558..324083f 100644 --- a/bin/ps/ps.1 +++ b/bin/ps/ps.1 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 -.\" $Id: ps.1,v 1.20 1999/04/06 03:18:57 peter Exp $ +.\" $Id: ps.1,v 1.21 1999/04/28 11:38:28 phk Exp $ .\" .Dd April 18, 1994 .Dt PS 1 @@ -70,8 +70,8 @@ controlling terminal, cpu time (including both user and system time), state, and associated command. .Pp The process file system (see -.Xr procfs 5 -\&) should be mounted when +.Xr procfs 5 ) +should be mounted when .Nm is executed, otherwise not all information will be available. .Pp diff --git a/bin/pwd/pwd.1 b/bin/pwd/pwd.1 index 39f0d5e..4c4ab8d 100644 --- a/bin/pwd/pwd.1 +++ b/bin/pwd/pwd.1 @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)pwd.1 8.2 (Berkeley) 4/28/95 -.\" $Id: pwd.1,v 1.5 1997/02/22 14:05:15 peter Exp $ +.\" $Id: pwd.1,v 1.6 1998/05/15 06:30:57 charnier Exp $ .\" .Dd April 28, 1995 .Dt PWD 1 @@ -47,12 +47,14 @@ .Nm Pwd writes the absolute pathname of the current working directory to the standard output. -.Pp -The pwd utility exits 0 on success, and >0 if an error occurs. +.Sh DIAGNOSTICS +The +.Nm +utility exits 0 on success, and >0 if an error occurs. .Sh STANDARDS The .Nm -command is expected to be +utility is expected to be .St -p1003.2 compatible. .Sh SEE ALSO diff --git a/bin/sh/alias.c b/bin/sh/alias.c index 9ef862b..a02d12b 100644 --- a/bin/sh/alias.c +++ b/bin/sh/alias.c @@ -39,7 +39,7 @@ static char sccsid[] = "@(#)alias.c 8.3 (Berkeley) 5/4/95"; #endif static const char rcsid[] = - "$Id$"; + "$Id: alias.c,v 1.10 1998/05/18 06:43:25 charnier Exp $"; #endif /* not lint */ #include @@ -90,7 +90,7 @@ setalias(name, val) * expanding an alias, the value of the alias is pushed back on the * input as a string and a pointer to the alias is stored with the * string. The alias is marked as being in use. When the input - * routine finishes reading the string, it markes the alias not + * routine finishes reading the string, it marks the alias not * in use. The problem is synchronization with the parser. Since * it reads ahead, the alias is marked not in use before the * resulting token(s) is next checked for further alias sub. The diff --git a/bin/sh/error.h b/bin/sh/error.h index eed9c9d..fe6e25e 100644 --- a/bin/sh/error.h +++ b/bin/sh/error.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)error.h 8.2 (Berkeley) 5/4/95 - * $Id: error.h,v 1.8 1998/08/24 10:20:36 cracauer Exp $ + * $Id: error.h,v 1.9 1998/08/24 19:15:48 cracauer Exp $ */ /* @@ -50,7 +50,7 @@ * We enclose jmp_buf in a structure so that we can declare pointers to * jump locations. The global variable handler contains the location to * jump to when an exception occurs, and the global variable exception - * contains a code identifying the exeception. To implement nested + * contains a code identifying the exception. To implement nested * exception handlers, the user should save the value of handler on entry * to an inner scope, set handler to point to a jmploc structure for the * inner scope, and restore handler on exit from the scope. diff --git a/bin/sh/eval.c b/bin/sh/eval.c index 7bf92b2..2a1e760 100644 --- a/bin/sh/eval.c +++ b/bin/sh/eval.c @@ -39,7 +39,7 @@ static char sccsid[] = "@(#)eval.c 8.9 (Berkeley) 6/8/95"; #endif static const char rcsid[] = - "$Id: eval.c,v 1.17 1999/04/03 12:55:51 cracauer Exp $"; + "$Id: eval.c,v 1.18 1999/04/21 11:52:39 cracauer Exp $"; #endif /* not lint */ #include @@ -122,7 +122,7 @@ SHELLPROC { /* - * The eval commmand. + * The eval command. */ int diff --git a/bin/sh/expand.c b/bin/sh/expand.c index 67a9c8b..e661be6 100644 --- a/bin/sh/expand.c +++ b/bin/sh/expand.c @@ -39,7 +39,7 @@ static char sccsid[] = "@(#)expand.c 8.5 (Berkeley) 5/15/95"; #endif static const char rcsid[] = - "$Id: expand.c,v 1.26 1999/04/13 04:13:09 tegge Exp $"; + "$Id: expand.c,v 1.27 1999/04/21 11:52:39 cracauer Exp $"; #endif /* not lint */ #include @@ -382,10 +382,10 @@ expari(flag) /* - * This routine is slightly over-compilcated for + * This routine is slightly over-complicated for * efficiency. First we make sure there is * enough space for the result, which may be bigger - * than the expression if we add exponentation. Next we + * than the expression if we add exponentiation. Next we * 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 diff --git a/bin/sh/jobs.c b/bin/sh/jobs.c index 07d7e16..ce1785b 100644 --- a/bin/sh/jobs.c +++ b/bin/sh/jobs.c @@ -39,7 +39,7 @@ static char sccsid[] = "@(#)jobs.c 8.5 (Berkeley) 5/4/95"; #endif static const char rcsid[] = - "$Id: jobs.c,v 1.23 1998/09/08 13:16:52 cracauer Exp $"; + "$Id: jobs.c,v 1.24 1999/04/21 11:52:39 cracauer Exp $"; #endif /* not lint */ #include @@ -693,7 +693,7 @@ forkshell(jp, n, mode) * the interactive program catches interrupts, the user doesn't want * these interrupts to also abort the loop. The approach we take here * is to have the shell ignore interrupt signals while waiting for a - * forground process to terminate, and then send itself an interrupt + * foreground process to terminate, and then send itself an interrupt * signal if the child process was terminated by an interrupt signal. * Unfortunately, some programs want to do a bit of cleanup and then * exit on interrupt; unless these processes terminate themselves by diff --git a/bin/sh/main.c b/bin/sh/main.c index 3cd49d2..f91f1ab 100644 --- a/bin/sh/main.c +++ b/bin/sh/main.c @@ -45,7 +45,7 @@ static char const copyright[] = static char sccsid[] = "@(#)main.c 8.6 (Berkeley) 5/28/95"; #endif static const char rcsid[] = - "$Id$"; + "$Id: main.c,v 1.15 1998/05/18 06:43:52 charnier Exp $"; #endif /* not lint */ #include @@ -309,7 +309,7 @@ readcmdfile(name) /* - * Take commands from a file. To be compatable we should do a path + * Take commands from a file. To be compatible we should do a path * search for the file, which is necessary to find sub-commands. */ diff --git a/bin/sh/miscbltin.c b/bin/sh/miscbltin.c index 4daacac..4c8d96f 100644 --- a/bin/sh/miscbltin.c +++ b/bin/sh/miscbltin.c @@ -39,11 +39,11 @@ static char sccsid[] = "@(#)miscbltin.c 8.4 (Berkeley) 5/4/95"; #endif static const char rcsid[] = - "$Id: miscbltin.c,v 1.17 1998/08/25 09:33:34 cracauer Exp $"; + "$Id: miscbltin.c,v 1.18 1998/12/16 04:45:35 imp Exp $"; #endif /* not lint */ /* - * Miscelaneous builtins. + * Miscellaneous builtins. */ #include diff --git a/bin/sh/trap.c b/bin/sh/trap.c index 429253c..2a6b88a 100644 --- a/bin/sh/trap.c +++ b/bin/sh/trap.c @@ -39,7 +39,7 @@ static char sccsid[] = "@(#)trap.c 8.5 (Berkeley) 6/5/95"; #endif static const char rcsid[] = - "$Id: trap.c,v 1.17 1998/09/10 22:09:11 cracauer Exp $"; + "$Id: trap.c,v 1.18 1999/04/01 13:27:36 cracauer Exp $"; #endif /* not lint */ #include @@ -70,7 +70,7 @@ static const char rcsid[] = #define S_DFL 1 /* default signal handling (SIG_DFL) */ #define S_CATCH 2 /* signal is caught */ #define S_IGN 3 /* signal is ignored (SIG_IGN) */ -#define S_HARD_IGN 4 /* signal is ignored permenantly */ +#define S_HARD_IGN 4 /* signal is ignored permanently */ #define S_RESET 5 /* temporary - to reset a hard ignored sig */ diff --git a/bin/sleep/sleep.1 b/bin/sleep/sleep.1 index 679e78d..9f36209 100644 --- a/bin/sleep/sleep.1 +++ b/bin/sleep/sleep.1 @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)sleep.1 8.3 (Berkeley) 4/18/94 -.\" $Id: sleep.1,v 1.7 1997/08/12 21:20:12 ache Exp $ +.\" $Id: sleep.1,v 1.8 1998/05/18 06:46:11 charnier Exp $ .\" .Dd April 18, 1994 .Dt SLEEP 1 @@ -60,7 +60,7 @@ If the command receives a SIGALRM signal, it terminates normally with a zero exit status, for any other signal it takes the standard action. -.Pp +.Sh DIAGNOSTICS The .Nm utility exits with one of the following values: diff --git a/bin/stty/stty.1 b/bin/stty/stty.1 index 27a8749..1862791 100644 --- a/bin/stty/stty.1 +++ b/bin/stty/stty.1 @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)stty.1 8.4 (Berkeley) 4/18/94 -.\" $Id: stty.1,v 1.9 1998/05/18 06:48:19 charnier Exp $ +.\" $Id: stty.1,v 1.10 1998/06/03 04:07:59 jkoshy Exp $ .\" .Dd April 18, 1994 .Dt STTY 1 @@ -564,10 +564,10 @@ Same as the control character Same as the control character .Cm reprint . .El -.Pp +.Sh DIAGNOSTICS The .Nm -utility exits with a value of 0 if successful, and >0 if an error occurs. +utility exits 0 on success, and >0 if an error occurs. .Sh SEE ALSO .Xr termios 4 .Sh STANDARDS diff --git a/bin/test/test.c b/bin/test/test.c index df365e8..2b7bd42 100644 --- a/bin/test/test.c +++ b/bin/test/test.c @@ -45,7 +45,7 @@ static char const copyright[] = static char sccsid[] = "@(#)test.c 8.3 (Berkeley) 4/2/94"; #endif static const char rcsid[] = - "$Id: test.c,v 1.19 1998/05/18 06:51:59 charnier Exp $"; + "$Id: test.c,v 1.20 1998/09/07 16:59:05 cracauer Exp $"; #endif /* not lint */ #include @@ -130,7 +130,7 @@ main(argc, argv) fs.name = NULL; /* - * Test(1) implements an inherently ambiguous grammer. In order to + * Test(1) implements an inherently ambiguous grammar. In order to * assure some degree of consistency, we special case the POSIX 1003.2 * requirements to assure correct evaluation for POSIX scripts. The * following special cases comply with POSIX P1003.2/D11.2 Section -- cgit v1.1