diff options
| author | Ron Yorston <rmy@pobox.com> | 2019-08-16 09:42:39 +0100 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2019-08-16 09:45:21 +0100 |
| commit | 517cf74f6265ec4308b790b637b3f9778cbdc6e0 (patch) | |
| tree | be9337069b60ca1bb03565d8575bacfc71181003 /editors/awk.c | |
| parent | ae65dc37bcc9b1d9cef0b111131c79dc4ba1bf51 (diff) | |
| parent | ac78f2ac96b3efd6551a08e7dc609efa1fb69481 (diff) | |
| download | busybox-w32-517cf74f6265ec4308b790b637b3f9778cbdc6e0.tar.gz busybox-w32-517cf74f6265ec4308b790b637b3f9778cbdc6e0.tar.bz2 busybox-w32-517cf74f6265ec4308b790b637b3f9778cbdc6e0.zip | |
Merge branch 'busybox' into merge
Diffstat (limited to 'editors/awk.c')
| -rw-r--r-- | editors/awk.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/editors/awk.c b/editors/awk.c index c4553728d..d1fedb572 100644 --- a/editors/awk.c +++ b/editors/awk.c | |||
| @@ -2652,7 +2652,7 @@ static var *evaluate(node *op, var *res) | |||
| 2652 | if (opn == '|') { | 2652 | if (opn == '|') { |
| 2653 | rsm->F = popen(R.s, "w"); | 2653 | rsm->F = popen(R.s, "w"); |
| 2654 | if (rsm->F == NULL) | 2654 | if (rsm->F == NULL) |
| 2655 | bb_perror_msg_and_die("popen"); | 2655 | bb_simple_perror_msg_and_die("popen"); |
| 2656 | rsm->is_pipe = 1; | 2656 | rsm->is_pipe = 1; |
| 2657 | } else { | 2657 | } else { |
| 2658 | rsm->F = xfopen(R.s, opn=='w' ? "w" : "a"); | 2658 | rsm->F = xfopen(R.s, opn=='w' ? "w" : "a"); |
| @@ -3265,7 +3265,7 @@ int awk_main(int argc UNUSED_PARAM, char **argv) | |||
| 3265 | argv += optind; | 3265 | argv += optind; |
| 3266 | //argc -= optind; | 3266 | //argc -= optind; |
| 3267 | if (opt & OPT_W) | 3267 | if (opt & OPT_W) |
| 3268 | bb_error_msg("warning: option -W is ignored"); | 3268 | bb_simple_error_msg("warning: option -W is ignored"); |
| 3269 | if (opt & OPT_F) { | 3269 | if (opt & OPT_F) { |
| 3270 | unescape_string_in_place(opt_F); | 3270 | unescape_string_in_place(opt_F); |
| 3271 | setvar_s(intvar[FS], opt_F); | 3271 | setvar_s(intvar[FS], opt_F); |