diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2013-06-17 19:18:14 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2013-06-17 19:18:14 +0200 |
| commit | be06b886a255e6d899341f55808172a219a85799 (patch) | |
| tree | 71212769d04d2bcb1ee157a475b8e49958a7fa90 /mysys | |
| parent | 00a77add6a648f15c84511f2d6ae981e6db06d3f (diff) | |
| download | mariadb-git-be06b886a255e6d899341f55808172a219a85799.tar.gz | |
MDEV-4503 : Installation fails if TEMP directory contains "~" subdirectory.
Remove special handling for ~ in the middle of the path in cleanup_dir_name() - according to Monty, this was ancient code that tried to emulate Emacs behavior
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/mf_pack.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/mysys/mf_pack.c b/mysys/mf_pack.c index d684be238e6..e246ff17f22 100644 --- a/mysys/mf_pack.c +++ b/mysys/mf_pack.c @@ -215,12 +215,6 @@ size_t cleanup_dirname(register char *to, const char *from) } else if (pos-start > 1 && pos[-1] == FN_CURLIB && pos[-2] == FN_LIBCHAR) pos-=2; /* Skip /./ */ - else if (pos > buff+1 && pos[-1] == FN_HOMELIB && pos[-2] == FN_LIBCHAR) - { /* Found ..../~/ */ - buff[0]=FN_HOMELIB; - buff[1]=FN_LIBCHAR; - start=buff; pos=buff+1; - } } } (void) strmov(to,buff); |