github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-23 21:45:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Prevent some copies

Browse Source
This commit is contained in:
Fabian Homborg 2021-10-19 17:47:21 +02:00
parent fbfad686aa
commit 268a9d8db3
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/builtin_path.cpp
View File

@ -221,7 +221,7 @@ static int handle_flag_t(const wchar_t **argv, parser_t &parser, io_streams_t &s
if (!opts->have_type) opts->type = 0;
opts->have_type = true;
wcstring_list_t types = split_string_tok(w.woptarg, L",");
for (auto t : types) {
for (const auto &t : types) {
if (t == L"file") {
opts->type |= TYPE_FILE;
} else if (t == L"dir") {
@ -254,7 +254,7 @@ static int handle_flag_p(const wchar_t **argv, parser_t &parser, io_streams_t &s
if (!opts->have_perm) opts->perm = 0;
opts->have_perm = true;
wcstring_list_t perms = split_string_tok(w.woptarg, L",");
for (auto p : perms) {
for (const auto &p : perms) {
if (p == L"read") {
opts->perm |= PERM_READ;
} else if (p == L"write") {
@ -433,10 +433,9 @@ static int path_transform(parser_t &parser, io_streams_t &streams, int argc, con
int n_transformed = 0;
arg_iterator_t aiter(argv, optind, streams, opts.null_in);
while (const wcstring *arg = aiter.nextstr()) {
wcstring transformed(*arg);
// Empty paths make no sense, but e.g. wbasename returns true for them.
if (arg->empty()) continue;
transformed = func(*arg);
wcstring transformed = func(*arg);
if (transformed != *arg) {
n_transformed++;
// Return okay if path wasn't already in this form

1
src/builtin_path.h
View File

@ -1,4 +1,3 @@
// Prototypes for functions for executing builtin_string functions.
#ifndef FISH_BUILTIN_PATH_H
#define FISH_BUILTIN_PATH_H