mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +01:00
0fb88806e4
BitKeeper/etc/logging_ok: auto-union Build-tools/Do-compile: Auto merged acinclude.m4: Auto merged configure.in: Auto merged dbug/dbug.c: Auto merged include/config-win.h: Auto merged include/my_base.h: Auto merged include/my_global.h: Auto merged include/my_pthread.h: Auto merged include/my_sys.h: Auto merged include/mysql.h: Auto merged include/mysql_com.h: Auto merged innobase/lock/lock0lock.c: Auto merged innobase/row/row0ins.c: Auto merged innobase/row/row0sel.c: Auto merged innobase/row/row0umod.c: Auto merged innobase/row/row0upd.c: Auto merged myisam/ft_boolean_search.c: Auto merged myisam/mi_check.c: Auto merged myisam/mi_dbug.c: Auto merged myisam/mi_open.c: Auto merged mysql-test/r/auto_increment.result: Auto merged mysql-test/r/bdb.result: Auto merged mysql-test/r/func_op.result: Auto merged Build-tools/Bootstrap: Merge with 4.0 client/mysql.cc: Merge with 4.0 client/mysqldump.c: Merge with 4.0 client/mysqltest.c: Use local version innobase/btr/btr0cur.c: Merge with 4.0 (Heikki should check if we should remove btr_cur_update_sec_rec_in_place() libmysql/libmysql.c: Merge with 4.0 libmysqld/lib_sql.cc: Merge with 4.0 myisam/mi_key.c: Merge with 4.0 myisam/mi_search.c: Merge with 4.0 mysql-test/r/binary.result: Merge with 4.0 mysql-test/r/func_group.result: Merge with 4.0 mysql-test/r/func_str.result: Merge with 4.0 mysql-test/r/func_time.result: Merge with 4.0 mysql-test/r/group_by.result: Merge with 4.0 mysql-test/r/handler.result: Merge with 4.0 mysql-test/r/innodb.result: Merge with 4.0 mysql-test/r/insert.result: Merge with 4.0 mysql-test/r/join_outer.result: Merge with 4.0 mysql-test/r/loaddata.result: Merge with 4.0 mysql-test/r/lowercase_table.result: Merge with 4.0 mysql-test/r/multi_update.result: Merge with 4.0 mysql-test/r/mysqldump.result: Merge with 4.0 mysql-test/r/query_cache.result: Merge with 4.0 mysql-test/r/rpl_max_relay_size.result: Merge with 4.0 mysql-test/r/rpl_rotate_logs.result: Merge with 4.0 mysql-test/r/rpl_trunc_binlog.result: Merge with 4.0 mysql-test/r/select_found.result: Merge with 4.0 mysql-test/r/symlink.result: Merge with 4.0 mysql-test/r/truncate.result: Merge with 4.0 mysql-test/r/type_blob.result: Merge with 4.0 mysql-test/r/type_datetime.result: Merge with 4.0 mysql-test/r/type_decimal.result: Merge with 4.0 mysql-test/r/type_enum.result: Merge with 4.0 mysql-test/r/type_timestamp.result: Merge with 4.0 mysql-test/r/union.result: Merge with 4.0 mysql-test/t/auto_increment.test: Merge with 4.0 mysql-test/t/bdb.test: Merge with 4.0 mysql-test/t/func_group.test: Merge with 4.0 mysql-test/t/func_op.test: Merge with 4.0 mysql-test/t/func_str.test: Merge with 4.0 mysql-test/t/func_time.test: Merge with 4.0 mysql-test/t/group_by.test: Merge with 4.0 mysql-test/t/handler.test: Merge with 4.0 mysql-test/t/innodb.test: Merge with 4.0 mysql-test/t/insert.test: Merge with 4.0 mysql-test/t/join_outer.test: Merge with 4.0 mysql-test/t/limit.test: Merge with 4.0 mysql-test/t/loaddata.test: Merge with 4.0 mysql-test/t/lowercase_table.test: Merge with 4.0 mysql-test/t/multi_update.test: Merge with 4.0 mysql-test/t/mysqldump.test: Merge with 4.0 mysql-test/t/query_cache.test: Merge with 4.0 mysql-test/t/rpl_log_pos.test: Merge with 4.0 mysql-test/t/rpl_max_relay_size.test: Merge with 4.0 mysql-test/t/rpl_rotate_logs.test: Merge with 4.0 mysql-test/t/rpl_trunc_binlog.test: Merge with 4.0 mysql-test/t/select_found.test: Merge with 4.0 mysql-test/t/symlink.test: Merge with 4.0 mysql-test/t/truncate.test: Merge with 4.0 mysql-test/t/type_blob.test: Merge with 4.0 mysql-test/t/type_datetime.test: Merge with 4.0 mysql-test/t/type_decimal.test: Merge with 4.0 mysql-test/t/type_enum.test: Merge with 4.0 mysql-test/t/type_timestamp.test: Merge with 4.0 mysql-test/t/union.test: Merge with 4.0 mysys/charset.c: Merge with 4.0 mysys/my_init.c: Merge with 4.0 mysys/my_symlink.c: Merge with 4.0 mysys/my_thr_init.c: Merge with 4.0 regex/reginit.c: Merge with 4.0 sql/field.cc: Change fix_datetime() to print errors sql/field.h: Merge with 4.0 sql/ha_innodb.cc: Merge with 4.0 sql/item.cc: Merge with 4.0 sql/item.h: Merge with 4.0 sql/item_cmpfunc.cc: Merge with 4.0 sql/item_func.cc: Merge with 4.0 sql/item_func.h: Merge with 4.0 sql/item_strfunc.cc: Merge with 4.0 sql/item_strfunc.h: Merge with 4.0 sql/item_sum.cc: Merge with 4.0 sql/item_sum.h: Merge with 4.0 sql/item_timefunc.cc: Merge with 4.0 sql/lex.h: Merge with 4.0 sql/log.cc: Merge with 4.0 sql/log_event.cc: Merge with 4.0 sql/log_event.h: Merge with 4.0 sql/mysql_priv.h: Merge with 4.0 sql/mysqld.cc: Merge with 4.0 sql/nt_servc.cc: Merge with 4.0 sql/opt_range.cc: Merge with 4.0 sql/records.cc: Merge with 4.0 sql/repl_failsafe.cc: Merge with 4.0 sql/slave.cc: Merge with 4.0 sql/sql_acl.cc: Merge with 4.0 sql/sql_analyse.cc: Merge with 4.0 sql/sql_base.cc: Merge with 4.0 sql/sql_cache.cc: Merge with 4.0 sql/sql_class.h: Merge with 4.0 sql/sql_db.cc: Merge with 4.0 sql/sql_delete.cc: Merge with 4.0 sql/sql_insert.cc: Merge with 4.0 sql/sql_load.cc: Merge with 4.0 sql/sql_parse.cc: Merge with 4.0 sql/sql_rename.cc: Merge with 4.0 sql/sql_select.cc: Merge with 4.0 sql/sql_show.cc: Merge with 4.0 sql/sql_table.cc: Merge with 4.0 sql/sql_update.cc: Merge with 4.0 sql/sql_yacc.yy: Merge with 4.0 sql/table.cc: Merge with 4.0 sql/table.h: Merge with 4.0 sql/time.cc: Merge with 4.0 sql/uniques.cc: Merge with 4.0 strings/ctype-tis620.c: Merge with 4.0 strings/strto.c: Merge with 4.0 support-files/mysql.server.sh: Merge with 4.0 support-files/mysql.spec.sh: Merge with 4.0
145 lines
3.6 KiB
C
145 lines
3.6 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 "mysys_err.h"
|
|
#include <m_string.h>
|
|
#include <errno.h>
|
|
#ifdef HAVE_REALPATH
|
|
#include <sys/param.h>
|
|
#include <sys/stat.h>
|
|
#endif
|
|
|
|
/*
|
|
Reads the content of a symbolic link
|
|
If the file is not a symbolic link, return the original file name in to.
|
|
Returns: 0 if table was a symlink,
|
|
1 if table was a normal file
|
|
-1 on error.
|
|
*/
|
|
|
|
int my_readlink(char *to, const char *filename, myf MyFlags)
|
|
{
|
|
#ifndef HAVE_READLINK
|
|
strmov(to,filename);
|
|
return 1;
|
|
#else
|
|
int result=0;
|
|
int length;
|
|
DBUG_ENTER("my_readlink");
|
|
|
|
if ((length=readlink(filename, to, FN_REFLEN-1)) < 0)
|
|
{
|
|
/* Don't give an error if this wasn't a symlink */
|
|
if ((my_errno=errno) == EINVAL)
|
|
{
|
|
result= 1;
|
|
strmov(to,filename);
|
|
}
|
|
else
|
|
{
|
|
if (MyFlags & MY_WME)
|
|
my_error(EE_CANT_READLINK, MYF(0), filename, errno);
|
|
result= -1;
|
|
}
|
|
}
|
|
else
|
|
to[length]=0;
|
|
DBUG_RETURN(result);
|
|
#endif /* HAVE_READLINK */
|
|
}
|
|
|
|
|
|
/* Create a symbolic link */
|
|
|
|
int my_symlink(const char *content, const char *linkname, myf MyFlags)
|
|
{
|
|
#ifndef HAVE_READLINK
|
|
return 0;
|
|
#else
|
|
int result;
|
|
DBUG_ENTER("my_symlink");
|
|
DBUG_PRINT("enter",("content: %s linkname: %s", content, linkname));
|
|
|
|
result= 0;
|
|
if (symlink(content, linkname))
|
|
{
|
|
result= -1;
|
|
my_errno=errno;
|
|
if (MyFlags & MY_WME)
|
|
my_error(EE_CANT_SYMLINK, MYF(0), linkname, content, errno);
|
|
}
|
|
DBUG_RETURN(result);
|
|
#endif /* HAVE_READLINK */
|
|
}
|
|
|
|
/*
|
|
Resolve all symbolic links in path
|
|
'to' may be equal to 'filename'
|
|
|
|
Because purify gives a lot of UMR errors when using realpath(),
|
|
this code is disabled when using purify.
|
|
|
|
If MY_RESOLVE_LINK is given, only do realpath if the file is a link.
|
|
*/
|
|
|
|
#if defined(SCO)
|
|
#define BUFF_LEN 4097
|
|
#elif defined(MAXPATHLEN)
|
|
#define BUFF_LEN MAXPATHLEN
|
|
#else
|
|
#define BUFF_LEN FN_LEN
|
|
#endif
|
|
|
|
int my_realpath(char *to, const char *filename,
|
|
myf MyFlags __attribute__((unused)))
|
|
{
|
|
#if defined(HAVE_REALPATH) && !defined(HAVE_purify) && !defined(HAVE_BROKEN_REALPATH)
|
|
int result=0;
|
|
char buff[BUFF_LEN];
|
|
struct stat stat_buff;
|
|
DBUG_ENTER("my_realpath");
|
|
|
|
if (!(MyFlags & MY_RESOLVE_LINK) ||
|
|
(!lstat(filename,&stat_buff) && S_ISLNK(stat_buff.st_mode)))
|
|
{
|
|
char *ptr;
|
|
DBUG_PRINT("info",("executing realpath"));
|
|
if ((ptr=realpath(filename,buff)))
|
|
{
|
|
strmake(to,ptr,FN_REFLEN-1);
|
|
}
|
|
else
|
|
{
|
|
/*
|
|
Realpath didn't work; Use my_load_path() which is a poor substitute
|
|
original name but will at least be able to resolve paths that starts
|
|
with '.'.
|
|
*/
|
|
DBUG_PRINT("error",("realpath failed with errno: %d", errno));
|
|
my_errno=errno;
|
|
if (MyFlags & MY_WME)
|
|
my_error(EE_REALPATH, MYF(0), filename, my_errno);
|
|
my_load_path(to, filename, NullS);
|
|
result= -1;
|
|
}
|
|
}
|
|
DBUG_RETURN(result);
|
|
#else
|
|
my_load_path(to, filename, NullS);
|
|
return 0;
|
|
#endif
|
|
}
|