Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-26 12:53:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use early returns throughout builtin_cd and fix my no-HOME output.

Browse source
This commit is contained in:
Aaron Gyes 2016-11-28 23:59:37 -08:00
parent 7cfe028b9d
commit a8b2da8405
1 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/builtin.cpp
View file

@ -2444,12 +2444,12 @@ static int builtin_exit(parser_t &parser, io_streams_t &streams, wchar_t **argv)
static int builtin_cd(parser_t &parser, io_streams_t &streams, wchar_t **argv) { static int builtin_cd(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
env_var_t dir_in; env_var_t dir_in;
wcstring dir; wcstring dir;
int res = STATUS_BUILTIN_OK;
if (argv[1] == NULL) { if (argv[1] == NULL) {
dir_in = env_get_string(L"HOME"); dir_in = env_get_string(L"HOME");
if (dir_in.missing_or_empty()) { if (dir_in.missing_or_empty()) {
streams.err.append_format(_(L"%ls: Could not find home directory\n"), argv[0]); streams.err.append_format(_(L"%ls: Could not find home directory\n"), argv[0]);
return STATUS_BUILTIN_ERROR;
} }
} else { } else {
dir_in = env_var_t(argv[1]); dir_in = env_var_t(argv[1]);
@ -2461,10 +2461,7 @@ static int builtin_cd(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
} }
if (!got_cd_path) { if (!got_cd_path) {
if (dir_in.missing_or_empty()) { if (errno == ENOTDIR) {
streams.err.append_format(_(L"%ls: $HOME not set\n"), argv[0]);
}
else if (errno == ENOTDIR) {
streams.err.append_format(_(L"%ls: '%ls' is not a directory\n"), argv[0], streams.err.append_format(_(L"%ls: '%ls' is not a directory\n"), argv[0],
dir_in.c_str()); dir_in.c_str());
} else if (errno == ENOENT) { } else if (errno == ENOENT) {
@ -2473,18 +2470,17 @@ static int builtin_cd(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
} else if (errno == EROTTEN) { } else if (errno == EROTTEN) {
streams.err.append_format(_(L"%ls: '%ls' is a rotten symlink\n"), argv[0], streams.err.append_format(_(L"%ls: '%ls' is a rotten symlink\n"), argv[0],
dir_in.c_str()); dir_in.c_str());
} else { } else {
streams.err.append_format(_(L"%ls: Unknown error trying to locate directory '%ls'\n"), streams.err.append_format(_(L"%ls: Unknown error trying to locate directory '%ls'\n"),
argv[0], dir_in.c_str()); argv[0], dir_in.c_str());
} }
if (!shell_is_interactive()) { if (!shell_is_interactive()) streams.err.append(parser.current_line());
streams.err.append(parser.current_line());
return STATUS_BUILTIN_ERROR;
} }
res = 1; if (wchdir(dir) != 0) {
} else if (wchdir(dir) != 0) {
struct stat buffer; struct stat buffer;
int status; int status;
@ -2500,13 +2496,15 @@ static int builtin_cd(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
streams.err.append(parser.current_line()); streams.err.append(parser.current_line());
} }
res = 1; return STATUS_BUILTIN_ERROR;
} else if (!env_set_pwd()) {
res = 1;
streams.err.append_format(_(L"%ls: Could not set PWD variable\n"), argv[0]);
} }
return res; if (!env_set_pwd()) {
streams.err.append_format(_(L"%ls: Could not set PWD variable\n"), argv[0]);
return STATUS_BUILTIN_ERROR;
}
return STATUS_BUILTIN_OK;
} }
/// Implementation of the builtin count command, used to count the number of arguments sent to it. /// Implementation of the builtin count command, used to count the number of arguments sent to it.