mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 12:32:27 +01:00
31b9e6e03f
Fix bug in isamlog Add argument types to function declarations. Docs/manual.texi: Updated credits client/mysql.cc: Fixes for OS2 client/mysqladmin.c: Fixes for OS2 client/mysqldump.c: Fixes for OS2 client/mysqlimport.c: Fixes for OS2 client/mysqltest.c: Fixes for OS2 dbug/dbug.c: Fixes for OS2. Use new C calling convention. dbug/factorial.c: Fixes for OS2. Use new C calling convention. include/errmsg.h: Fix for OS2 include/global.h: Fixes for OS2. include/my_pthread.h: Fixes for OS2. include/my_sys.h: Fixes for OS2. include/mysql_com.h: Move defines to global.h include/thr_alarm.h: Fixes for OS2. isam/isamchk.c: Fixes for OS2. Add arguments to function declarations. isam/isamlog.c: Fixes for OS2. Fix bug in logfile handling. isam/test1.c: Add arguments to function decl isam/test2.c: Add arguments to function declarations. isam/test_all.res: Update result libmysql/get_password.c: Fixes for OS2. libmysql/libmysql.c: Fixes for OS2. libmysql/net.c: Fixes for OS2. libmysql/violite.c: Add arguments to function declarations. merge/_locking.c: Add argument types to function declarations. merge/close.c: Add argument types to function declarations. merge/create.c: Add argument types to function declarations. merge/extra.c: Add argument types to function declarations. merge/open.c: Add argument types to function declarations. merge/panic.c: Add argument types to function declarations. merge/rsame.c: Add argument types to function declarations. merge/update.c: Add argument types to function declarations. myisam/ft_eval.c: Portability fix myisam/ft_search.c: Portability fix myisam/ft_test1.c: Portability fix myisam/ftdefs.h: Portability fix myisam/mi_check.c: Portability fix myisam/mi_test1.c: Portability fix myisam/mi_test2.c: Portability fix myisam/mi_test_all.sh: Update to test for MACH variable myisam/myisamlog.c: Cleanup myisam/myisampack.c: Don't use variable 'new' myisam/sort.c: Portability fix myisammrg/myrg_delete.c: Add argument types to function declarations. myisammrg/myrg_locking.c: Add argument types to function declarations. myisammrg/myrg_open.c: Add argument types to function declarations. myisammrg/myrg_panic.c: Add argument types to function declarations. mysql-test/t/backup.test: Fix for OS2 mysql-test/t/show_check.test: Fix for OS2 mysys/charset.c: Dont use variable 'new' mysys/default.c: Fixes for OS2. mysys/getopt.c: Fixes for OS2. mysys/getopt1.c: Fixes for OS2. mysys/list.c: Don't use variable 'new' mysys/mf_dirname.c: Fixes for OS2. mysys/mf_format.c: Fixes for OS2. mysys/mf_path.c: Fixes for OS2. mysys/mf_qsort.c: Portability fix mysys/mf_tempfile.c: Fixes for OS2. mysys/my_clock.c: Fixes for OS2. mysys/my_copy.c: Fixes for OS2. mysys/my_create.c: Fixes for OS2. mysys/my_getwd.c: Fixes for OS2. mysys/my_init.c: Fixes for OS2. mysys/my_lib.c: Fixes for OS2. mysys/my_lock.c: Fixes for OS2. mysys/my_malloc.c: Portability fix mysys/my_mkdir.c: Fixes for OS2. mysys/my_open.c: Fixes for OS2. mysys/my_pthread.c: Fixes for OS2. mysys/my_realloc.c: Fixes for OS2. mysys/my_redel.c: Fixes for OS2. mysys/my_static.c: Fixes for OS2. mysys/my_tempnam.c: Fixes for OS2. mysys/my_thr_init.c: Fixes for OS2. mysys/my_write.c: Fixes for OS2. mysys/test_charset.c: Fixes for OS2. mysys/thr_alarm.c: Fixes for OS2. mysys/tree.c: Fixes for OS2. sql/field.cc: Fixes for OS2. sql/field.h: Fixes for OS2. sql/gen_lex_hash.cc: Fixes for OS2. sql/hostname.cc: Fixes for OS2. sql/item_func.cc: Fixes for OS2. sql/item_strfunc.cc: Fixes for OS2. sql/log_event.cc: Fixes for OS2. sql/md5.c: Fixes for OS2. sql/mini_client.cc: Fixes for OS2. sql/mysql_priv.h: Fixes for OS2. sql/mysqld.cc: Fixes for OS2. sql/net_serv.cc: Fixes for OS2. sql/slave.cc: Fixes for OS2. sql/sql_base.cc: Fixes for OS2. sql/sql_db.cc: Portability fix sql/sql_insert.cc: Fixes for OS2. sql/sql_load.cc: Fixes for OS2. sql/sql_parse.cc: Fixes for OS2. sql/sql_table.cc: Fixes for OS2. sql/sql_udf.cc: Fixes for OS2. sql/violite.c: Fixes for OS2. strings/ctype-big5.c: Fixes for OS2. strings/ctype-gbk.c: Fixes for OS2. strings/ctype-sjis.c: Fixes for OS2. strings/ctype-tis620.c: Fixes for OS2. strings/ctype.c: Fixes for OS2. strings/strnlen.c: Fixes for OS2.
120 lines
3.5 KiB
C
120 lines
3.5 KiB
C
/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
|
|
|
|
This library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Library General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2 of the License, or (at your option) any later version.
|
|
|
|
This library 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
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with this library; 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>
|
|
|
|
static char *find_file_in_path(char *to,const char *name);
|
|
|
|
/* Finds where program can find it's files.
|
|
pre_pathname is found by first locking at progname (argv[0]).
|
|
if progname contains path the path is returned.
|
|
else if progname is found in path, return it
|
|
else if progname is given and POSIX environment variable "_" is set
|
|
then path is taken from "_".
|
|
If filename doesn't contain a path append MY_BASEDIR_VERSION or
|
|
MY_BASEDIR if defined, else append "/my/running".
|
|
own_path_name_part is concatinated to result.
|
|
my_path puts result in to and returns to */
|
|
|
|
my_string my_path(my_string to, const char *progname,
|
|
const char *own_pathname_part)
|
|
{
|
|
my_string start,end,prog;
|
|
DBUG_ENTER("my_path");
|
|
|
|
start=to; /* Return this */
|
|
if (progname && (dirname_part(to, progname) ||
|
|
find_file_in_path(to,progname) ||
|
|
((prog=getenv("_")) != 0 && dirname_part(to,prog))))
|
|
{
|
|
VOID(intern_filename(to,to));
|
|
if (!test_if_hard_path(to))
|
|
{
|
|
if (!my_getwd(curr_dir,FN_REFLEN,MYF(0)))
|
|
bchange(to,0,curr_dir, (uint) strlen(curr_dir), (uint) strlen(to)+1);
|
|
}
|
|
}
|
|
else
|
|
{
|
|
if ((end = getenv("MY_BASEDIR_VERSION")) == 0 &&
|
|
(end = getenv("MY_BASEDIR")) == 0)
|
|
{
|
|
#ifdef DEFAULT_BASEDIR
|
|
end= (char*) DEFAULT_BASEDIR;
|
|
#else
|
|
end= (char*) "/my/";
|
|
#endif
|
|
}
|
|
VOID(intern_filename(to,end));
|
|
to=strend(to);
|
|
if (to != start && to[-1] != FN_LIBCHAR)
|
|
*to++ = FN_LIBCHAR;
|
|
VOID(strmov(to,own_pathname_part));
|
|
}
|
|
DBUG_PRINT("exit",("to: '%s'",start));
|
|
DBUG_RETURN(start);
|
|
} /* my_path */
|
|
|
|
|
|
/* test if file without filename is found in path */
|
|
/* Returns to if found and to has dirpart if found, else NullS */
|
|
|
|
#if defined(MSDOS) || defined(__WIN__) || defined(__EMX__) || defined(OS2)
|
|
#define F_OK 0
|
|
#define PATH_SEP ';'
|
|
#define PROGRAM_EXTENSION ".exe"
|
|
#else
|
|
#define PATH_SEP ':'
|
|
#endif
|
|
|
|
static char *find_file_in_path(char *to, const char *name)
|
|
{
|
|
char *path,*pos,dir[2];
|
|
const char *ext="";
|
|
|
|
if (!(path=getenv("PATH")))
|
|
return NullS;
|
|
dir[0]=FN_LIBCHAR; dir[1]=0;
|
|
#ifdef PROGRAM_EXTENSION
|
|
if (!fn_ext(name)[0])
|
|
ext=PROGRAM_EXTENSION;
|
|
#endif
|
|
|
|
for (pos=path ; (pos=strchr(pos,PATH_SEP)) ; path= ++pos)
|
|
{
|
|
if (path != pos)
|
|
{
|
|
strxmov(strnmov(to,path,(uint) (pos-path)),dir,name,ext,NullS);
|
|
if (!access(to,F_OK))
|
|
{
|
|
to[(uint) (pos-path)+1]=0; /* Return path only */
|
|
return to;
|
|
}
|
|
}
|
|
}
|
|
#ifdef __WIN__
|
|
to[0]=FN_CURLIB;
|
|
strxmov(to+1,dir,name,ext,NullS);
|
|
if (!access(to,F_OK)) /* Test in current dir */
|
|
{
|
|
to[2]=0; /* Leave ".\" */
|
|
return to;
|
|
}
|
|
#endif
|
|
return NullS; /* File not found */
|
|
}
|