mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 04:22:27 +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
185 lines
4.3 KiB
C
185 lines
4.3 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 */
|
|
|
|
/* my_setwd() and my_getwd() works with intern_filenames !! */
|
|
|
|
#include "mysys_priv.h"
|
|
#include <m_string.h>
|
|
#include "mysys_err.h"
|
|
#ifdef HAVE_GETWD
|
|
#include <sys/param.h>
|
|
#endif
|
|
#if defined(__WIN__)
|
|
#include <m_ctype.h>
|
|
#include <dos.h>
|
|
#include <direct.h>
|
|
#endif
|
|
|
|
/* Gets current working directory in buff.
|
|
|
|
SYNPOSIS
|
|
my_getwd()
|
|
buf Buffer to store result. Can be curr_dir[].
|
|
size Size of buffer
|
|
MyFlags Flags
|
|
|
|
NOTES
|
|
Directory is allways ended with FN_LIBCHAR
|
|
|
|
RESULT
|
|
0 ok
|
|
# error
|
|
*/
|
|
|
|
int my_getwd(char * buf, size_t size, myf MyFlags)
|
|
{
|
|
char * pos;
|
|
DBUG_ENTER("my_getwd");
|
|
DBUG_PRINT("my",("buf: 0x%lx size: %u MyFlags %d",
|
|
(long) buf, (uint) size, MyFlags));
|
|
|
|
if (curr_dir[0]) /* Current pos is saved here */
|
|
(void) strmake(buf,&curr_dir[0],size-1);
|
|
else
|
|
{
|
|
#if defined(HAVE_GETCWD)
|
|
if (!getcwd(buf,(uint) (size-2)) && MyFlags & MY_WME)
|
|
{
|
|
my_errno=errno;
|
|
my_error(EE_GETWD,MYF(ME_BELL+ME_WAITTANG),errno);
|
|
return(-1);
|
|
}
|
|
#elif defined(HAVE_GETWD)
|
|
{
|
|
char pathname[MAXPATHLEN];
|
|
getwd(pathname);
|
|
strmake(buf,pathname,size-1);
|
|
}
|
|
#elif defined(VMS)
|
|
if (!getcwd(buf,size-2,1) && MyFlags & MY_WME)
|
|
{
|
|
my_errno=errno;
|
|
my_error(EE_GETWD,MYF(ME_BELL+ME_WAITTANG),errno);
|
|
return(-1);
|
|
}
|
|
intern_filename(buf,buf);
|
|
#else
|
|
#error "No way to get current directory"
|
|
#endif
|
|
if (*((pos=strend(buf))-1) != FN_LIBCHAR) /* End with FN_LIBCHAR */
|
|
{
|
|
pos[0]= FN_LIBCHAR;
|
|
pos[1]=0;
|
|
}
|
|
(void) strmake(&curr_dir[0],buf, (size_t) (FN_REFLEN-1));
|
|
}
|
|
DBUG_RETURN(0);
|
|
} /* my_getwd */
|
|
|
|
|
|
/* Set new working directory */
|
|
|
|
int my_setwd(const char *dir, myf MyFlags)
|
|
{
|
|
int res;
|
|
size_t length;
|
|
char *start, *pos;
|
|
#if defined(VMS)
|
|
char buff[FN_REFLEN];
|
|
#endif
|
|
DBUG_ENTER("my_setwd");
|
|
DBUG_PRINT("my",("dir: '%s' MyFlags %d", dir, MyFlags));
|
|
|
|
start=(char *) dir;
|
|
if (! dir[0] || (dir[0] == FN_LIBCHAR && dir[1] == 0))
|
|
dir=FN_ROOTDIR;
|
|
#ifdef VMS
|
|
{
|
|
pos=strmov(buff,dir);
|
|
if (pos[-1] != FN_LIBCHAR)
|
|
{
|
|
pos[0]=FN_LIBCHAR; /* Mark as directory */
|
|
pos[1]=0;
|
|
}
|
|
system_filename(buff,buff); /* Change to VMS format */
|
|
dir=buff;
|
|
}
|
|
#endif /* VMS */
|
|
if ((res=chdir((char*) dir)) != 0)
|
|
{
|
|
my_errno=errno;
|
|
if (MyFlags & MY_WME)
|
|
my_error(EE_SETWD,MYF(ME_BELL+ME_WAITTANG),start,errno);
|
|
}
|
|
else
|
|
{
|
|
if (test_if_hard_path(start))
|
|
{ /* Hard pathname */
|
|
pos= strmake(&curr_dir[0],start,(size_t) FN_REFLEN-1);
|
|
if (pos[-1] != FN_LIBCHAR)
|
|
{
|
|
length=(uint) (pos-(char*) curr_dir);
|
|
curr_dir[length]=FN_LIBCHAR; /* must end with '/' */
|
|
curr_dir[length+1]='\0';
|
|
}
|
|
}
|
|
else
|
|
curr_dir[0]='\0'; /* Don't save name */
|
|
}
|
|
DBUG_RETURN(res);
|
|
} /* my_setwd */
|
|
|
|
|
|
|
|
/* Test if hard pathname */
|
|
/* Returns 1 if dirname is a hard path */
|
|
|
|
int test_if_hard_path(register const char *dir_name)
|
|
{
|
|
if (dir_name[0] == FN_HOMELIB && dir_name[1] == FN_LIBCHAR)
|
|
return (home_dir != NullS && test_if_hard_path(home_dir));
|
|
if (dir_name[0] == FN_LIBCHAR)
|
|
return (TRUE);
|
|
#ifdef FN_DEVCHAR
|
|
return (strchr(dir_name,FN_DEVCHAR) != 0);
|
|
#else
|
|
return FALSE;
|
|
#endif
|
|
} /* test_if_hard_path */
|
|
|
|
|
|
/*
|
|
Test if a name contains an (absolute or relative) path.
|
|
|
|
SYNOPSIS
|
|
has_path()
|
|
name The name to test.
|
|
|
|
RETURN
|
|
TRUE name contains a path.
|
|
FALSE name does not contain a path.
|
|
*/
|
|
|
|
my_bool has_path(const char *name)
|
|
{
|
|
return test(strchr(name, FN_LIBCHAR))
|
|
#if FN_LIBCHAR != '/'
|
|
|| test(strchr(name,'/'))
|
|
#endif
|
|
#ifdef FN_DEVCHAR
|
|
|| test(strchr(name, FN_DEVCHAR))
|
|
#endif
|
|
;
|
|
}
|