Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-28 05:43:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Replace opts.stdout with opts.to_stdout

Browse source 
For some reason on Solaris the previous code was refusing to compile
with an error (regarding the declaration of stdout in the opts struct)

    error: declaration of ‘__iob’ as array of references

The obvious guess that it had something to do with the name of the
variable in question proved true; renaming it from `stdout` to
`opts.stdout` allows the build to go through.
This commit is contained in:
Mahmoud Al-Qudsi 2017-10-12 11:44:14 -05:00
parent b7f1103088
commit 0a1294758d
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/builtin_read.cpp
View file

@ -47,7 +47,7 @@ struct read_cmd_opts_t {
bool array = false; bool array = false;
bool silent = false; bool silent = false;
bool split_null = false; bool split_null = false;
bool stdout = false; bool to_stdout = false;
int nchars = 0; int nchars = 0;
}; };
@ -74,7 +74,7 @@ static const struct woption long_options[] = {{L"export", no_argument, NULL, 'x'
static int parse_cmd_opts(read_cmd_opts_t &opts, int *optind, //!OCLINT(high ncss method) static int parse_cmd_opts(read_cmd_opts_t &opts, int *optind, //!OCLINT(high ncss method)
int argc, wchar_t **argv, parser_t &parser, io_streams_t &streams) { int argc, wchar_t **argv, parser_t &parser, io_streams_t &streams) {
if (argc == 1) { if (argc == 1) {
opts.stdout = true; opts.to_stdout = true;
return STATUS_CMD_OK; return STATUS_CMD_OK;
} }
@ -405,7 +405,7 @@ int builtin_read(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
int optind; int optind;
int retval = parse_cmd_opts(opts, &optind, argc, argv, parser, streams); int retval = parse_cmd_opts(opts, &optind, argc, argv, parser, streams);
if (retval != STATUS_CMD_OK) return retval; if (retval != STATUS_CMD_OK) return retval;
if (!opts.stdout) { if (!opts.to_stdout) {
argc -= optind; argc -= optind;
argv += optind; argv += optind;
} }
@ -440,7 +440,7 @@ int builtin_read(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
return exit_res; return exit_res;
} }
if (opts.stdout) { if (opts.to_stdout) {
write_stdout(buff); write_stdout(buff);
return exit_res; return exit_res;
} }