From dc9ae5e017e6a8c162a0e15d28c09ace49c33c3a Mon Sep 17 00:00:00 2001 From: Paul Smith Date: Wed, 9 Oct 2013 01:53:55 -0400 Subject: [SV 39709] Fix some typos. --- ChangeLog.1 | 8 ++++---- read.c | 2 +- tests/ChangeLog | 4 ++++ tests/scripts/features/patspecific_vars | 10 +++++----- w32/subproc/sub_proc.c | 2 +- 5 files changed, 15 insertions(+), 11 deletions(-) diff --git a/ChangeLog.1 b/ChangeLog.1 index d579521..c37b139 100644 --- a/ChangeLog.1 +++ b/ChangeLog.1 @@ -1703,7 +1703,7 @@ Thu Sep 14 18:29:38 1989 Roland McGrath (mcgrath at paris.Berkeley.EDU) existing variable's origin, is `o_env', make it `o_env_override'. * load.c: Use the symbol KERNEL_FILE_NAME instead of KERNEL_FILE. - * compatMakefile: Changed the comment for `LOAD_AVG' accordinly. + * compatMakefile: Changed the comment for `LOAD_AVG' accordingly. Thu Sep 7 16:46:26 1989 Roland McGrath (mcgrath at paris.Berkeley.EDU) @@ -3218,7 +3218,7 @@ Sun Feb 5 19:52:38 1989 Roland McGrath (mcgrath at paris.Berkeley.EDU) * variable.c (expand_function: `shell'): Use `shell_function_completed'. Block children before forking and unblock after `shell_function_pid' is set properly and - `shell_functon_completed' is reset to 0. + `shell_function_completed' is reset to 0. * commands.c (child_handler): When the child of the `shell' function completes, set `shell_function_completed' to 1 if it actually ran, @@ -4465,7 +4465,7 @@ Fri Sep 16 13:59:59 1988 Roland McGrath (mcgrath at tully.Berkeley.EDU) `maxsuffix', and must be called before count_implicit_rule_limits. * rule.c (pattern_search): If an existent (non-intermediate) - dependendency was found via a terminal rule, set its + dependency was found via a terminal rule, set its `tried_implicit' flag, so it will never have implicit rule search done. * glob.c: Bug fix to avoid alloca(0). @@ -4826,7 +4826,7 @@ Sat Jul 30 15:47:23 1988 Roland McGrath (mcgrath at tully.Berkeley.EDU) new entry as the old entry's prev pointer. * dir.c: Re-indented the `struct dir' definition to be right. - (dir_load): Cleaned up slighty. + (dir_load): Cleaned up slightly. (file_exists_p): Removed comment saying we could use `access', since that is a bad idea (except for setuid programs). Cleaned up slightly. diff --git a/read.c b/read.c index 7f90b9b..15d1b13 100644 --- a/read.c +++ b/read.c @@ -1073,7 +1073,7 @@ eval (struct ebuffer *ebuf, int set_default) here, but merely copy, since now you're beyond a ";" and into a command script. However, the old parser expanded the whole line, so we continue that for - backwards-compatiblity. Also, it wouldn't be + backwards-compatibility. Also, it wouldn't be entirely consistent, since we do an unconditional expand below once we know we don't have a target-specific variable. */ diff --git a/tests/ChangeLog b/tests/ChangeLog index af7d087..653c5a7 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,7 @@ +2013-10-09 Paul Smith + + * scripts/features/patspecific_vars: Typo fixes. + 2013-10-05 Paul Smith * test_driver.pl (run_all_tests): Rewrite to be more clear. diff --git a/tests/scripts/features/patspecific_vars b/tests/scripts/features/patspecific_vars index 8ca228d..a530bba 100644 --- a/tests/scripts/features/patspecific_vars +++ b/tests/scripts/features/patspecific_vars @@ -81,7 +81,7 @@ all: bar baz b%: pattern := good $$t -global := orginal $$t +global := original $$t # normal target @@ -103,14 +103,14 @@ else %z: a := global: $(global) pattern: $(pattern) inherit: $(inherit) endif -%z: ; @echo \'pattrn: $a;\' +%z: ; @echo \'pattern: $a;\' global := new $$t ', '', -'normal: global: orginal $t pattern: inherit: ; -pattrn: global: orginal $t pattern: inherit: ;'); +'normal: global: original $t pattern: inherit: ; +pattern: global: original $t pattern: inherit: ;'); # TEST #7 -- test expansion of pattern-specific recursive variables @@ -118,7 +118,7 @@ pattrn: global: orginal $t pattern: inherit: ;'); run_make_test(undef, # reuse previous makefile 'rec=1', 'normal: global: new $t pattern: good $t inherit: good $t; -pattrn: global: new $t pattern: good $t inherit: good $t;'); +pattern: global: new $t pattern: good $t inherit: good $t;'); # TEST #8: override in pattern-specific variables diff --git a/w32/subproc/sub_proc.c b/w32/subproc/sub_proc.c index ce8e39a..f790ca3 100644 --- a/w32/subproc/sub_proc.c +++ b/w32/subproc/sub_proc.c @@ -1111,7 +1111,7 @@ done2: /* * Description: Clean up any leftover handles, etc. It is up to the - * caller to manage and free the input, ouput, and stderr buffers. + * caller to manage and free the input, output, and stderr buffers. */ void process_cleanup( -- cgit v1.2.3