github-mirror/fish-shell
github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-02-21 04:39:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Realpath styling tweaks.

Browse Source 
Add braces I forgot, improve comments, make line spacing more
consistent around if blocks.
This commit is contained in:
Aaron Gyes 2018-11-18 12:23:36 -08:00
parent 442eb028c1
commit 4221d6c3e6
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/builtin_realpath.cpp
View File

@ -12,18 +12,16 @@
#include "io.h"
#include "wutil.h" // IWYU pragma: keep
/// An implementation of the external realpath command that doesn't support any options. It's meant
/// to be used only by scripts which need to be portable. In general scripts shouldn't invoke this
/// directly. They should just use `realpath` which will fallback to this builtin if an external
/// command cannot be found. This behaves like the external `realpath --canonicalize-existing`;
/// that is, it requires all path components, including the final, to exist.
/// An implementation of the external realpath command. Desn't support any options.
/// In general scripts shouldn't invoke this directly. They should just use `realpath` which
/// will fallback to this builtin if an external command cannot be found.
int builtin_realpath(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
const wchar_t *cmd = argv[0];
int argc = builtin_count_args(argv);
help_only_cmd_opts_t opts;
int argc = builtin_count_args(argv);
int optind;
int retval = parse_help_only_cmd_opts(opts, &optind, argc, argv, parser, streams);
if (retval != STATUS_CMD_OK) return retval;
if (opts.print_help) {
@ -31,7 +29,7 @@ int builtin_realpath(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
return STATUS_CMD_OK;
}
if (optind + 1 != argc) {
if (optind + 1 != argc) { // TODO: allow arbitrary args. `realpath *` should print many paths
streams.err.append_format(BUILTIN_ERR_ARG_COUNT1, cmd, 1, argc - optind);
builtin_print_help(parser, streams, cmd, streams.out);
return STATUS_INVALID_ARGS;
@ -40,14 +38,15 @@ int builtin_realpath(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
if (auto real_path = wrealpath(argv[optind])) {
streams.out.append(*real_path);
} else {
if (errno)
if (errno) {
// realpath() just couldn't do it. Report the error and make it clear
// this is an error from our builtin, not the system's realpath.
streams.err.append_format(L"builtin %ls: %ls: %s\n", cmd, argv[optind],
strerror(errno));
else
} else {
// Who knows. Probably a bug in our wrealpath() implementation.
streams.err.append_format(_(L"builtin %ls: Invalid path: %ls\n"), cmd, argv[optind]);
}
return STATUS_CMD_ERROR;
}

8
src/wutil.cpp
View File

@ -388,8 +388,7 @@ maybe_t<wcstring> wrealpath(const wcstring &pathname) {
cstring real_path;
cstring narrow_path = wcs2string(pathname);
// Strip trailing slashes. This is needed to be bug-for-bug compatible with GNU realpath which
// treats "/a//" as equivalent to "/a" whether or not /a exists.
// Strip trailing slashes. This is treats "/a//" as equivalent to "/a" if /a is a non-directory.
while (narrow_path.size() > 1 && narrow_path.at(narrow_path.size() - 1) == '/') {
narrow_path.erase(narrow_path.size() - 1, 1);
}
@ -410,6 +409,7 @@ maybe_t<wcstring> wrealpath(const wcstring &pathname) {
} else {
// Only call realpath() on the portion up to the last component.
errno = 0;
if (pathsep_idx == cstring::npos) {
// If there is no "/", this is a file in $PWD, so give the realpath to that.
narrow_res = realpath(".", tmpbuf);
@ -422,11 +422,11 @@ maybe_t<wcstring> wrealpath(const wcstring &pathname) {
if (!narrow_res) return none();
pathsep_idx++;
real_path.append(narrow_res);
// This test is to deal with pathological cases such as /../../x => //x.
// This test is to deal with cases such as /../../x => //x.
if (real_path.size() > 1) real_path.append("/");
real_path.append(narrow_path.substr(pathsep_idx, cstring::npos));
}
}