mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 03:52:35 +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.
103 lines
3.3 KiB
C
103 lines
3.3 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 */
|
|
|
|
#define USES_TYPES /* sys/types is included */
|
|
#include "mysys_priv.h"
|
|
#include <sys/stat.h>
|
|
#include <m_string.h>
|
|
#if defined(HAVE_SYS_UTIME_H)
|
|
#include <sys/utime.h>
|
|
#elif defined(HAVE_UTIME_H)
|
|
#include <utime.h>
|
|
#elif !defined(HPUX)
|
|
#include <time.h>
|
|
struct utimbuf {
|
|
time_t actime;
|
|
time_t modtime;
|
|
};
|
|
#endif
|
|
|
|
|
|
/*
|
|
Ordinary ownership and accesstimes are copied from 'from-file'
|
|
if MyFlags & MY_HOLD_ORIGINAL_MODES is set and to-file exists then
|
|
the modes of to-file isn't changed
|
|
Dont set MY_FNABP or MY_NABP bits on when calling this function !
|
|
*/
|
|
|
|
int my_copy(const char *from, const char *to, myf MyFlags)
|
|
{
|
|
uint Count;
|
|
int new_file_stat;
|
|
File from_file,to_file;
|
|
char buff[IO_SIZE];
|
|
struct stat stat_buff,new_stat_buff;
|
|
DBUG_ENTER("my_copy");
|
|
DBUG_PRINT("my",("from %s to %s MyFlags %d", from, to, MyFlags));
|
|
|
|
from_file=to_file= -1;
|
|
new_file_stat=0;
|
|
if (MyFlags & MY_HOLD_ORIGINAL_MODES) /* Copy stat if possible */
|
|
new_file_stat=stat((char*) to, &new_stat_buff);
|
|
|
|
if ((from_file=my_open(from,O_RDONLY | O_SHARE,MyFlags)) >= 0)
|
|
{
|
|
if (stat(from,&stat_buff))
|
|
{
|
|
my_errno=errno;
|
|
goto err;
|
|
}
|
|
if (MyFlags & MY_HOLD_ORIGINAL_MODES && !new_file_stat)
|
|
stat_buff=new_stat_buff;
|
|
if ((to_file= my_create(to,(int) stat_buff.st_mode,
|
|
O_WRONLY | O_TRUNC | O_BINARY | O_SHARE,
|
|
MyFlags)) < 0)
|
|
goto err;
|
|
|
|
while ((Count=my_read(from_file,buff,IO_SIZE,MyFlags)) != 0)
|
|
if (Count == (uint) -1 ||
|
|
my_write(to_file,buff,Count,MYF(MyFlags | MY_NABP)))
|
|
goto err;
|
|
|
|
if (my_close(from_file,MyFlags) | my_close(to_file,MyFlags))
|
|
DBUG_RETURN(-1); /* Error on close */
|
|
|
|
/* Copy modes if possible */
|
|
|
|
if (MyFlags & MY_HOLD_ORIGINAL_MODES && new_file_stat)
|
|
DBUG_RETURN(0); /* File copyed but not stat */
|
|
VOID(chmod(to, stat_buff.st_mode & 07777)); /* Copy modes */
|
|
#if !defined(MSDOS) && !defined(__WIN__) && !defined(__EMX__) && !defined(OS2)
|
|
VOID(chown(to, stat_buff.st_uid,stat_buff.st_gid)); /* Copy ownership */
|
|
#endif
|
|
#if !defined(VMS) && !defined(__ZTC__)
|
|
if (MyFlags & MY_COPYTIME)
|
|
{
|
|
struct utimbuf timep;
|
|
timep.actime = stat_buff.st_atime;
|
|
timep.modtime = stat_buff.st_mtime;
|
|
VOID(utime((char*) to, &timep)); /* last accessed and modified times */
|
|
}
|
|
#endif
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
err:
|
|
if (from_file >= 0) VOID(my_close(from_file,MyFlags));
|
|
if (to_file >= 0) VOID(my_close(to_file,MyFlags));
|
|
DBUG_RETURN(-1);
|
|
} /* my_copy */
|