[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[patch] spelling in ksh
- To: bugs_(_at_)_openbsd_(_dot_)_org
- Subject: [patch] spelling in ksh
- From: Brian Poole <raj_(_at_)_cerias_(_dot_)_purdue_(_dot_)_edu>
- Date: Thu, 27 Feb 2003 20:33:32 -0500
Went looking for the cause of a core dump and couldn't stop myself from
fixing at least some of the many, many misspellings. All in comments or
documentation.
-b
Index: BUG-REPORTS
===================================================================
RCS file: /cvs/src/bin/ksh/BUG-REPORTS,v
retrieving revision 1.13
diff -u -r1.13 BUG-REPORTS
--- BUG-REPORTS 14 Feb 2002 13:41:44 -0000 1.13
+++ BUG-REPORTS 28 Feb 2003 01:23:31 -0000
@@ -1349,7 +1349,7 @@
trap set in a subshell is not executed (unless explicit exit used).
[fixed in 5.2.14: exec.c(execute): changed exit(rv) to unwind(LEXIT).]
-x pdksh 5.2.12, - : MAILCHECK isn't preserved from the envirnment on startup.
+x pdksh 5.2.12, - : MAILCHECK isn't preserved from the environment on startup.
[fixed in 5.2.14: changed main's initcoms[].]
x pdksh 5.2.13, (reported by Marc Olzheim): time at the end of a pipeline
Index: ChangeLog
===================================================================
RCS file: /cvs/src/bin/ksh/ChangeLog,v
retrieving revision 1.12
diff -u -r1.12 ChangeLog
--- ChangeLog 14 Jul 1999 13:37:23 -0000 1.12
+++ ChangeLog 28 Feb 2003 01:23:32 -0000
@@ -369,7 +369,7 @@
Fri Aug 15 22:06:53 NDT 1997 Michael Rendell (michael_(_at_)_panda_(_dot_)_cs_(_dot_)_mun_(_dot_)_ca)
* eval.c(varsub,expand), lex.c(yylex): allow :%, :#, :%% and :##
- to be compatable with ksh88.
+ to be compatible with ksh88.
Sat Aug 2 12:13:30 NDT 1997 Michael Rendell (michael_(_at_)_panda_(_dot_)_cs_(_dot_)_mun_(_dot_)_ca)
@@ -406,7 +406,7 @@
Thu Mar 13 10:42:31 NST 1997 Michael Rendell (michael_(_at_)_panda_(_dot_)_cs_(_dot_)_mun_(_dot_)_ca)
* mail.c(mbset): save a copy of the path so it can't get trashed
- (eg, by exporting a varibale).
+ (eg, by exporting a variable).
Wed Feb 26 11:24:06 NST 1997 Michael Rendell (michael_(_at_)_panda_(_dot_)_cs_(_dot_)_mun_(_dot_)_ca)
@@ -795,7 +795,7 @@
Mon Aug 12 11:03:22 NDT 1996 Michael Rendell (michael_(_at_)_panda_(_dot_)_cs_(_dot_)_mun_(_dot_)_ca)
- * exec.c(findfunc): removed redundent DEFINED check after tsearch().
+ * exec.c(findfunc): removed redundant DEFINED check after tsearch().
Fri Aug 9 22:16:21 NDT 1996 Michael Rendell (michael_(_at_)_panda_(_dot_)_cs_(_dot_)_mun_(_dot_)_ca)
@@ -1231,7 +1231,7 @@
Thu Feb 1 15:27:06 NST 1996 Michael Rendell (michael_(_at_)_panda_(_dot_)_cs_(_dot_)_mun_(_dot_)_ca)
* c_test.h(Test_env): added end union.
- * c_test.c(c_test): keep track of end postition using end.wp;
+ * c_test.c(c_test): keep track of end position using end.wp;
don't write on wp.
* emacs.c(x_mapin): changed to dup string, then munge; return duped;
@@ -1353,7 +1353,7 @@
Tue Jan 9 11:23:36 NST 1996 Michael Rendell (michael_(_at_)_panda_(_dot_)_cs_(_dot_)_mun_(_dot_)_ca)
- * emacs.c(iscfs): make ', " seperators.
+ * emacs.c(iscfs): make ', " separators.
(fix from Dale DePriest).
* conf-end.h: deleted stuff to undef HISTORY, VI, EMACS, etc if
@@ -1491,7 +1491,7 @@
* main.c(shell): do not zero exstat at start of routine.
- * exec.c(execute): removed redundent "exstat = rv" before
+ * exec.c(execute): removed redundant "exstat = rv" before
unwind(LERROR).
Thu Nov 9 15:01:54 NST 1995 Michael Rendell (michael_(_at_)_angel_(_dot_)_cs_(_dot_)_mun_(_dot_)_ca)
Index: ChangeLog.0
===================================================================
RCS file: /cvs/src/bin/ksh/ChangeLog.0,v
retrieving revision 1.3
diff -u -r1.3 ChangeLog.0
--- ChangeLog.0 29 Oct 1998 04:09:19 -0000 1.3
+++ ChangeLog.0 28 Feb 2003 01:23:47 -0000
@@ -265,7 +265,7 @@
Sat Apr 29 21:10:54 NDT 1995 Michael Rendell (michael_(_at_)_garfield_(_dot_)_cs_(_dot_)_mun_(_dot_)_ca)
* vi.c(glob_word): don't append * if there are unescaped globing
- characters in the last component of the filename; some redundent
+ characters in the last component of the filename; some redundant
code eliminated.
(based on fix from Michael Jetzer).
@@ -642,7 +642,7 @@
Fri Dec 9 15:21:36 NST 1994 Michael Rendell (michael_(_at_)_panda_(_dot_)_cs_(_dot_)_mun_(_dot_)_ca)
- * trap.c(inittraps): OS2: don't trap SIGTERM (temproary fix).
+ * trap.c(inittraps): OS2: don't trap SIGTERM (temporary fix).
* exec.c(search_access1): OS2: fixed to check for valid suffix
and change mode from X_OK to R_OK if appropriate.
@@ -745,7 +745,7 @@
* ksh_dir.h(NLENGTH): new macro.
* eval.c(globit): use NLENGTH macro.
- * alloc.c(aresize): removed redundent np and optr variables.
+ * alloc.c(aresize): removed redundant np and optr variables.
Mon Nov 28 14:55:49 NST 1994 Michael Rendell (michael_(_at_)_panda_(_dot_)_cs_(_dot_)_mun_(_dot_)_ca)
@@ -841,7 +841,7 @@
Mon Nov 21 10:45:34 NST 1994 Michael Rendell (michael_(_at_)_panda_(_dot_)_cs_(_dot_)_mun_(_dot_)_ca)
- * exec.c(do_selectargs): removed use of pmenu variable (redundent)
+ * exec.c(do_selectargs): removed use of pmenu variable (redundant)
use isspace() instead of IFS chars; include <ctype.h>.
* aclocal.m4(KSH_TERM_CHECK): do not allow HAVE_TERMIOS_H check to
@@ -1565,7 +1565,7 @@
* eval.c(expand): set subst_exstat to return value of waitlast().
* c_sh.c(c_set): if !FPOSIX, return subst_exstat instead of 0.
- * exec.c(execute): removed redundent "exstat = rv;" near if FERREXIT.
+ * exec.c(execute): removed redundant "exstat = rv;" near if FERREXIT.
* exec.c(comexec): case CFUNC: for normal function completion, set
i to 0 and rv to return value of execute() (was i=LRETURN,exstat=..).
@@ -3189,7 +3189,7 @@
* aclocal.m4, configure.in, sh.h, tree.c, io.c, shf.c: added
new config test KSH_PROTOTYPES to check for function prototypes
(MIPS RICS/os 5.0 C compiler isn't STDC and it can't mix <stddef.h>
- with <varargs.h>). Removed stdarg.h test (now redundent). Changed
+ with <varargs.h>). Removed stdarg.h test (now redundant). Changed
all varargs functions to use HAVE_PROTOTYPES instead of
HAVE_STDARG_H && STDC.
@@ -3570,7 +3570,7 @@
(involves #defining free)
- main.c(main): smart initialization of PWD (ensures it is always
valid).
- - lex.h, table.h, tree.h: removed redundent function declarations
+ - lex.h, table.h, tree.h: removed redundant function declarations
(were also in proto.h)
- sh.h: increased LINE from 256 to 1024
- main.c(include), sh.h(E_INC), c_sh.c(c_return): added hack so a
@@ -3586,4 +3586,4 @@
- exec.c(iosetup): don't save fd if already saved (and don't
generate an error)
- exec.c(findcom): in if (..ALLOC && eaccess), test for
- ALLOC redundent - always call afree()
+ ALLOC redundant - always call afree()
Index: NEWS
===================================================================
RCS file: /cvs/src/bin/ksh/NEWS,v
retrieving revision 1.11
diff -u -r1.11 NEWS
--- NEWS 14 Jul 1999 13:37:23 -0000 1.11
+++ NEWS 28 Feb 2003 01:23:47 -0000
@@ -653,7 +653,7 @@
* has array support (needs work but is pretty functional).
-* ulimit command now more functional on more machines. Compatable with at&t ksh.
+* ulimit command now more functional on more machines. Compatible with at&t ksh.
* command line and set option parsing cleaned up, POSIXized.
Index: c_ksh.c
===================================================================
RCS file: /cvs/src/bin/ksh/c_ksh.c,v
retrieving revision 1.15
diff -u -r1.15 c_ksh.c
--- c_ksh.c 9 Jun 2002 05:47:27 -0000 1.15
+++ c_ksh.c 28 Feb 2003 01:23:47 -0000
@@ -361,7 +361,7 @@
case '0':
/* Look for an octal number: can have
* three digits (not counting the
- * leading 0). Truely burnt.
+ * leading 0). Truly burnt.
*/
c = 0;
for (i = 0; i < 3; i++) {
@@ -653,7 +653,7 @@
break;
case 'p': /* posix export/readonly -p flag.
* typset -p is the same as typeset (in pdksh);
- * here for compatability with ksh93.
+ * here for compatibility with ksh93.
*/
pflag = 1;
break;
Index: c_sh.c
===================================================================
RCS file: /cvs/src/bin/ksh/c_sh.c,v
retrieving revision 1.15
diff -u -r1.15 c_sh.c
--- c_sh.c 4 Jan 2003 22:36:07 -0000 1.15
+++ c_sh.c 28 Feb 2003 01:23:48 -0000
@@ -305,7 +305,7 @@
* make sure the other side of the pipe is closed first. This allows
* the detection of eof.
*
- * This is not compatiable with at&t ksh... the fd is kept so another
+ * This is not compatible with at&t ksh... the fd is kept so another
* coproc can be started with same output, however, this means eof
* can't be detected... This is why it is closed here.
* If this call is removed, remove the eof check below, too.
Index: c_test.c
===================================================================
RCS file: /cvs/src/bin/ksh/c_test.c,v
retrieving revision 1.8
diff -u -r1.8 c_test.c
--- c_test.c 9 Jun 2002 05:47:27 -0000 1.8
+++ c_test.c 28 Feb 2003 01:23:50 -0000
@@ -129,7 +129,7 @@
/*
* Handle the special cases from POSIX.2, section 4.62.4.
* Implementation of all the rules isn't necessary since
- * our parser does the right thing for the ommited steps.
+ * our parser does the right thing for the omitted steps.
*/
if (argc <= 5) {
char **owp = wp;
Index: config.h
===================================================================
RCS file: /cvs/src/bin/ksh/config.h,v
retrieving revision 1.6
diff -u -r1.6 config.h
--- config.h 11 Aug 2002 21:44:58 -0000 1.6
+++ config.h 28 Feb 2003 01:23:51 -0000
@@ -186,7 +186,7 @@
/* Define if you arg running OS2 with the EMX library */
/* #undef OS2 */
-/* Define if you have a POSIX.1 compatiable <sys/wait.h> */
+/* Define if you have a POSIX.1 compatible <sys/wait.h> */
#define POSIX_SYS_WAIT 1
/* Define if your OS maps references to /dev/fd/n to file descriptor n */
Index: emacs.c
===================================================================
RCS file: /cvs/src/bin/ksh/emacs.c,v
retrieving revision 1.17
diff -u -r1.17 emacs.c
--- emacs.c 16 Oct 2002 00:13:53 -0000 1.17
+++ emacs.c 28 Feb 2003 01:23:51 -0000
@@ -1127,7 +1127,7 @@
/* What transpose is meant to do seems to be up for debate. This
* is a general summary of the options; the text is abcd with the
- * upper case character or underscore indicating the cursor positiion:
+ * upper case character or underscore indicating the cursor position:
* Who Before After Before After
* at&t ksh in emacs mode: abCd abdC abcd_ (bell)
* at&t ksh in gmacs mode: abCd baCd abcd_ abdc_
@@ -2102,7 +2102,7 @@
}
/* NAME:
- * x_fold_case - convert word to UPPER/lower/Capitial case
+ * x_fold_case - convert word to UPPER/lower/Capital case
*
* DESCRIPTION:
* This function is used to implement M-U,M-u,M-L,M-l,M-C and M-c
Index: eval.c
===================================================================
RCS file: /cvs/src/bin/ksh/eval.c,v
retrieving revision 1.10
diff -u -r1.10 eval.c
--- eval.c 9 Jun 2002 05:47:27 -0000 1.10
+++ eval.c 28 Feb 2003 01:23:51 -0000
@@ -169,7 +169,7 @@
XString ds; /* destination string */
register char *dp, *sp; /* dest., source */
int fdo, word; /* second pass flags; have word */
- int doblank; /* field spliting of parameter/command subst */
+ int doblank; /* field splitting of parameter/command subst */
Expand x; /* expansion variables */
SubType st_head, *st;
int UNINITIALIZED(newlines); /* For trailing newlines in COMSUB */
@@ -445,7 +445,7 @@
c = *sp++ + 0x80;
break;
- case SPAT: /* pattern seperator (|) */
+ case SPAT: /* pattern separator (|) */
make_magic = 1;
c = '|';
break;
@@ -898,7 +898,7 @@
register char *p, c;
switch (how&0xff) { /* UCHAR_MAX maybe? */
- case '#': /* shortest at begining */
+ case '#': /* shortest at beginning */
for (p = str; p <= end; p++) {
c = *p; *p = '\0';
if (gmatch(str, pat, FALSE)) {
@@ -908,7 +908,7 @@
*p = c;
}
break;
- case '#'|0x80: /* longest match at begining */
+ case '#'|0x80: /* longest match at beginning */
for (p = end; p >= str; p--) {
c = *p; *p = '\0';
if (gmatch(str, pat, FALSE)) {
Index: exec.c
===================================================================
RCS file: /cvs/src/bin/ksh/exec.c,v
retrieving revision 1.26
diff -u -r1.26 exec.c
--- exec.c 9 Jun 2002 05:47:27 -0000 1.26
+++ exec.c 28 Feb 2003 01:23:51 -0000
@@ -832,7 +832,7 @@
} else {
/* Use ksh documented shell default if present
* else use OS2_SHELL which is assumed to need
- * the /c option and '\' as dir separater.
+ * the /c option and '\' as dir separator.
*/
char *p = shell;
Index: expr.c
===================================================================
RCS file: /cvs/src/bin/ksh/expr.c,v
retrieving revision 1.7
diff -u -r1.7 expr.c
--- expr.c 15 Jun 1999 01:18:34 -0000 1.7
+++ expr.c 28 Feb 2003 01:23:51 -0000
@@ -63,7 +63,7 @@
struct opinfo {
char name[4];
int len; /* name length */
- enum prec prec; /* precidence: lower is higher */
+ enum prec prec; /* precedence: lower is higher */
};
/* Tokens in this table must be ordered so the longest are first
Index: history.c
===================================================================
RCS file: /cvs/src/bin/ksh/history.c,v
retrieving revision 1.16
diff -u -r1.16 history.c
--- history.c 27 Nov 2002 20:53:25 -0000 1.16
+++ history.c 28 Feb 2003 01:23:51 -0000
@@ -67,7 +67,7 @@
static char **hist_get_oldest ARGS(());
static void histbackup ARGS((void));
-static char **current; /* current postition in history[] */
+static char **current; /* current position in history[] */
static int curpos; /* current index in history[] */
static char *hname; /* current name of history file */
static int hstarted; /* set after hist_init() called */
@@ -493,7 +493,7 @@
}
/*
- * This will become unecessary if hist_get is modified to allow
+ * This will become unnecessary if hist_get is modified to allow
* searching from positions other than the end, and in either
* direction.
*/
Index: jobs.c
===================================================================
RCS file: /cvs/src/bin/ksh/jobs.c,v
retrieving revision 1.17
diff -u -r1.17 jobs.c
--- jobs.c 9 Jun 2002 05:47:27 -0000 1.17
+++ jobs.c 28 Feb 2003 01:23:55 -0000
@@ -1077,7 +1077,7 @@
#endif /* JOB_SIGS */
}
-/* Return pid of last process in last asynchornous job */
+/* Return pid of last process in last asynchronous job */
pid_t
j_async()
{
@@ -1221,7 +1221,7 @@
* a fork/exec instead of an exec (the fork means
* the execed shell gets a different pid from its
* pgrp, so naturally it sets its pgrp and gets hosed
- * when it gets forgrounded by the parent shell, which
+ * when it gets foregrounded by the parent shell, which
* has restored the tty's pgrp to that of the su
* process).
*/
Index: lex.c
===================================================================
RCS file: /cvs/src/bin/ksh/lex.c,v
retrieving revision 1.16
diff -u -r1.16 lex.c
--- lex.c 9 Jun 2002 05:47:27 -0000 1.16
+++ lex.c 28 Feb 2003 01:23:57 -0000
@@ -730,7 +730,7 @@
/* copy word to unprefixed string ident */
for (sp = yylval.cp, dp = ident; dp < ident+IDENT && (c = *sp++) == CHAR; )
*dp++ = *sp++;
- /* Make sure the ident array stays '\0' paded */
+ /* Make sure the ident array stays '\0' padded */
memset(dp, 0, (ident+IDENT) - dp + 1);
if (c != EOS)
*ident = '\0'; /* word is not unquoted */
Index: lex.h
===================================================================
RCS file: /cvs/src/bin/ksh/lex.h,v
retrieving revision 1.6
diff -u -r1.6 lex.h
--- lex.h 19 Sep 2001 10:58:07 -0000 1.6
+++ lex.h 28 Feb 2003 01:23:57 -0000
@@ -37,7 +37,7 @@
#define SSTRING 3 /* string */
#define SWSTR 4 /* string without \n */
#define SWORDS 5 /* string[] */
-#define SWORDSEP 6 /* string[] seperator */
+#define SWORDSEP 6 /* string[] separator */
#define SALIAS 7 /* alias expansion */
#define SREREAD 8 /* read ahead to be re-scanned */
Index: main.c
===================================================================
RCS file: /cvs/src/bin/ksh/main.c,v
retrieving revision 1.21
diff -u -r1.21 main.c
--- main.c 9 Jun 2002 05:47:27 -0000 1.21
+++ main.c 28 Feb 2003 01:23:57 -0000
@@ -759,7 +759,7 @@
/* Don't clean up temporary files - parent will probably need them.
* Also, can't easily reclaim memory since variables, etc. could be
- * anywyere.
+ * anywhere.
*/
/* close all file descriptors hiding in savefd */
Index: misc.c
===================================================================
RCS file: /cvs/src/bin/ksh/misc.c,v
retrieving revision 1.12
diff -u -r1.12 misc.c
--- misc.c 19 Feb 2001 09:49:53 -0000 1.12
+++ misc.c 28 Feb 2003 01:23:58 -0000
@@ -542,7 +542,7 @@
* if it contains no pattern characters or if there is a syntax error.
* Syntax errors are:
* - [ with no closing ]
- * - imballenced $(...) expression
+ * - imbalanced $(...) expression
* - [...] and *(...) not nested (eg, [a$(b|]c), *(a[b|c]d))
*/
/*XXX
@@ -1026,11 +1026,11 @@
}
go->p = 0;
} else if (*o == ',') {
- /* argument is attatched to option character, even if null */
+ /* argument is attached to option character, even if null */
go->optarg = argv[go->optind - 1] + go->p;
go->p = 0;
} else if (*o == '#') {
- /* argument is optional and may be attatched or unattatched
+ /* argument is optional and may be attached or unattached
* but must start with a digit. optarg is set to 0 if the
* argument is missing.
*/
Index: path.c
===================================================================
RCS file: /cvs/src/bin/ksh/path.c,v
retrieving revision 1.7
diff -u -r1.7 path.c
--- path.c 1 Mar 2000 23:10:58 -0000 1.7
+++ path.c 28 Feb 2003 01:23:58 -0000
@@ -5,7 +5,7 @@
/*
* Contains a routine to search a : separated list of
- * paths (a la CDPATH) and make appropiate file names.
+ * paths (a la CDPATH) and make appropriate file names.
* Also contains a routine to simplify .'s and ..'s out of
* a path name.
*
Index: shf.c
===================================================================
RCS file: /cvs/src/bin/ksh/shf.c,v
retrieving revision 1.7
diff -u -r1.7 shf.c
--- shf.c 21 Nov 2000 23:12:04 -0000 1.7
+++ shf.c 28 Feb 2003 01:24:01 -0000
@@ -839,7 +839,7 @@
* this out...
*
* For shorts, we want sign extend for %d but not for %[oxu] - on 16 bit
- * machines it don't matter. Assmumes C compiler has converted shorts to
+ * machines it don't matter. Assumes C compiler has converted shorts to
* ints before pushing them.
*/
#define POP_INT(f, s, a) (((f) & FL_LONG) ? \
@@ -922,7 +922,7 @@
* This will accept flags/fields in any order - not
* just the order specified in printf(3), but this is
* the way _doprnt() seems to work (on bsd and sysV).
- * The only resriction is that the format character must
+ * The only restriction is that the format character must
* come last :-).
*/
flags = field = precision = 0;
@@ -1083,7 +1083,7 @@
char *p;
/*
- * This could proabably be done better,
+ * This could probably be done better,
* but it seems to work. Note that gcvt()
* is not used, as you cannot tell it to
* not strip the zeros.
@@ -1103,7 +1103,7 @@
* This is the same as
* expo = ceil(log10(fpnum))
* but doesn't need -lm. This is an
- * aproximation as expo is rounded up.
+ * approximation as expo is rounded up.
*/
(void) frexp(fpnum, &expo);
expo = my_ceil(expo / LOG2_10);
Index: trap.c
===================================================================
RCS file: /cvs/src/bin/ksh/trap.c,v
retrieving revision 1.12
diff -u -r1.12 trap.c
--- trap.c 18 Dec 2001 01:47:06 -0000 1.12
+++ trap.c 28 Feb 2003 01:24:04 -0000
@@ -48,7 +48,7 @@
sigtraps[SIGHUP].flags |= TF_FATAL;
sigtraps[SIGCHLD].flags |= TF_SHELL_USES;
- /* these are always caught so we can clean up any temproary files. */
+ /* these are always caught so we can clean up any temporary files. */
setsig(&sigtraps[SIGINT], trapsig, SS_RESTORE_ORIG);
setsig(&sigtraps[SIGQUIT], trapsig, SS_RESTORE_ORIG);
setsig(&sigtraps[SIGTERM], trapsig, SS_RESTORE_ORIG);
Index: var.c
===================================================================
RCS file: /cvs/src/bin/ksh/var.c,v
retrieving revision 1.11
diff -u -r1.11 var.c
--- var.c 21 Nov 2000 23:12:04 -0000 1.11
+++ var.c 28 Feb 2003 01:24:11 -0000
@@ -437,7 +437,7 @@
return vp->type;
}
s = vp->val.s + vp->type;
- if (s == NULL) /* redundent given initial test */
+ if (s == NULL) /* redundant given initial test */
s = null;
base = 10;
num = 0;
@@ -625,7 +625,7 @@
if (*val == '=')
tvar = str_nsave(var, val++ - var, ATEMP);
else {
- /* Importing from original envirnment: must have an = */
+ /* Importing from original environment: must have an = */
if (set & IMPORT)
return NULL;
tvar = (char *) var;
@@ -696,7 +696,7 @@
if (fake_assign) {
if (!setstr(t, s, KSH_RETURN_ERROR)) {
/* Somewhat arbitrary action here:
- * zap contents of varibale, but keep
+ * zap contents of variable, but keep
* the flag settings.
*/
ok = 0;
Visit your host, monkey.org