Mercurial > vim
changeset 22389:995f5e061e27 v8.2.1743
patch 8.2.1743: cannot build without the eval feature
Commit: https://github.com/vim/vim/commit/273af497cac345897cf6369baa87a070876a5815
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Sep 25 23:49:01 2020 +0200
patch 8.2.1743: cannot build without the eval feature
Problem: Cannot build without the eval feature.
Solution: Move shorten_dir outside of #ifdef.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sat, 26 Sep 2020 00:00:04 +0200 |
parents | 8d9d6be4de03 |
children | ee56fb5ea218 |
files | src/filepath.c src/version.c |
diffstat | 2 files changed, 65 insertions(+), 63 deletions(-) [+] |
line wrap: on
line diff
--- a/src/filepath.c +++ b/src/filepath.c @@ -710,6 +710,69 @@ repeat: return valid; } +/* + * Shorten the path of a file from "~/foo/../.bar/fname" to "~/f/../.b/fname" + * "trim_len" specifies how many characters to keep for each directory. + * Must be 1 or more. + * It's done in-place. + */ + static void +shorten_dir_len(char_u *str, int trim_len) +{ + char_u *tail, *s, *d; + int skip = FALSE; + int dirchunk_len = 0; + + tail = gettail(str); + d = str; + for (s = str; ; ++s) + { + if (s >= tail) // copy the whole tail + { + *d++ = *s; + if (*s == NUL) + break; + } + else if (vim_ispathsep(*s)) // copy '/' and next char + { + *d++ = *s; + skip = FALSE; + dirchunk_len = 0; + } + else if (!skip) + { + *d++ = *s; // copy next char + if (*s != '~' && *s != '.') // and leading "~" and "." + { + ++dirchunk_len; // only count word chars for the size + + // keep copying chars until we have our preferred length (or + // until the above if/else branches move us along) + if (dirchunk_len >= trim_len) + skip = TRUE; + } + + if (has_mbyte) + { + int l = mb_ptr2len(s); + + while (--l > 0) + *d++ = *++s; + } + } + } +} + +/* + * Shorten the path of a file from "~/foo/../.bar/fname" to "~/f/../.b/fname" + * It's done in-place. + */ + void +shorten_dir(char_u *str) +{ + shorten_dir_len(str, 1); +} + #if defined(FEAT_EVAL) || defined(PROTO) /* @@ -1352,69 +1415,6 @@ f_mkdir(typval_T *argvars, typval_T *ret } /* - * Shorten the path of a file from "~/foo/../.bar/fname" to "~/f/../.b/fname" - * "trim_len" specifies how many characters to keep for each directory. - * Must be 1 or more. - * It's done in-place. - */ - static void -shorten_dir_len(char_u *str, int trim_len) -{ - char_u *tail, *s, *d; - int skip = FALSE; - int dirchunk_len = 0; - - tail = gettail(str); - d = str; - for (s = str; ; ++s) - { - if (s >= tail) // copy the whole tail - { - *d++ = *s; - if (*s == NUL) - break; - } - else if (vim_ispathsep(*s)) // copy '/' and next char - { - *d++ = *s; - skip = FALSE; - dirchunk_len = 0; - } - else if (!skip) - { - *d++ = *s; // copy next char - if (*s != '~' && *s != '.') // and leading "~" and "." - { - ++dirchunk_len; // only count word chars for the size - - // keep copying chars until we have our preferred length (or - // until the above if/else branches move us along) - if (dirchunk_len >= trim_len) - skip = TRUE; - } - - if (has_mbyte) - { - int l = mb_ptr2len(s); - - while (--l > 0) - *d++ = *++s; - } - } - } -} - -/* - * Shorten the path of a file from "~/foo/../.bar/fname" to "~/f/../.b/fname" - * It's done in-place. - */ - void -shorten_dir(char_u *str) -{ - shorten_dir_len(str, 1); -} - -/* * "pathshorten()" function */ void