mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +01:00
9a9e8d2311
---------------------------------------------------------------------- ChangeSet@1.2571, 2008-04-08 12:30:06+02:00, vvaintroub@wva. +122 -0 Bug#32082 : definition of VOID in my_global.h conflicts with Windows SDK headers VOID macro is now removed. Its usage is replaced with void cast. In some cases, where cast does not make much sense (pthread_*, printf, hash_delete, my_seek), cast is ommited. client/mysqladmin.cc: Bug#32082 : remove VOID macro client/mysqldump.c: Bug#32082 : remove VOID macro client/mysqlimport.c: Bug#32082 : remove VOID macro client/mysqlslap.c: Bug#32082 : remove VOID macro client/mysqltest.cc: Bug#32082 : remove VOID macro client/sql_string.cc: Bug#32082 : remove VOID macro extra/comp_err.c: Bug#32082 : remove VOID macro extra/replace.c: Bug#32082 : remove VOID macro include/my_alarm.h: Bug#32082 : remove VOID macro include/my_global.h: Bug#32082 : remove VOID macro libmysql/libmysql.c: Bug#32082 : remove VOID macro mysys/errors.c: Bug#32082 : remove VOID macro mysys/hash.c: Bug#32082 : remove VOID macro mysys/mf_iocache2.c: Bug#32082 : remove VOID macro mysys/mf_loadpath.c: Bug#32082 : remove VOID macro mysys/mf_path.c: Bug#32082 : remove VOID macro mysys/my_append.c: Bug#32082 : remove VOID macro mysys/my_clock.c: Bug#32082 : remove VOID macro mysys/my_copy.c: Bug#32082 : remove VOID macro mysys/my_fstream.c: Bug#32082 : remove VOID macro mysys/my_getwd.c: Bug#32082 : remove VOID macro mysys/my_lib.c: Bug#32082 : remove VOID macro mysys/my_lockmem.c: Bug#32082 : remove VOID macro mysys/my_pthread.c: Bug#32082 : remove VOID macro mysys/my_redel.c: Bug#32082 : remove VOID macro mysys/stacktrace.c: Bug#32082 : remove VOID macro mysys/thr_alarm.c: Bug#32082 : remove VOID macro mysys/thr_lock.c: Bug#32082 : remove VOID macro sql/derror.cc: Bug#32082 : remove VOID macro sql/des_key_file.cc: Bug#32082 : remove VOID macro sql/discover.cc: Bug#32082 : remove VOID macro sql/field.cc: Bug#32082 : remove VOID macro sql/filesort.cc: Bug#32082 : remove VOID macro sql/ha_ndbcluster.cc: Bug#32082 : remove VOID macro sql/ha_partition.cc: Bug#32082 : remove VOID macro sql/handler.cc: Bug#32082 : remove VOID macro sql/hostname.cc: Bug#32082 : remove VOID macro sql/init.cc: Bug#32082 : remove VOID macro sql/item.cc: Bug#32082 : remove VOID macro sql/item_cmpfunc.cc: Bug#32082 : remove VOID macro sql/item_strfunc.cc: Bug#32082 : remove VOID macro sql/lock.cc: Bug#32082 : remove VOID macro sql/log.cc: Bug#32082 : remove VOID macro sql/log_event.cc: Bug#32082 : remove VOID macro sql/mysqld.cc: Bug#32082 : remove VOID macro sql/opt_range.h: Bug#32082 : remove VOID macro sql/protocol.cc: Bug#32082 : remove VOID macro sql/records.cc: Bug#32082 : remove VOID macro sql/sp_head.cc: Bug#32082 : remove VOID macro sql/sp_pcontext.cc: Bug#32082 : remove VOID macro sql/sql_acl.cc: Bug#32082 : remove VOID macro sql/sql_base.cc: Bug#32082 : remove VOID macro sql/sql_cache.cc: Bug#32082 : remove VOID macro sql/sql_connect.cc: Bug#32082 : remove VOID macro sql/sql_db.cc: Bug#32082 : remove VOID macro sql/sql_delete.cc: Bug#32082 : remove VOID macro sql/sql_handler.cc: Bug#32082 : remove VOID macro sql/sql_insert.cc: Bug#32082 : remove VOID macro sql/sql_map.cc: Bug#32082 : remove VOID macro sql/sql_parse.cc: Bug#32082 : remove VOID macro sql/sql_select.cc: Bug#32082 : remove VOID macro sql/sql_servers.cc: Bug#32082 : remove VOID macro sql/sql_show.cc: Bug#32082 : remove VOID macro sql/sql_string.cc: Bug#32082 : remove VOID macro sql/sql_table.cc: Bug#32082 : remove VOID macro sql/sql_test.cc: Bug#32082 : remove VOID macro sql/sql_trigger.cc: Bug#32082 : remove VOID macro sql/sql_update.cc: Bug#32082 : remove VOID macro sql/sql_view.cc: Bug#32082 : remove VOID macro sql/table.cc: Bug#32082 : remove VOID macro sql/tztime.cc: Bug#32082 : remove VOID macro sql/udf_example.c: Bug#32082 : remove VOID macro sql/uniques.cc: Bug#32082 : remove VOID macro sql/unireg.cc: Bug#32082 : remove VOID macro storage/archive/ha_archive.cc: Bug#32082 : remove VOID macro storage/blackhole/ha_blackhole.cc: Bug#32082 : remove VOID macro storage/csv/ha_tina.cc: Bug#32082 : remove VOID macro storage/csv/transparent_file.cc: Bug#32082 : remove VOID macro storage/example/ha_example.cc: Bug#32082 : remove VOID macro storage/federated/ha_federated.cc: Bug#32082 : remove VOID macro storage/heap/hp_clear.c: Bug#32082 : remove VOID macro storage/heap/hp_create.c: Bug#32082 : remove VOID macro storage/heap/hp_test1.c: Bug#32082 : remove VOID macro storage/heap/hp_test2.c: Bug#32082 : remove VOID macro storage/innobase/handler/ha_innodb.cc: Bug#32082 : remove VOID macro storage/myisam/ft_eval.c: Bug#32082 : remove VOID macro storage/myisam/ha_myisam.cc: Bug#32082 : remove VOID macro storage/myisam/mi_changed.c: Bug#32082 : remove VOID macro storage/myisam/mi_check.c: Bug#32082 : remove VOID macro storage/myisam/mi_close.c: Bug#32082 : remove VOID macro storage/myisam/mi_create.c: Bug#32082 : remove VOID macro storage/myisam/mi_dbug.c: Bug#32082 : remove VOID macro storage/myisam/mi_delete.c: Bug#32082 : remove VOID macro storage/myisam/mi_delete_all.c: Bug#32082 : remove VOID macro storage/myisam/mi_dynrec.c: Bug#32082 : remove VOID macro storage/myisam/mi_info.c: Bug#32082 : remove VOID macro storage/myisam/mi_locking.c: Bug#32082 : remove VOID macro storage/myisam/mi_log.c: Bug#32082 : remove VOID macro storage/myisam/mi_open.c: Bug#32082 : remove VOID macro storage/myisam/mi_packrec.c: Bug#32082 : remove VOID macro storage/myisam/mi_panic.c: Bug#32082 : remove VOID macro storage/myisam/mi_rsame.c: Bug#32082 : remove VOID macro storage/myisam/mi_statrec.c: Bug#32082 : remove VOID macro storage/myisam/mi_test1.c: Bug#32082 : remove VOID macro storage/myisam/mi_test2.c: Bug#32082 : remove VOID macro storage/myisam/mi_test3.c: Bug#32082 : remove VOID macro storage/myisam/mi_update.c: Bug#32082 : remove VOID macro storage/myisam/mi_write.c: Bug#32082 : remove VOID macro storage/myisam/myisamchk.c: Bug#32082 : remove VOID macro storage/myisam/myisamlog.c: Bug#32082 : remove VOID macro storage/myisam/myisampack.c: Bug#32082 : remove VOID macro storage/myisam/sort.c: Bug#32082 : remove VOID macro storage/myisammrg/myrg_close.c: Bug#32082 : remove VOID macro storage/myisammrg/myrg_create.c: Bug#32082 : remove VOID macro storage/myisammrg/myrg_open.c: Bug#32082 : remove VOID macro strings/str_test.c: Bug#32082 : remove VOID macro tests/thread_test.c: Bug#32082 : remove VOID macro
123 lines
3.4 KiB
C
123 lines
3.4 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>
|
|
|
|
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 */
|
|
|
|
char * my_path(char * to, const char *progname,
|
|
const char *own_pathname_part)
|
|
{
|
|
char *start, *end, *prog;
|
|
size_t to_length;
|
|
DBUG_ENTER("my_path");
|
|
|
|
start=to; /* Return this */
|
|
if (progname && (dirname_part(to, progname, &to_length) ||
|
|
find_file_in_path(to,progname) ||
|
|
((prog=getenv("_")) != 0 &&
|
|
dirname_part(to, prog, &to_length))))
|
|
{
|
|
(void) intern_filename(to,to);
|
|
if (!test_if_hard_path(to))
|
|
{
|
|
if (!my_getwd(curr_dir,FN_REFLEN,MYF(0)))
|
|
bchange((uchar*) to, 0, (uchar*) curr_dir, strlen(curr_dir), 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(__WIN__)
|
|
#define F_OK 0
|
|
#define PATH_SEP ';'
|
|
#define PROGRAM_EXTENSION ".exe"
|
|
#elif defined(__NETWARE__)
|
|
#define PATH_SEP ';'
|
|
#define PROGRAM_EXTENSION ".nlm"
|
|
#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 */
|
|
}
|