992e0ff7e
Denys Vlasenko
2016-09-29
Subject
hush: fix ". EMPTY_LINE" not setting $? to 0
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
shell/ash_test/ash-misc/source3.right +2 -0shell/ash_test/ash-misc/source3.tests +6 -0shell/hush.c +2 -0shell/hush_test/hush-misc/source3.right +2 -0shell/hush_test/hush-misc/source3.tests +6 -0
shell/ash_test/ash-misc/source3.right+2 -0
| @@ -0,0 +1,2 @@ | |
| + | Zero:0 |
| + | Zero:0 |
shell/ash_test/ash-misc/source3.tests+6 -0
| @@ -0,0 +1,6 @@ | |
| + | # Test both empty file, and one-empty-line file |
| + | echo >sourced1 |
| + | true >sourced2 |
| + | false; . ./sourced1; echo Zero:$? |
| + | false; . ./sourced2; echo Zero:$? |
| + | rm sourced1 sourced2 |
shell/hush.c+2 -0
| @@ -9156,6 +9156,8 @@ static int FAST_FUNC builtin_source(char **argv) | |
| if (argv[1]) | |
| save_and_replace_G_args(&sv, argv); | |
| + | /* "false; . ./empty_line; echo Zero:$?" should print 0 */ |
| + | G.last_exitcode = 0; |
| parse_and_run_file(input); | |
| fclose_and_forget(input); | |
shell/hush_test/hush-misc/source3.right+2 -0
| @@ -0,0 +1,2 @@ | |
| + | Zero:0 |
| + | Zero:0 |
shell/hush_test/hush-misc/source3.tests+6 -0
| @@ -0,0 +1,6 @@ | |
| + | # Test both empty file, and one-empty-line file |
| + | echo >sourced1 |
| + | true >sourced2 |
| + | false; . ./sourced1; echo Zero:$? |
| + | false; . ./sourced2; echo Zero:$? |
| + | rm sourced1 sourced2 |