mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +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.
151 lines
4.4 KiB
C
151 lines
4.4 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>
|
|
#include "my_static.h"
|
|
#include "mysys_err.h"
|
|
|
|
#define TMP_EXT ".tmp" /* Extension of tempfile */
|
|
#if ! defined(P_tmpdir)
|
|
#define P_tmpdir ""
|
|
#endif
|
|
|
|
#ifdef HAVE_TEMPNAM
|
|
#if !defined( MSDOS) && !defined(OS2)
|
|
extern char **environ;
|
|
#endif
|
|
#endif
|
|
|
|
/* Make a uniq temp file name by using dir and adding something after
|
|
pfx to make name uniq. Name is made by adding a uniq 8 length-string and
|
|
TMP_EXT after pfx.
|
|
Returns pointer to malloced area for filename. Should be freed by
|
|
free().
|
|
The name should be uniq, but it isn't checked if it file allready exists.
|
|
Uses tempnam() if function exist on system.
|
|
This function fixes that if dir is given it's used. For example
|
|
MSDOS tempnam() uses always TMP environment-variable if it exists.
|
|
*/
|
|
/* ARGSUSED */
|
|
|
|
my_string my_tempnam(const char *dir, const char *pfx,
|
|
myf MyFlags __attribute__((unused)))
|
|
{
|
|
#ifdef _MSC_VER
|
|
char temp[FN_REFLEN],*end,*res,**old_env,*temp_env[1];
|
|
old_env=environ;
|
|
if (dir)
|
|
{
|
|
end=strend(dir)-1;
|
|
if (!dir[0])
|
|
{ /* Change empty string to current dir */
|
|
temp[0]= FN_CURLIB;
|
|
temp[1]= 0;
|
|
dir=temp;
|
|
}
|
|
else if (*end == FN_DEVCHAR)
|
|
{ /* Get current dir for drive */
|
|
_fullpath(temp,dir,FN_REFLEN);
|
|
dir=temp;
|
|
}
|
|
else if (*end == FN_LIBCHAR && dir < end && end[-1] != FN_DEVCHAR)
|
|
{
|
|
strmake(temp,dir,(uint) (end-dir)); /* Copy and remove last '\' */
|
|
dir=temp;
|
|
}
|
|
environ=temp_env; /* Force use of dir (dir not checked) */
|
|
temp_env[0]=0;
|
|
}
|
|
res=tempnam((char*) dir,(my_string) pfx);
|
|
environ=old_env;
|
|
return res;
|
|
#else
|
|
#ifdef __ZTC__
|
|
if (!dir)
|
|
{ /* If empty test first if TMP can be used */
|
|
dir=getenv("TMP");
|
|
}
|
|
return tempnam((char*) dir,(my_string) pfx); /* Use stand. dir with prefix */
|
|
#else
|
|
#ifdef HAVE_TEMPNAM
|
|
char temp[2],*res,**old_env,*temp_env[1];
|
|
|
|
if (dir && !dir[0])
|
|
{ /* Change empty string to current dir */
|
|
temp[0]= FN_CURLIB;
|
|
temp[1]= 0;
|
|
dir=temp;
|
|
}
|
|
#ifdef OS2
|
|
// changing environ variable doesn't work with VACPP
|
|
char buffer[256];
|
|
sprintf( buffer, "TMP=%s", dir);
|
|
putenv( buffer);
|
|
#else
|
|
old_env=(char**)environ;
|
|
if (dir)
|
|
{ /* Don't use TMPDIR if dir is given */
|
|
environ=(const char**)temp_env;
|
|
temp_env[0]=0;
|
|
}
|
|
#endif
|
|
res=tempnam((char*) dir,(my_string) pfx); /* Use stand. dir with prefix */
|
|
#ifndef OS2
|
|
environ=(const char**)old_env;
|
|
#endif
|
|
if (!res)
|
|
DBUG_PRINT("error",("Got error: %d from tempnam",errno));
|
|
return res;
|
|
#else
|
|
register long uniq;
|
|
register int length;
|
|
my_string pos,end_pos;
|
|
DBUG_ENTER("my_tempnam");
|
|
/* Make a uniq nummber */
|
|
pthread_mutex_lock(&THR_LOCK_open);
|
|
uniq= ((long) getpid() << 20) + (long) _my_tempnam_used++ ;
|
|
pthread_mutex_unlock(&THR_LOCK_open);
|
|
if (!dir && !(dir=getenv("TMPDIR"))) /* Use this if possibly */
|
|
dir=P_tmpdir; /* Use system default */
|
|
length=strlen(dir)+strlen(pfx)+1;
|
|
|
|
DBUG_PRINT("test",("mallocing %d byte",length+8+sizeof(TMP_EXT)+1));
|
|
if (!(pos=(char*) malloc(length+8+sizeof(TMP_EXT)+1)))
|
|
{
|
|
if (MyFlags & MY_FAE+MY_WME)
|
|
my_error(EE_OUTOFMEMORY, MYF(ME_BELL+ME_WAITTANG),
|
|
length+8+sizeof(TMP_EXT)+1);
|
|
DBUG_RETURN(NullS);
|
|
}
|
|
end_pos=strmov(pos,dir);
|
|
if (end_pos != pos && end_pos[-1] != FN_LIBCHAR)
|
|
*end_pos++=FN_LIBCHAR;
|
|
end_pos=strmov(end_pos,pfx);
|
|
|
|
for (length=0 ; length < 8 && uniq ; length++)
|
|
{
|
|
*end_pos++= _dig_vec[(int) (uniq & 31)];
|
|
uniq >>= 5;
|
|
}
|
|
VOID(strmov(end_pos,TMP_EXT));
|
|
DBUG_PRINT("exit",("tempnam: '%s'",pos));
|
|
DBUG_RETURN(pos);
|
|
#endif /* HAVE_TEMPNAM */
|
|
#endif /* __ZTC__ */
|
|
#endif /* _MSC_VER */
|
|
} /* my_tempnam */
|