mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 05:22:25 +01:00
93fb8bb235
Apart strict-aliasing warnings, fix the remaining warnings generated by GCC 4.4.4 -Wall and -Wextra flags. One major source of warnings was the in-house function my_bcmp which (unconventionally) took pointers to unsigned characters as the byte sequences to be compared. Since my_bcmp and bcmp are deprecated functions whose only difference with memcmp is the return value, every use of the function is replaced with memcmp as the special return value wasn't actually being used by any caller. There were also various other warnings, mostly due to type mismatches, missing return values, missing prototypes, dead code (unreachable) and ignored return values.
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; version 2 of the License.
|
|
|
|
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 */
|
|
|
|
char * my_load_path(char * 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(strnmov(buff, path, FN_REFLEN));
|
|
else if ((is_cur=(path[0] == FN_CURLIB && path[1] == FN_LIBCHAR)) ||
|
|
(is_prefix(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(strncat(buff, path+is_cur, FN_REFLEN-1));
|
|
else
|
|
VOID(strnmov(buff, path, FN_REFLEN)); /* Return org file name */
|
|
}
|
|
else
|
|
VOID(strxnmov(buff, FN_REFLEN, own_path_prefix,path, NullS));
|
|
strnmov(to, buff, FN_REFLEN);
|
|
to[FN_REFLEN-1]= '\0';
|
|
DBUG_PRINT("exit",("to: %s",to));
|
|
DBUG_RETURN(to);
|
|
} /* my_load_path */
|