summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bin/ksh/BUG-REPORTS8
-rw-r--r--bin/ksh/NEWS4
-rw-r--r--bin/ksh/c_ksh.c6
-rw-r--r--bin/ksh/c_test.h4
-rw-r--r--bin/ksh/c_ulimit.c4
-rw-r--r--bin/ksh/config.h4
-rw-r--r--bin/ksh/emacs.c18
-rw-r--r--bin/ksh/exec.c4
-rw-r--r--bin/ksh/expr.c8
-rw-r--r--bin/ksh/jobs.c8
-rw-r--r--bin/ksh/misc.c4
-rw-r--r--bin/ksh/path.c4
-rw-r--r--bin/ksh/sh.h10
-rw-r--r--bin/ksh/syn.c4
-rw-r--r--bin/ksh/tree.h4
15 files changed, 47 insertions, 47 deletions
diff --git a/bin/ksh/BUG-REPORTS b/bin/ksh/BUG-REPORTS
index dfb126d7646..3e27730c642 100644
--- a/bin/ksh/BUG-REPORTS
+++ b/bin/ksh/BUG-REPORTS
@@ -1,4 +1,4 @@
-$OpenBSD: BUG-REPORTS,v 1.14 2003/02/28 09:45:09 jmc Exp $
+$OpenBSD: BUG-REPORTS,v 1.15 2003/10/22 07:40:38 jmc Exp $
List of reported problems (problems reported and fixed before 5.0.4 not
included). Unresolved problems (may or may not still exist) marked by *,
@@ -182,7 +182,7 @@ x pdksh 5.0.5, - (reported by Sean Hogan): repeated history commands were being
x pdksh 5.0.5, -: wait with no arguments would hang forever.
[fixed in 5.0.6 - only wait for running jobs in waitfor()]
-x pdksh 5.0.2, HP-UX 9.01 (reported by Sean Hogan): scipts occasionally get
+x pdksh 5.0.2, HP-UX 9.01 (reported by Sean Hogan): scripts occasionally get
stopped with SIGTTIN
[from Mail.1:68]:
I noticed another small problem today, which is that occasionally
@@ -1201,7 +1201,7 @@ x pdksh 5.2.12, - (reported by Gabor Zahemszky): MAILCHECK and MAIL
x pdksh 5.2.12, - (reported by Gabor Zahemszky): memory gets badly fragmented
when reversing a (large) file using a simple while read loop and variable
- contatenation.
+ concatenation.
[see Mail.XXX]
[fixed in 5.2.13: alloc.c changed to allow malloc() to deal with large
blocks.]
@@ -1332,7 +1332,7 @@ x pdksh 5.2.13, (reported by Mark Funkenhauser): eval "$(false)" does not
result in $? being set to 1 (is 0).
[fixed in 5.2.14: c_sh.c(c_eval): set exstat to subst_exstat before shell()]
-x pdksh 5.2.13, (reported with fix by Kevin Schoedel): word boardaries in
+x pdksh 5.2.13, (reported with fix by Kevin Schoedel): word boundaries in
file completion are only spaces - at&t ksh uses ()<>&| and spaces.
[fixed in 5.2.14: edit.c(IS_WORDC): changed macro to be LEX1 + quotes]
diff --git a/bin/ksh/NEWS b/bin/ksh/NEWS
index 51bc8ca2bd3..220be641fd8 100644
--- a/bin/ksh/NEWS
+++ b/bin/ksh/NEWS
@@ -57,7 +57,7 @@ Version 5.2.13
* editing: completion after "cmd " now completes files (was command).
-$OpenBSD: NEWS,v 1.12 2003/02/28 09:45:09 jmc Exp $
+$OpenBSD: NEWS,v 1.13 2003/10/22 07:40:38 jmc Exp $
Version 5.2.12
@@ -438,7 +438,7 @@ Version 5.0.10
* configuration: look for clock_t in sys/times.h.
* configuration: use _SIGMAX, if available, for # of signals.
* SIGHUP now causes builtin read command to exit.
- * wait builtin now returns whenever a traped signal occurs as per POSIX.
+ * wait builtin now returns whenever a trapped signal occurs as per POSIX.
* v command now works in vi; anchored searches now work in vi mode (/^ptrn);
multi-line commands displayed correctly by history.
diff --git a/bin/ksh/c_ksh.c b/bin/ksh/c_ksh.c
index 818b3c2686f..d062ef5dcc4 100644
--- a/bin/ksh/c_ksh.c
+++ b/bin/ksh/c_ksh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: c_ksh.c,v 1.16 2003/02/28 09:45:09 jmc Exp $ */
+/* $OpenBSD: c_ksh.c,v 1.17 2003/10/22 07:40:38 jmc Exp $ */
/*
* built-in Korn commands: c_*
@@ -75,7 +75,7 @@ c_cd(wp)
bi_errorf("don't know current directory");
return 1;
}
- /* substitue arg1 for arg2 in current path.
+ /* substitute arg1 for arg2 in current path.
* if the first substitution fails because the cd fails
* we could try to find another substitution. For now
* we don't
@@ -652,7 +652,7 @@ c_typeset(wp)
flag = LCASEV;
break;
case 'p': /* posix export/readonly -p flag.
- * typset -p is the same as typeset (in pdksh);
+ * typeset -p is the same as typeset (in pdksh);
* here for compatibility with ksh93.
*/
pflag = 1;
diff --git a/bin/ksh/c_test.h b/bin/ksh/c_test.h
index 0caf40b3dfc..dd0a43e2946 100644
--- a/bin/ksh/c_test.h
+++ b/bin/ksh/c_test.h
@@ -1,7 +1,7 @@
-/* $OpenBSD: c_test.h,v 1.1 1996/08/14 06:19:10 downsj Exp $ */
+/* $OpenBSD: c_test.h,v 1.2 2003/10/22 07:40:38 jmc Exp $ */
/* Various types of operations. Keeping things grouped nicely
- * (unary,binary) makes switch() statements more efficeint.
+ * (unary,binary) makes switch() statements more efficient.
*/
enum Test_op {
TO_NONOP = 0, /* non-operator */
diff --git a/bin/ksh/c_ulimit.c b/bin/ksh/c_ulimit.c
index a43a7f06660..17c8162b3e2 100644
--- a/bin/ksh/c_ulimit.c
+++ b/bin/ksh/c_ulimit.c
@@ -1,10 +1,10 @@
-/* $OpenBSD: c_ulimit.c,v 1.9 2002/06/09 05:47:27 todd Exp $ */
+/* $OpenBSD: c_ulimit.c,v 1.10 2003/10/22 07:40:38 jmc Exp $ */
/*
ulimit -- handle "ulimit" builtin
Reworked to use getrusage() and ulimit() at once (as needed on
- some schizophenic systems, eg, HP-UX 9.01), made argument parsing
+ some schizophrenic systems, eg, HP-UX 9.01), made argument parsing
conform to at&t ksh, added autoconf support. Michael Rendell, May, '94
Eric Gisin, September 1988
diff --git a/bin/ksh/config.h b/bin/ksh/config.h
index 6aa3afb698e..57a129bcc6c 100644
--- a/bin/ksh/config.h
+++ b/bin/ksh/config.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: config.h,v 1.8 2003/05/16 18:49:46 jsyn Exp $ */
+/* $OpenBSD: config.h,v 1.9 2003/10/22 07:40:38 jmc Exp $ */
/* config.h. NOT generated automatically. */
@@ -76,7 +76,7 @@
/* Define if the closedir function returns void instead of int. */
/* #undef VOID_CLOSEDIR */
-/* Define if your kernal doesn't handle scripts starting with #! */
+/* Define if your kernel doesn't handle scripts starting with #! */
/* #undef SHARPBANG */
/* Define if dup2() preserves the close-on-exec flag (ultrix does this) */
diff --git a/bin/ksh/emacs.c b/bin/ksh/emacs.c
index 9f042779465..afa8a65975f 100644
--- a/bin/ksh/emacs.c
+++ b/bin/ksh/emacs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: emacs.c,v 1.27 2003/09/01 15:47:40 naddy Exp $ */
+/* $OpenBSD: emacs.c,v 1.28 2003/10/22 07:40:38 jmc Exp $ */
/*
* Emacs-like command line editing and history
@@ -212,7 +212,7 @@ static const struct x_ftab x_ftab[] = {
{ x_yank, "yank", 0 },
{ x_comp_list, "complete-list", 0 },
{ x_expand, "expand-file", 0 },
- { x_fold_capitialize, "capitalize-word", XF_ARG },
+ { x_fold_capitalize, "capitalize-word", XF_ARG },
{ x_fold_lower, "downcase-word", XF_ARG },
{ x_fold_upper, "upcase-word", XF_ARG },
{ x_set_arg, "set-arg", XF_NOBIND },
@@ -307,8 +307,8 @@ static struct x_defbindings const x_defbindings[] = {
{ XFUNC_fold_upper, 1, 'u' },
{ XFUNC_fold_lower, 1, 'L' },
{ XFUNC_fold_lower, 1, 'l' },
- { XFUNC_fold_capitialize, 1, 'C' },
- { XFUNC_fold_capitialize, 1, 'c' },
+ { XFUNC_fold_capitalize, 1, 'C' },
+ { XFUNC_fold_capitalize, 1, 'c' },
#ifdef OS2
{ XFUNC_meta3, 0, 0xE0 },
{ XFUNC_mv_back, 3, 'K' },
@@ -1135,7 +1135,7 @@ x_transpose(c)
* gnu emacs: abCd acbD abcd_ abdc_
* Pdksh currently goes with GNU behavior since I believe this is the
* most common version of emacs, unless in gmacs mode, in which case
- * it does the at&t ksh gmacs mdoe.
+ * it does the at&t ksh gmacs mode.
* This should really be broken up into 3 functions so users can bind
* to the one they want.
*/
@@ -2103,7 +2103,7 @@ x_fold_lower(c)
/* Lowercase N(1) words */
static int
-x_fold_capitialize(c)
+x_fold_capitalize(c)
int c;
{
return x_fold_case('C');
@@ -2132,7 +2132,7 @@ x_fold_case(c)
}
while (x_arg--) {
/*
- * fisrt skip over any white-space
+ * first skip over any white-space
*/
while (cp != xep && is_mfs(*cp))
cp++;
@@ -2144,7 +2144,7 @@ x_fold_case(c)
if (c == 'L') { /* lowercase */
if (isupper(*cp))
*cp = tolower(*cp);
- } else { /* uppercase, capitialize */
+ } else { /* uppercase, capitalize */
if (islower(*cp))
*cp = toupper(*cp);
}
@@ -2157,7 +2157,7 @@ x_fold_case(c)
if (c == 'U') { /* uppercase */
if (islower(*cp))
*cp = toupper(*cp);
- } else { /* lowercase, capitialize */
+ } else { /* lowercase, capitalize */
if (isupper(*cp))
*cp = tolower(*cp);
}
diff --git a/bin/ksh/exec.c b/bin/ksh/exec.c
index de722b326a9..6a5e0447d1c 100644
--- a/bin/ksh/exec.c
+++ b/bin/ksh/exec.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: exec.c,v 1.27 2003/02/28 09:45:09 jmc Exp $ */
+/* $OpenBSD: exec.c,v 1.28 2003/10/22 07:40:38 jmc Exp $ */
/*
* execute command tree
@@ -461,7 +461,7 @@ comexec(t, tp, ap, flags)
#ifdef KSH
/* snag the last argument for $_ XXX not the same as at&t ksh,
* which only seems to set $_ after a newline (but not in
- * functions/dot scripts, but in interactive and scipt) -
+ * functions/dot scripts, but in interactive and script) -
* perhaps save last arg here and set it in shell()?.
*/
if (!Flag(FSH) && Flag(FTALKING) && *(lastp = ap)) {
diff --git a/bin/ksh/expr.c b/bin/ksh/expr.c
index 3ef1fc64130..e61372fb2e1 100644
--- a/bin/ksh/expr.c
+++ b/bin/ksh/expr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: expr.c,v 1.8 2003/02/28 09:45:09 jmc Exp $ */
+/* $OpenBSD: expr.c,v 1.9 2003/10/22 07:40:38 jmc Exp $ */
/*
* Korn expression evaluation
@@ -140,7 +140,7 @@ static struct tbl *tempvar ARGS((void));
static struct tbl *intvar ARGS((Expr_state *es, struct tbl *vp));
/*
- * parse and evalute expression
+ * parse and evaluate expression
*/
int
evaluate(expr, rval, error_ok)
@@ -159,7 +159,7 @@ evaluate(expr, rval, error_ok)
}
/*
- * parse and evalute expression, storing result in vp.
+ * parse and evaluate expression, storing result in vp.
*/
int
v_evaluate(vp, expr, error_ok)
@@ -208,7 +208,7 @@ v_evaluate(vp, expr, error_ok)
if (vp->flag & INTEGER)
setint_v(vp, v);
else
- /* can fail if readony */
+ /* can fail if readonly */
setstr(vp, str_val(v), error_ok);
quitenv();
diff --git a/bin/ksh/jobs.c b/bin/ksh/jobs.c
index 20136746373..d64042415e7 100644
--- a/bin/ksh/jobs.c
+++ b/bin/ksh/jobs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: jobs.c,v 1.19 2003/03/13 09:03:07 deraadt Exp $ */
+/* $OpenBSD: jobs.c,v 1.20 2003/10/22 07:40:38 jmc Exp $ */
/*
* Process and job control
@@ -15,7 +15,7 @@
*
* Notes regarding the copious ifdefs:
* - JOB_SIGS is independent of JOBS - it is defined if there are modern
- * signal and wait routines available. This is prefered, even when
+ * signal and wait routines available. This is preferred, even when
* JOBS is not defined, since the shell will not otherwise notice when
* background jobs die until the shell waits for a foreground process
* to die.
@@ -123,7 +123,7 @@ struct proc {
#define JF_CHANGED 0x040 /* process has changed state */
#define JF_KNOWN 0x080 /* $! referenced */
#define JF_ZOMBIE 0x100 /* known, unwaited process */
-#define JF_REMOVE 0x200 /* flaged for removal (j_jobs()/j_noityf()) */
+#define JF_REMOVE 0x200 /* flagged for removal (j_jobs()/j_noityf()) */
#define JF_USETTYMODE 0x400 /* tty mode saved if process exits normally */
#define JF_SAVEDTTYPGRP 0x800 /* j->saved_ttypgrp is valid */
@@ -1435,7 +1435,7 @@ check_job(j)
*/
if (j->state == PEXITED || j->state == PSIGNALLED) {
/* No need to keep co-process input any more
- * (at leasst, this is what ksh93d thinks)
+ * (at least, this is what ksh93d thinks)
*/
if (coproc.job == j) {
coproc.job = (void *) 0;
diff --git a/bin/ksh/misc.c b/bin/ksh/misc.c
index 30347e673c5..045f2867e9c 100644
--- a/bin/ksh/misc.c
+++ b/bin/ksh/misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.19 2003/09/01 15:47:40 naddy Exp $ */
+/* $OpenBSD: misc.c,v 1.20 2003/10/22 07:40:38 jmc Exp $ */
/*
* Miscellaneous functions
@@ -183,7 +183,7 @@ const struct option options[] = {
#endif
{ "xtrace", 'x', OF_ANY },
/* Anonymous flags: used internally by shell only
- * (not visable to user)
+ * (not visible to user)
*/
{ (char *) 0, 0, OF_INTERNAL }, /* FTALKING_I */
};
diff --git a/bin/ksh/path.c b/bin/ksh/path.c
index 645a2ccc2d1..c955f89615e 100644
--- a/bin/ksh/path.c
+++ b/bin/ksh/path.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: path.c,v 1.8 2003/02/28 09:45:09 jmc Exp $ */
+/* $OpenBSD: path.c,v 1.9 2003/10/22 07:40:38 jmc Exp $ */
#include "sh.h"
#include "ksh_stat.h"
@@ -29,7 +29,7 @@ static char *do_phys_path ARGS((XString *xsp, char *xp, const char *path));
* - cdpathp is set to the start of the next element in cdpathp (or NULL
* if there are no more elements.
* The return value indicates whether a non-null element from cdpathp
- * was appened to result.
+ * was appended to result.
*/
int
make_path(cwd, file, cdpathp, xsp, phys_pathp)
diff --git a/bin/ksh/sh.h b/bin/ksh/sh.h
index 48ce14570ea..fd595607768 100644
--- a/bin/ksh/sh.h
+++ b/bin/ksh/sh.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sh.h,v 1.14 2003/09/01 15:47:40 naddy Exp $ */
+/* $OpenBSD: sh.h,v 1.15 2003/10/22 07:40:38 jmc Exp $ */
/*
* Public Domain Bourne/Korn shell
@@ -482,7 +482,7 @@ enum sh_flag {
#endif
FIGNOREEOF, /* eof does not exit */
FTALKING, /* -i: interactive */
- FKEYWORD, /* -k: name=value anywere */
+ FKEYWORD, /* -k: name=value anywhere */
FLOGIN, /* -l: a login shell */
FMARKDIRS, /* mark dirs with / in file name completion */
FMONITOR, /* -m: job control monitoring */
@@ -499,7 +499,7 @@ enum sh_flag {
FPOSIX, /* -o posix: be posixly correct */
FPRIVILEGED, /* -p: use suid_profile */
FRESTRICTED, /* -r: restricted shell */
- FSH, /* -o sh: favor sh behavour */
+ FSH, /* -o sh: favor sh behaviour */
FSTDIN, /* -s: (invocation) parse stdin */
FTRACKALL, /* -h: create tracked aliases for all commands */
FVERBOSE, /* -v: echo input */
@@ -689,11 +689,11 @@ EXTERN char *current_wd;
EXTERN int current_wd_size;
#ifdef EDIT
-/* Minimium required space to work with on a line - if the prompt leaves less
+/* Minimum required space to work with on a line - if the prompt leaves less
* space than this on a line, the prompt is truncated.
*/
# define MIN_EDIT_SPACE 7
-/* Minimium allowed value for x_cols: 2 for prompt, 3 for " < " at end of line
+/* Minimum allowed value for x_cols: 2 for prompt, 3 for " < " at end of line
*/
# define MIN_COLS (2 + MIN_EDIT_SPACE + 3)
EXTERN int x_cols I__(80); /* tty columns */
diff --git a/bin/ksh/syn.c b/bin/ksh/syn.c
index 5dee5d41b3a..5cb68318c5c 100644
--- a/bin/ksh/syn.c
+++ b/bin/ksh/syn.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: syn.c,v 1.13 2002/06/09 05:47:27 todd Exp $ */
+/* $OpenBSD: syn.c,v 1.14 2003/10/22 07:40:38 jmc Exp $ */
/*
* shell parser (C version)
@@ -571,7 +571,7 @@ function_body(name, ksh_func)
/*
* Probably something like foo() followed by eof or ;.
* This is accepted by sh and ksh88.
- * To make "typset -f foo" work reliably (so its output can
+ * To make "typeset -f foo" work reliably (so its output can
* be used as input), we pretend there is a colon here.
*/
t->left = newtp(TCOM);
diff --git a/bin/ksh/tree.h b/bin/ksh/tree.h
index f6c13f156b7..3d15955fc2a 100644
--- a/bin/ksh/tree.h
+++ b/bin/ksh/tree.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: tree.h,v 1.7 1999/07/14 13:37:24 millert Exp $ */
+/* $OpenBSD: tree.h,v 1.8 2003/10/22 07:40:38 jmc Exp $ */
/*
* command trees for compile/execute
@@ -109,7 +109,7 @@ struct ioword {
#define XCCLOSE BIT(7) /* exchild: close close_fd in child */
#define XERROK BIT(8) /* non-zero exit ok (for set -e) */
#define XCOPROC BIT(9) /* starting a co-process */
-#define XTIME BIT(10) /* timeing TCOM command */
+#define XTIME BIT(10) /* timing TCOM command */
#define XINTACT BIT(11) /* OS2: proc started from interactive session */
/*