mirror of
https://github.com/fish-shell/fish-shell.git
synced 2024-12-03 08:23:51 +08:00
38f4330683
Prior to this fix, fish was rather inconsistent in when $status gets set in response to an error. For example, a failed expansion like "$foo[" would not modify $status. This makes the following inter-related changes: 1. String expansion now directly returns the value to set for $status on error. The value is always used. 2. parser_t::eval() now directly returns the proc_status_t, which cleans up a lot of call sites. 3. We expose a new function exec_subshell_for_expand() which ignores $status but returns errors specifically related to subshell expansion. 4. We reify the notion of "expansion breaking" errors. These include command-not-found, expand syntax errors, and others. The upshot is we are more consistent about always setting $status on errors.
40 lines
1.0 KiB
C++
40 lines
1.0 KiB
C++
// Functions for executing the eval builtin.
|
|
#include "config.h" // IWYU pragma: keep
|
|
|
|
#include <cerrno>
|
|
#include <cstddef>
|
|
|
|
#include "builtin.h"
|
|
#include "common.h"
|
|
#include "exec.h"
|
|
#include "fallback.h" // IWYU pragma: keep
|
|
#include "io.h"
|
|
#include "parser.h"
|
|
#include "proc.h"
|
|
#include "wgetopt.h"
|
|
#include "wutil.h" // IWYU pragma: keep
|
|
|
|
/// Implementation of eval builtin.
|
|
int builtin_eval(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
|
|
int argc = builtin_count_args(argv);
|
|
|
|
wcstring new_cmd;
|
|
for (int i = 1; i < argc; ++i) {
|
|
if (i > 1) new_cmd += L' ';
|
|
new_cmd += argv[i];
|
|
}
|
|
|
|
int status = STATUS_CMD_OK;
|
|
if (argc > 1) {
|
|
auto res = parser.eval(new_cmd, *streams.io_chain);
|
|
if (res.was_empty) {
|
|
// Issue #5692, in particular, to catch `eval ""`, `eval "begin; end;"`, etc.
|
|
// where we have an argument but nothing is executed.
|
|
status = STATUS_CMD_OK;
|
|
} else {
|
|
status = res.status.status_value();
|
|
}
|
|
}
|
|
return status;
|
|
}
|