diff options
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/ash.c | 26 | ||||
| -rw-r--r-- | shell/cmdedit.c | 8 | ||||
| -rw-r--r-- | shell/hush.c | 2 | ||||
| -rw-r--r-- | shell/msh.c | 2 |
4 files changed, 19 insertions, 19 deletions
diff --git a/shell/ash.c b/shell/ash.c index 977ae4647..e2205efd2 100644 --- a/shell/ash.c +++ b/shell/ash.c | |||
| @@ -174,7 +174,7 @@ static const char not_found_msg[] = "%s: not found"; | |||
| 174 | * We enclose jmp_buf in a structure so that we can declare pointers to | 174 | * We enclose jmp_buf in a structure so that we can declare pointers to |
| 175 | * jump locations. The global variable handler contains the location to | 175 | * jump locations. The global variable handler contains the location to |
| 176 | * jump to when an exception occurs, and the global variable exception | 176 | * jump to when an exception occurs, and the global variable exception |
| 177 | * contains a code identifying the exeception. To implement nested | 177 | * contains a code identifying the exception. To implement nested |
| 178 | * exception handlers, the user should save the value of handler on entry | 178 | * exception handlers, the user should save the value of handler on entry |
| 179 | * to an inner scope, set handler to point to a jmploc structure for the | 179 | * to an inner scope, set handler to point to a jmploc structure for the |
| 180 | * inner scope, and restore handler on exit from the scope. | 180 | * inner scope, and restore handler on exit from the scope. |
| @@ -2702,7 +2702,7 @@ static const struct builtincmd bltin = { | |||
| 2702 | */ | 2702 | */ |
| 2703 | 2703 | ||
| 2704 | /* | 2704 | /* |
| 2705 | * The eval commmand. | 2705 | * The eval command. |
| 2706 | */ | 2706 | */ |
| 2707 | 2707 | ||
| 2708 | static int | 2708 | static int |
| @@ -7228,7 +7228,7 @@ forkshell(struct job *jp, union node *n, int mode) | |||
| 7228 | * the interactive program catches interrupts, the user doesn't want | 7228 | * the interactive program catches interrupts, the user doesn't want |
| 7229 | * these interrupts to also abort the loop. The approach we take here | 7229 | * these interrupts to also abort the loop. The approach we take here |
| 7230 | * is to have the shell ignore interrupt signals while waiting for a | 7230 | * is to have the shell ignore interrupt signals while waiting for a |
| 7231 | * forground process to terminate, and then send itself an interrupt | 7231 | * foreground process to terminate, and then send itself an interrupt |
| 7232 | * signal if the child process was terminated by an interrupt signal. | 7232 | * signal if the child process was terminated by an interrupt signal. |
| 7233 | * Unfortunately, some programs want to do a bit of cleanup and then | 7233 | * Unfortunately, some programs want to do a bit of cleanup and then |
| 7234 | * exit on interrupt; unless these processes terminate themselves by | 7234 | * exit on interrupt; unless these processes terminate themselves by |
| @@ -11932,7 +11932,7 @@ static int vpcmp(const void *, const void *); | |||
| 11932 | static struct var **findvar(struct var **, const char *); | 11932 | static struct var **findvar(struct var **, const char *); |
| 11933 | 11933 | ||
| 11934 | /* | 11934 | /* |
| 11935 | * Initialize the varable symbol tables and import the environment | 11935 | * Initialize the variable symbol tables and import the environment |
| 11936 | */ | 11936 | */ |
| 11937 | 11937 | ||
| 11938 | 11938 | ||
| @@ -12539,7 +12539,7 @@ letcmd(int argc, char **argv) | |||
| 12539 | /* $NetBSD: miscbltin.c,v 1.31 2002/11/24 22:35:41 christos Exp $ */ | 12539 | /* $NetBSD: miscbltin.c,v 1.31 2002/11/24 22:35:41 christos Exp $ */ |
| 12540 | 12540 | ||
| 12541 | /* | 12541 | /* |
| 12542 | * Miscelaneous builtins. | 12542 | * Miscellaneous builtins. |
| 12543 | */ | 12543 | */ |
| 12544 | 12544 | ||
| 12545 | #undef rflag | 12545 | #undef rflag |
| @@ -12911,14 +12911,14 @@ ulimitcmd(int argc, char **argv) | |||
| 12911 | 12911 | ||
| 12912 | /* This is my infix parser/evaluator. It is optimized for size, intended | 12912 | /* This is my infix parser/evaluator. It is optimized for size, intended |
| 12913 | * as a replacement for yacc-based parsers. However, it may well be faster | 12913 | * as a replacement for yacc-based parsers. However, it may well be faster |
| 12914 | * than a comparable parser writen in yacc. The supported operators are | 12914 | * than a comparable parser written in yacc. The supported operators are |
| 12915 | * listed in #defines below. Parens, order of operations, and error handling | 12915 | * listed in #defines below. Parens, order of operations, and error handling |
| 12916 | * are supported. This code is threadsafe. The exact expression format should | 12916 | * are supported. This code is thread safe. The exact expression format should |
| 12917 | * be that which POSIX specifies for shells. */ | 12917 | * be that which POSIX specifies for shells. */ |
| 12918 | 12918 | ||
| 12919 | /* The code uses a simple two-stack algorithm. See | 12919 | /* The code uses a simple two-stack algorithm. See |
| 12920 | * http://www.onthenet.com.au/~grahamis/int2008/week02/lect02.html | 12920 | * http://www.onthenet.com.au/~grahamis/int2008/week02/lect02.html |
| 12921 | * for a detailed explaination of the infix-to-postfix algorithm on which | 12921 | * for a detailed explanation of the infix-to-postfix algorithm on which |
| 12922 | * this is based (this code differs in that it applies operators immediately | 12922 | * this is based (this code differs in that it applies operators immediately |
| 12923 | * to the stack instead of adding them to a queue to end up with an | 12923 | * to the stack instead of adding them to a queue to end up with an |
| 12924 | * expression). */ | 12924 | * expression). */ |
| @@ -12948,7 +12948,7 @@ ulimitcmd(int argc, char **argv) | |||
| 12948 | * parens and then checking that all binary ops and right parens are | 12948 | * parens and then checking that all binary ops and right parens are |
| 12949 | * preceded by a valid expression (NUM_TOKEN). | 12949 | * preceded by a valid expression (NUM_TOKEN). |
| 12950 | * | 12950 | * |
| 12951 | * Note: It may be desireable to replace Aaron's test for whitespace with | 12951 | * Note: It may be desirable to replace Aaron's test for whitespace with |
| 12952 | * ctype's isspace() if it is used by another busybox applet or if additional | 12952 | * ctype's isspace() if it is used by another busybox applet or if additional |
| 12953 | * whitespace chars should be considered. Look below the "#include"s for a | 12953 | * whitespace chars should be considered. Look below the "#include"s for a |
| 12954 | * precompiler test. | 12954 | * precompiler test. |
| @@ -12974,7 +12974,7 @@ ulimitcmd(int argc, char **argv) | |||
| 12974 | * - realize comma separated - expr, expr | 12974 | * - realize comma separated - expr, expr |
| 12975 | * - realise ++expr --expr expr++ expr-- | 12975 | * - realise ++expr --expr expr++ expr-- |
| 12976 | * - realise expr ? expr : expr (but, second expr calculate always) | 12976 | * - realise expr ? expr : expr (but, second expr calculate always) |
| 12977 | * - allow hexdecimal and octal numbers | 12977 | * - allow hexadecimal and octal numbers |
| 12978 | * - was restored loses XOR operator | 12978 | * - was restored loses XOR operator |
| 12979 | * - remove one goto label, added three ;-) | 12979 | * - remove one goto label, added three ;-) |
| 12980 | * - protect $((num num)) as true zero expr (Manuel`s error) | 12980 | * - protect $((num num)) as true zero expr (Manuel`s error) |
| @@ -12989,7 +12989,7 @@ ulimitcmd(int argc, char **argv) | |||
| 12989 | typedef unsigned char operator; | 12989 | typedef unsigned char operator; |
| 12990 | 12990 | ||
| 12991 | /* An operator's token id is a bit of a bitfield. The lower 5 bits are the | 12991 | /* An operator's token id is a bit of a bitfield. The lower 5 bits are the |
| 12992 | * precedence, and 3 high bits are an ID unique accross operators of that | 12992 | * precedence, and 3 high bits are an ID unique across operators of that |
| 12993 | * precedence. The ID portion is so that multiple operators can have the | 12993 | * precedence. The ID portion is so that multiple operators can have the |
| 12994 | * same precedence, ensuring that the leftmost one is evaluated first. | 12994 | * same precedence, ensuring that the leftmost one is evaluated first. |
| 12995 | * Consider * and /. */ | 12995 | * Consider * and /. */ |
| @@ -13098,7 +13098,7 @@ typedef struct ARITCH_VAR_NUM { | |||
| 13098 | long contidional_second_val; | 13098 | long contidional_second_val; |
| 13099 | char contidional_second_val_initialized; | 13099 | char contidional_second_val_initialized; |
| 13100 | char *var; /* if NULL then is regular number, | 13100 | char *var; /* if NULL then is regular number, |
| 13101 | else is varable name */ | 13101 | else is variable name */ |
| 13102 | } v_n_t; | 13102 | } v_n_t; |
| 13103 | 13103 | ||
| 13104 | 13104 | ||
| @@ -13356,7 +13356,7 @@ extern long arith (const char *expr, int *perrcode) | |||
| 13356 | 13356 | ||
| 13357 | /* Stack of integers */ | 13357 | /* Stack of integers */ |
| 13358 | /* The proof that there can be no more than strlen(startbuf)/2+1 integers | 13358 | /* The proof that there can be no more than strlen(startbuf)/2+1 integers |
| 13359 | * in any given correct or incorrect expression is left as an excersize to | 13359 | * in any given correct or incorrect expression is left as an exercise to |
| 13360 | * the reader. */ | 13360 | * the reader. */ |
| 13361 | v_n_t *numstack = alloca(((datasizes)/2)*sizeof(v_n_t)), | 13361 | v_n_t *numstack = alloca(((datasizes)/2)*sizeof(v_n_t)), |
| 13362 | *numstackptr = numstack; | 13362 | *numstackptr = numstack; |
diff --git a/shell/cmdedit.c b/shell/cmdedit.c index 9c66ce284..25d31a0e0 100644 --- a/shell/cmdedit.c +++ b/shell/cmdedit.c | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* vi: set sw=4 ts=4: */ | 1 | /* vi: set sw=4 ts=4: */ |
| 2 | /* | 2 | /* |
| 3 | * Termios command line History and Editting. | 3 | * Termios command line History and Editing. |
| 4 | * | 4 | * |
| 5 | * Copyright (c) 1986-2003 may safely be consumed by a BSD or GPL license. | 5 | * Copyright (c) 1986-2003 may safely be consumed by a BSD or GPL license. |
| 6 | * Written by: Vladimir Oleynik <dzo@simtreas.ru> | 6 | * Written by: Vladimir Oleynik <dzo@simtreas.ru> |
| @@ -259,7 +259,7 @@ static inline void beep(void) | |||
| 259 | putchar('\007'); | 259 | putchar('\007'); |
| 260 | } | 260 | } |
| 261 | 261 | ||
| 262 | /* Move back one charactor */ | 262 | /* Move back one character */ |
| 263 | /* special for slow terminal */ | 263 | /* special for slow terminal */ |
| 264 | static void input_backward(int num) | 264 | static void input_backward(int num) |
| 265 | { | 265 | { |
| @@ -429,7 +429,7 @@ static void parse_prompt(const char *prmt_ptr) | |||
| 429 | #endif | 429 | #endif |
| 430 | 430 | ||
| 431 | 431 | ||
| 432 | /* draw promt, editor line, and clear tail */ | 432 | /* draw prompt, editor line, and clear tail */ |
| 433 | static void redraw(int y, int back_cursor) | 433 | static void redraw(int y, int back_cursor) |
| 434 | { | 434 | { |
| 435 | if (y > 0) /* up to start y */ | 435 | if (y > 0) /* up to start y */ |
| @@ -466,7 +466,7 @@ static void input_backspace(void) | |||
| 466 | } | 466 | } |
| 467 | 467 | ||
| 468 | 468 | ||
| 469 | /* Move forward one charactor */ | 469 | /* Move forward one character */ |
| 470 | static void input_forward(void) | 470 | static void input_forward(void) |
| 471 | { | 471 | { |
| 472 | if (cursor < len) | 472 | if (cursor < len) |
diff --git a/shell/hush.c b/shell/hush.c index 6d31cdca5..49e2397ad 100644 --- a/shell/hush.c +++ b/shell/hush.c | |||
| @@ -2646,7 +2646,7 @@ void update_ifs_map(void) | |||
| 2646 | mapset(ifs, 2); /* also flow through if quoted */ | 2646 | mapset(ifs, 2); /* also flow through if quoted */ |
| 2647 | } | 2647 | } |
| 2648 | 2648 | ||
| 2649 | /* most recursion does not come through here, the exeception is | 2649 | /* most recursion does not come through here, the exception is |
| 2650 | * from builtin_source() */ | 2650 | * from builtin_source() */ |
| 2651 | int parse_stream_outer(struct in_str *inp, int flag) | 2651 | int parse_stream_outer(struct in_str *inp, int flag) |
| 2652 | { | 2652 | { |
diff --git a/shell/msh.c b/shell/msh.c index 5dc0b2b51..62e7844a8 100644 --- a/shell/msh.c +++ b/shell/msh.c | |||
| @@ -70,7 +70,7 @@ | |||
| 70 | #define WAITCORE(s) (((s)&0200)!=0) | 70 | #define WAITCORE(s) (((s)&0200)!=0) |
| 71 | 71 | ||
| 72 | /* | 72 | /* |
| 73 | * library and system defintions | 73 | * library and system definitions |
| 74 | */ | 74 | */ |
| 75 | typedef void xint; /* base type of jmp_buf, for not broken compilers */ | 75 | typedef void xint; /* base type of jmp_buf, for not broken compilers */ |
| 76 | 76 | ||
