mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
2224bbc16a
mysql-test/r/func_gconcat.result: Fixed test case after merge mysql-test/r/grant_cache.result: Updated test case (Wrong push by some developer) mysys/mf_loadpath.c: Fix for my_load_path() and ./directory handling from last changeset
55 lines
2 KiB
C
55 lines
2 KiB
C
/* Copyright (C) 2000 MySQL AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
#include "mysys_priv.h"
|
|
#include <m_string.h>
|
|
|
|
/* Returns full load-path for a file. to may be = path */
|
|
/* if path is a hard-path return path */
|
|
/* if path starts with home-dir return path */
|
|
/* if path starts with current dir or parent-dir unpack path */
|
|
/* if there is no path, prepend with own_path_prefix if given */
|
|
/* else unpack path according to current dir */
|
|
|
|
my_string my_load_path(my_string to, const char *path,
|
|
const char *own_path_prefix)
|
|
{
|
|
char buff[FN_REFLEN];
|
|
int is_cur;
|
|
DBUG_ENTER("my_load_path");
|
|
DBUG_PRINT("enter",("path: %s prefix: %s",path,
|
|
own_path_prefix ? own_path_prefix : ""));
|
|
|
|
if ((path[0] == FN_HOMELIB && path[1] == FN_LIBCHAR) ||
|
|
test_if_hard_path(path))
|
|
VOID(strmov(buff,path));
|
|
else if ((is_cur=(path[0] == FN_CURLIB && path[1] == FN_LIBCHAR)) ||
|
|
(is_prefix((gptr) path,FN_PARENTDIR)) ||
|
|
! own_path_prefix)
|
|
{
|
|
if (is_cur)
|
|
is_cur=2; /* Remove current dir */
|
|
if (! my_getwd(buff,(uint) (FN_REFLEN-strlen(path)+is_cur),MYF(0)))
|
|
VOID(strcat(buff,path+is_cur));
|
|
else
|
|
VOID(strmov(buff,path)); /* Return org file name */
|
|
}
|
|
else
|
|
VOID(strxmov(buff,own_path_prefix,path,NullS));
|
|
strmov(to,buff);
|
|
DBUG_PRINT("exit",("to: %s",to));
|
|
DBUG_RETURN(to);
|
|
} /* my_load_path */
|