diff options
Diffstat (limited to 'Src')
| -rw-r--r-- | Src/builtin.c | 12 | ||||
| -rw-r--r-- | Src/compat.c | 4 | ||||
| -rw-r--r-- | Src/exec.c | 2 | ||||
| -rw-r--r-- | Src/glob.c | 4 | ||||
| -rw-r--r-- | Src/hashtable.c | 2 | ||||
| -rw-r--r-- | Src/init.c | 2 | ||||
| -rw-r--r-- | Src/lex.c | 2 | ||||
| -rw-r--r-- | Src/math.c | 2 | ||||
| -rw-r--r-- | Src/mem.c | 6 | ||||
| -rw-r--r-- | Src/module.c | 2 | ||||
| -rw-r--r-- | Src/params.c | 8 | ||||
| -rw-r--r-- | Src/parse.c | 4 | ||||
| -rw-r--r-- | Src/pattern.c | 10 | ||||
| -rw-r--r-- | Src/prompt.c | 2 | ||||
| -rw-r--r-- | Src/utils.c | 2 | ||||
| -rw-r--r-- | Src/zsh.h | 8 |
16 files changed, 36 insertions, 36 deletions
diff --git a/Src/builtin.c b/Src/builtin.c index 5297f5960..f31c38925 100644 --- a/Src/builtin.c +++ b/Src/builtin.c @@ -477,8 +477,8 @@ bin_set(char *nam, char **args, char *ops, int func) hadplus = 0, hadend = 0, sort = 0; char **x; - /* Obsolecent sh compatibility: set - is the same as set +xv * - * and set - args is the same as set +xv -- args */ + /* Obsolescent sh compatibility: set - is the same as set +xv * + * and set - args is the same as set +xv -- args */ if (*args && **args == '-' && !args[0][1]) { dosetopt(VERBOSE, 0, 0); dosetopt(XTRACE, 0, 0); @@ -699,7 +699,7 @@ static int chasinglinks; /* The main pwd changing function. The real work is done by other * * functions. cd_get_dest() does the initial argument processing; * * cd_do_chdir() actually changes directory, if possible; cd_new_pwd() * - * does the ancilliary processing associated with actually changing * + * does the ancillary processing associated with actually changing * * directory. */ /**/ @@ -1409,7 +1409,7 @@ fcgetcomm(char *s) return cmd; } -/* Perform old=new substituions. Uses the asgment structure from zsh.h, * +/* Perform old=new substitutions. Uses the asgment structure from zsh.h, * * which is essentially a linked list of string,replacement pairs. */ /**/ @@ -1643,7 +1643,7 @@ typeset_single(char *cname, char *pname, Param pm, int func, * If the original parameter was special and we're creating * a new one, we need to keep it special. * - * The -h (hide) flags prevents an existing special being made + * The -h (hide) flag prevents an existing special being made * local. It can be applied either to the special or in the * typeset/local statement for the local variable. */ @@ -1965,7 +1965,7 @@ bin_typeset(char *name, char **argv, char *ops, int func) off |= bit; roff = off; - /* Sanity checks on the options. Remove conficting options. */ + /* Sanity checks on the options. Remove conflicting options. */ if (on & PM_FFLOAT) { off |= PM_RIGHT_B | PM_LEFT | PM_RIGHT_Z | PM_UPPER | PM_ARRAY | PM_HASHED | PM_INTEGER | PM_EFLOAT; diff --git a/Src/compat.c b/Src/compat.c index 126d4bd4a..2999e63e4 100644 --- a/Src/compat.c +++ b/Src/compat.c @@ -1,5 +1,5 @@ /* - * compat.c - compatibiltiy routines for the deprived + * compat.c - compatibility routines for the deprived * * This file is part of zsh, the Z shell. * @@ -377,7 +377,7 @@ zgetcwd(void) } /* chdir with arbitrary long pathname. Returns 0 on success, 0 on normal * - * faliliure and -2 when chdir failed and the current directory is lost. */ + * failure and -2 when chdir failed and the current directory is lost. */ /**/ mod_export int diff --git a/Src/exec.c b/Src/exec.c index 494c1c260..9033e146d 100644 --- a/Src/exec.c +++ b/Src/exec.c @@ -2372,7 +2372,7 @@ execcmd(Estate state, int input, int output, int how, int last1) execute((Cmdnam) hn, cflags & BINF_DASH); } else { /* ( ... ) */ DPUTS(varspc, - "BUG: assigment before complex command"); + "BUG: assignment before complex command"); list_pipe = 0; if (subsh_close >= 0) zclose(subsh_close); diff --git a/Src/glob.c b/Src/glob.c index 8caa70ba5..ee23aa669 100644 --- a/Src/glob.c +++ b/Src/glob.c @@ -355,7 +355,7 @@ insert(char *s, int checked) while (!inserts || (news = dupstring(*inserts++))) { if (colonmod) { - /* Handle the remainder of the qualifer: e.g. (:r:s/foo/bar/). */ + /* Handle the remainder of the qualifier: e.g. (:r:s/foo/bar/). */ s = colonmod; modify(&news, &s); } @@ -685,7 +685,7 @@ parsecomplist(char *instr) /* parse single path component */ if (!(p1 = patcompile(instr, compflags|PAT_FILET, &instr))) return NULL; - /* then do the remaining path compoents */ + /* then do the remaining path components */ if (*instr == '/' || !*instr) { int ef = *instr == '/'; diff --git a/Src/hashtable.c b/Src/hashtable.c index 332f9479a..01abbf380 100644 --- a/Src/hashtable.c +++ b/Src/hashtable.c @@ -156,7 +156,7 @@ addhashnode(HashTable ht, char *nam, void *nodeptr) ht->freenode(oldnode); } -/* Add a node to a hash table, returning the old node on replacment. */ +/* Add a node to a hash table, returning the old node on replacement. */ /**/ HashNode diff --git a/Src/init.c b/Src/init.c index ac0885f10..1d2d8828f 100644 --- a/Src/init.c +++ b/Src/init.c @@ -805,7 +805,7 @@ setupvals(void) createshfunctable(); /* create hash table for shell functions */ createbuiltintable(); /* create hash table for builtin commands */ createnameddirtable(); /* create hash table for named directories */ - createparamtable(); /* create paramater hash table */ + createparamtable(); /* create parameter hash table */ condtab = NULL; wrappers = NULL; diff --git a/Src/lex.c b/Src/lex.c index cb76bc7ab..7c7d264f2 100644 --- a/Src/lex.c +++ b/Src/lex.c @@ -122,7 +122,7 @@ mod_export int parend; /**/ mod_export int nocomments; -/* text of puctuation tokens */ +/* text of punctuation tokens */ /**/ mod_export char *tokstrings[WHILE + 1] = { diff --git a/Src/math.c b/Src/math.c index 344670d6e..f970f3669 100644 --- a/Src/math.c +++ b/Src/math.c @@ -648,7 +648,7 @@ op(int what) (a.type != MN_UNSET || what != EQ)) { /* * Different types, so coerce to float. - * It may happen during an assigment that the LHS + * It may happen during an assignment that the LHS * variable is actually an integer, but there's still * no harm in doing the arithmetic in floating point; * the assignment will do the correct conversion. diff --git a/Src/mem.c b/Src/mem.c index 9f88dddaa..67b4624d9 100644 --- a/Src/mem.c +++ b/Src/mem.c @@ -693,7 +693,7 @@ static char *m_high, *m_low; size of the small blocks held in a memory block, given a pointer to the header of it. M_SBLEN() gives the size of a memory block that can hold an array of small blocks, given the size of these small blocks. M_BSLEN() - caculates the size of the small blocks held in a memory block, given the + calculates the size of the small blocks held in a memory block, given the length of that block (including the header of the memory block. M_NSMALL is the number of possible block sizes that small blocks should be used for. */ @@ -1286,7 +1286,7 @@ bin_mem(char *name, char **argv, char *ops, int func) printf("\nThe list of memory blocks. For each block the following\n"); printf("information is shown:\n\n"); printf("num\tthe number of this block\n"); - printf("tnum\tlike num but counted separatedly for used and free\n"); + printf("tnum\tlike num but counted separately for used and free\n"); printf("\tblocks\n"); printf("addr\tthe address of this block\n"); printf("len\tthe length of the block\n"); @@ -1295,7 +1295,7 @@ bin_mem(char *name, char **argv, char *ops, int func) printf("\t free\tthis block is free\n"); printf("\t small\tthis block is used for an array of small blocks\n"); printf("cum\tthe accumulated sizes of the blocks, counted\n"); - printf("\tseparatedly for used and free blocks\n"); + printf("\tseparately for used and free blocks\n"); printf("\nFor blocks holding small blocks the number of free\n"); printf("blocks, the number of used blocks and the size of the\n"); printf("blocks is shown. For otherwise used blocks the first few\n"); diff --git a/Src/module.c b/Src/module.c index f8b3f2758..9cecac826 100644 --- a/Src/module.c +++ b/Src/module.c @@ -903,7 +903,7 @@ add_dep(const char *name, char *from) * If we were passed an alias, we must resolve it to a final * module name (and maybe add the corresponding struct), since otherwise * we would need to check all modules to see if they happen - * to be aliased to the same thing to implement depencies properly. + * to be aliased to the same thing to implement dependencies properly. * * This should mean that an attempt to add an alias which would * have the same name as a module which has dependencies is correctly diff --git a/Src/params.c b/Src/params.c index 4d7fcdc4e..72b0f2991 100644 --- a/Src/params.c +++ b/Src/params.c @@ -225,7 +225,7 @@ IPDEF9F("@", &pparams, NULL, PM_ARRAY|PM_SPECIAL|PM_DONTIMPORT|PM_READONLY), {NULL, NULL}, #define IPDEF10(A,B,C) {NULL,A,PM_ARRAY|PM_SPECIAL,BR(NULL),SFN(C),GFN(B),stdunsetfn,10,NULL,NULL,NULL,0} -/* The following parameters are not avaible in sh/ksh compatibility * +/* The following parameters are not available in sh/ksh compatibility * * mode. All of these have sh compatible equivalents. */ IPDEF1("ARGC", poundgetfn, nullintsetfn, PM_READONLY), IPDEF2("HISTCHARS", histcharsgetfn, histcharssetfn, PM_DONTIMPORT), @@ -678,7 +678,7 @@ createparam(char *name, int flags) paramtab->getnode(paramtab, name)); DPUTS(oldpm && oldpm->level > locallevel, - "BUG: old local parameter not deleteed"); + "BUG: old local parameter not deleted"); if (oldpm && (oldpm->level == locallevel || !(flags & PM_LOCAL))) { if (!(oldpm->flags & PM_UNSET) || (oldpm->flags & PM_SPECIAL)) { oldpm->flags &= ~PM_UNSET; @@ -1205,7 +1205,7 @@ getindex(char **pptr, Value v, int dq) *s++ = '['; s = parse_subscript(s, dq); /* Error handled after untokenizing */ - /* Now we untokenize everthing except INULL() markers so we can check * + /* Now we untokenize everything except INULL() markers so we can check * * for the '*' and '@' special subscripts. The INULL()s are removed * * in getarg() after we know whether we're doing reverse indexing. */ for (tbrack = *pptr + 1; *tbrack && tbrack != s; tbrack++) { @@ -2269,7 +2269,7 @@ unsetparam_pm(Param pm, int altflag, int exp) /* * Re-export the old value which we removed in typeset_single(). * I don't think we need to test for ALL_EXPORT here, since if - * it was used to export the parameter originally the parmeter + * it was used to export the parameter originally the parameter * should still have the PM_EXPORTED flag. */ export_param(oldpm); diff --git a/Src/parse.c b/Src/parse.c index e44129608..4b105d868 100644 --- a/Src/parse.c +++ b/Src/parse.c @@ -93,7 +93,7 @@ struct heredocs *hdocs; * * WC_LIST * - data contains type (sync, ...) - * - follwed by code for this list + * - followed by code for this list * - if not (type & Z_END), followed by next WC_LIST * * WC_SUBLIST @@ -139,7 +139,7 @@ struct heredocs *hdocs; * - followed by offset to first string * - followed by length of string table * - followed by number of patterns for body - * - follwoed by codes for body + * - followed by codes for body * - followed by strings for body * * WC_FOR diff --git a/Src/pattern.c b/Src/pattern.c index cf78a1138..33c8858a2 100644 --- a/Src/pattern.c +++ b/Src/pattern.c @@ -70,7 +70,7 @@ typedef union upat *Upat; #include "pattern.pro" -/* Number of active parenthesised expressions allowed in backreferencing */ +/* Number of active parenthesized expressions allowed in backreferencing */ #define NSUBEXP 9 /* definition number opnd? meaning */ @@ -119,7 +119,7 @@ typedef union upat *Upat; * * P_ANY, P_ANYOF: the operand is a null terminated * string. Normal characters match as expected. Characters - * in the range Meta+PP_ALPHA..Meta+PP_UNKNWN do the approprate + * in the range Meta+PP_ALPHA..Meta+PP_UNKNWN do the appropriate * Posix range tests. This relies on imeta returning true for these * characters. We treat unknown POSIX ranges as never matching. * PP_RANGE means the next two (possibly metafied) characters form @@ -448,7 +448,7 @@ patcompile(char *exp, int inflags, char **endexp) } /* - * Main body or parenthesised subexpression in pattern + * Main body or parenthesized subexpression in pattern * Parenthesis (and any ksh_glob gubbins) will have been removed. */ @@ -830,7 +830,7 @@ patcomppiece(int *flagp) for (;;) { /* * Check if we have a string. First, we need to make sure - * the string doesn't introduce a ksh-like parenthesised expression. + * the string doesn't introduce a ksh-like parenthesized expression. */ kshchar = '\0'; if (isset(KSHGLOB) && *patparse && patparse[1] == Inpar) { @@ -1972,7 +1972,7 @@ patmatch(Upat prog) * This is just simple cases, matching one character. * With approximations, we still handle * this way, since * no approximation is ever necessary, but other closures - * are handled by the more compicated branching method + * are handled by the more complicated branching method */ op = P_OP(scan); /* Note that no counts possibly metafied characters */ diff --git a/Src/prompt.c b/Src/prompt.c index 06dd2e5a9..762daf2c1 100644 --- a/Src/prompt.c +++ b/Src/prompt.c @@ -75,7 +75,7 @@ static char *bp; static char *bufline; -/* bp1 is an auxilliary pointer into the buffer, which when non-NULL is * +/* bp1 is an auxiliary pointer into the buffer, which when non-NULL is * * moved whenever the buffer is reallocated. It is used when data is * * being temporarily held in the buffer. */ diff --git a/Src/utils.c b/Src/utils.c index 24d336b7a..e5050ac79 100644 --- a/Src/utils.c +++ b/Src/utils.c @@ -2553,7 +2553,7 @@ getbaudrate(struct ttyinfo *shttyinfo) /* Escape tokens and null characters. Buf is the string which should be * * escaped. len is the length of the string. If len is -1, buf should be * - * null terminated. If len is non-negative and the third paramerer is not * + * null terminated. If len is non-negative and the third parameter is not * * META_DUP, buf should point to an at least len+1 long memory area. The * * return value points to the quoted string. If the given string does not * * contain any special character which should be quoted and the third * diff --git a/Src/zsh.h b/Src/zsh.h index 1697e26a0..881dd05b4 100644 --- a/Src/zsh.h +++ b/Src/zsh.h @@ -476,7 +476,7 @@ struct value { #define MAX_ARRLEN 262144 /********************************************/ -/* Defintions for word code */ +/* Definitions for word code */ /********************************************/ typedef unsigned int wordcode; @@ -680,7 +680,7 @@ struct eccstr { #define WCB_AUTOFN() wc_bld(WC_AUTOFN, 0) /********************************************/ -/* Defintions for job table and job control */ +/* Definitions for job table and job control */ /********************************************/ #ifdef NEED_LINUX_TASKS_H @@ -1181,7 +1181,7 @@ struct param { * could a lot of other things. */ -#define SUB_END 0x0001 /* match end instead of begining, % or %% */ +#define SUB_END 0x0001 /* match end instead of beginning, % or %% */ #define SUB_LONG 0x0002 /* % or # doubled, get longest match */ #define SUB_SUBSTR 0x0004 /* match a substring */ #define SUB_MATCH 0x0008 /* include the matched portion */ @@ -1486,7 +1486,7 @@ enum { #define islogin (isset(LOGINSHELL)) /***********************************************/ -/* Defintions for terminal and display control */ +/* Definitions for terminal and display control */ /***********************************************/ /* tty state structure */ |