mirror of
https://github.com/MariaDB/server.git
synced 2025-11-10 23:02:54 +03:00
Remember filename for temporary files created with mkstemp Fixed wrongly allocated BDB share structure Cleanups for SunPRO BitKeeper/deleted/.del-ATIS-mysql-SunOS_5.6_sun4m~62028e0375b3b8b: ***MISSING WEAVE*** BitKeeper/deleted/.del-RUN-mysql-SunOS_5.6_sun4m~eafc8188345e262b: ***MISSING WEAVE*** BitKeeper/deleted/.del-alter-table-mysql-SunOS_5.6_sun4m~8a1bd6589a189890: ***MISSING WEAVE*** BitKeeper/deleted/.del-big-tables-mysql-SunOS_5.6_sun4m~f351a7f3e1e2257e: ***MISSING WEAVE*** BitKeeper/deleted/.del-connect-mysql-SunOS_5.6_sun4m~a10e3ddfa26a3e7f: ***MISSING WEAVE*** BitKeeper/deleted/.del-create-mysql-SunOS_5.6_sun4m~9233114ae6f8c5f: ***MISSING WEAVE*** BitKeeper/deleted/.del-insert-mysql-SunOS_5.6_sun4m~3402d060ae20e19: ***MISSING WEAVE*** BitKeeper/deleted/.del-select-mysql-SunOS_5.6_sun4m~4da215905bce988d: ***MISSING WEAVE*** BitKeeper/deleted/.del-wisconsin-mysql-SunOS_5.6_sun4m~ec61b14072715dc8: ***MISSING WEAVE*** BitKeeper/deleted/.del-ATIS-mysql-Linux_2.2.12_20smp_i686~28211fb9f0e6ab0e: ***MISSING WEAVE*** BitKeeper/deleted/.del-RUN-mysql-Linux_2.2.12_20smp_i686~da28ced3e0aac09c: ***MISSING WEAVE*** BitKeeper/deleted/.del-alter-table-mysql-Linux_2.2.12_20smp_i686~67ae4e91b5f4eabd: ***MISSING WEAVE*** BitKeeper/deleted/.del-big-tables-mysql-Linux_2.2.12_20smp_i686~a2dcb74a3c73ac18: ***MISSING WEAVE*** BitKeeper/deleted/.del-connect-mysql-Linux_2.2.12_20smp_i686~beedcd769a903c19: ***MISSING WEAVE*** BitKeeper/deleted/.del-create-mysql-Linux_2.2.12_20smp_i686~fe23ee50aea195f4: ***MISSING WEAVE*** BitKeeper/deleted/.del-insert-mysql-Linux_2.2.12_20smp_i686~f120b0ead3836c81: ***MISSING WEAVE*** BitKeeper/deleted/.del-select-mysql-Linux_2.2.12_20smp_i686~3b64aff0dfddfff4: ***MISSING WEAVE*** BitKeeper/deleted/.del-wisconsin-mysql-Linux_2.2.12_20smp_i686~d49db545341a732f: ***MISSING WEAVE*** BitKeeper/deleted/.del-ATIS-mysql-Linux_2.2.13_SMP_alpha~136bdd9fd1a2cd14: ***MISSING WEAVE*** BitKeeper/deleted/.del-ATIS-mysql_fast-Linux_2.2.13_SMP_alpha~defb62af5958fcac: ***MISSING WEAVE*** BitKeeper/deleted/.del-RUN-mysql-Linux_2.2.13_SMP_alpha~f6fa9f46d4a6152: ***MISSING WEAVE*** BitKeeper/deleted/.del-RUN-mysql_fast-Linux_2.2.13_SMP_alpha~16694c5927b7600c: ***MISSING WEAVE*** BitKeeper/deleted/.del-alter-table-mysql-Linux_2.2.13_SMP_alpha~c85eb85ba45dd748: ***MISSING WEAVE*** BitKeeper/deleted/.del-alter-table-mysql_fast-Linux_2.2.13_SMP_alpha~b062db76cf6df5d2: ***MISSING WEAVE*** BitKeeper/deleted/.del-big-tables-mysql-Linux_2.2.13_SMP_alpha~b5f4f4c35225f0f: ***MISSING WEAVE*** BitKeeper/deleted/.del-big-tables-mysql_fast-Linux_2.2.13_SMP_alpha~a9eedd951eab7e8b: ***MISSING WEAVE*** BitKeeper/deleted/.del-connect-mysql-Linux_2.2.13_SMP_alpha~74ec2bf5f55b81f: ***MISSING WEAVE*** BitKeeper/deleted/.del-connect-mysql_fast-Linux_2.2.13_SMP_alpha~f6d7665c418d62c6: ***MISSING WEAVE*** BitKeeper/deleted/.del-create-mysql-Linux_2.2.13_SMP_alpha~771b40d3280fe8ad: ***MISSING WEAVE*** BitKeeper/deleted/.del-create-mysql_fast-Linux_2.2.13_SMP_alpha~c46d6c283c0e34ae: ***MISSING WEAVE*** BitKeeper/deleted/.del-insert-mysql-Linux_2.2.13_SMP_alpha~17f262f12d2244bc: ***MISSING WEAVE*** BitKeeper/deleted/.del-insert-mysql_fast-Linux_2.2.13_SMP_alpha~3245ba5633a18e8: ***MISSING WEAVE*** BitKeeper/deleted/.del-select-mysql-Linux_2.2.13_SMP_alpha~9fd9c6e036f988d7: ***MISSING WEAVE*** BitKeeper/deleted/.del-select-mysql_fast-Linux_2.2.13_SMP_alpha~744633c6e13a897f: ***MISSING WEAVE*** BitKeeper/deleted/.del-wisconsin-mysql-Linux_2.2.13_SMP_alpha~ad7babd436f26841: ***MISSING WEAVE*** BitKeeper/deleted/.del-wisconsin-mysql_fast-Linux_2.2.13_SMP_alpha~6ad065fe4c6b4fa9: ***MISSING WEAVE*** BUILD/compile-pentium: Added command line arguments Docs/manual.texi: Update for 3.23.30 configure.in: Removed duplicated symbol include/my_sys.h: cleanup of my_open/my_create/my_tempfile mysys/mf_tempfile.c: Remember filename for temporary files created with mkstemp mysys/my_create.c: cleanup of my_open/my_create/my_tempfile mysys/my_open.c: cleanup of my_open/my_create/my_tempfile scripts/mysqld_multi.sh: Use paths from configure scripts/safe_mysqld.sh: Cleanup sql-bench/Results/ATIS-mysql-SunOS_5.7_sun4m: New benchmark results sql-bench/Results/RUN-mysql-SunOS_5.7_sun4m: New benchmark results sql-bench/Results/alter-table-mysql-SunOS_5.7_sun4m: New benchmark results sql-bench/Results/big-tables-mysql-SunOS_5.7_sun4m: New benchmark results sql-bench/Results/connect-mysql-SunOS_5.7_sun4m: New benchmark results sql-bench/Results/create-mysql-SunOS_5.7_sun4m: New benchmark results sql-bench/Results/insert-mysql-SunOS_5.7_sun4m: New benchmark results sql-bench/Results/select-mysql-SunOS_5.7_sun4m: New benchmark results sql-bench/Results/wisconsin-mysql-SunOS_5.7_sun4m: New benchmark results sql/ha_berkeley.cc: Fixed wrongly allocated share structure sql/item_cmpfunc.cc: Cleanup sql/item_cmpfunc.h: Cleanup sql/log_event.h: Cleanup sql/mysqld.cc: Changed default number of BDB locks to 10000 sql/sql_class.h: cleanup sql/sql_show.cc: cleanup support-files/mysql.spec.sh: Added mysqld_multi sql-bench/Results-linux/ATIS-mysql_dbug-Linux_2.2.14_my_SMP_i686: ***MISSING WEAVE*** sql-bench/Results-linux/ATIS-mysql_dbug_full-Linux_2.2.14_my_SMP_i686: ***MISSING WEAVE*** sql-bench/Results-linux/RUN-mysql_dbug-Linux_2.2.14_my_SMP_i686: ***MISSING WEAVE*** sql-bench/Results-linux/RUN-mysql_dbug_full-Linux_2.2.14_my_SMP_i686: ***MISSING WEAVE*** sql-bench/Results-linux/alter-table-mysql_dbug-Linux_2.2.14_my_SMP_i686: ***MISSING WEAVE*** sql-bench/Results-linux/alter-table-mysql_dbug_full-Linux_2.2.14_my_SMP_i686: ***MISSING WEAVE*** sql-bench/Results-linux/big-tables-mysql_dbug-Linux_2.2.14_my_SMP_i686: ***MISSING WEAVE*** sql-bench/Results-linux/big-tables-mysql_dbug_full-Linux_2.2.14_my_SMP_i686: ***MISSING WEAVE*** sql-bench/Results-linux/connect-mysql_dbug-Linux_2.2.14_my_SMP_i686: ***MISSING WEAVE*** sql-bench/Results-linux/connect-mysql_dbug_full-Linux_2.2.14_my_SMP_i686: ***MISSING WEAVE*** sql-bench/Results-linux/create-mysql_dbug-Linux_2.2.14_my_SMP_i686: ***MISSING WEAVE*** sql-bench/Results-linux/create-mysql_dbug_full-Linux_2.2.14_my_SMP_i686: ***MISSING WEAVE*** sql-bench/Results-linux/insert-mysql_dbug-Linux_2.2.14_my_SMP_i686: ***MISSING WEAVE*** sql-bench/Results-linux/insert-mysql_dbug_full-Linux_2.2.14_my_SMP_i686: ***MISSING WEAVE*** sql-bench/Results-linux/select-mysql_dbug-Linux_2.2.14_my_SMP_i686: ***MISSING WEAVE*** sql-bench/Results-linux/select-mysql_dbug_full-Linux_2.2.14_my_SMP_i686: ***MISSING WEAVE*** sql-bench/Results-linux/wisconsin-mysql_dbug-Linux_2.2.14_my_SMP_i686: ***MISSING WEAVE*** sql-bench/Results-linux/wisconsin-mysql_dbug_full-Linux_2.2.14_my_SMP_i686: ***MISSING WEAVE***
187 lines
5.0 KiB
C
187 lines
5.0 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"
|
|
#include <errno.h>
|
|
#ifdef HAVE_PATHS_H
|
|
#include <paths.h>
|
|
#endif
|
|
|
|
#ifdef HAVE_TEMPNAM
|
|
#ifndef MSDOS
|
|
extern char **environ;
|
|
#endif
|
|
#endif
|
|
|
|
/*
|
|
Create a temporary file in a given directory
|
|
This function should be used instead of my_tempnam() !
|
|
*/
|
|
|
|
File create_temp_file(char *to, const char *dir, const char *prefix,
|
|
int mode __attribute__((unused)),
|
|
myf MyFlags __attribute__((unused)))
|
|
{
|
|
File file= -1;
|
|
DBUG_ENTER("open_temp_file");
|
|
#if defined(_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 */
|
|
to[0]= FN_CURLIB;
|
|
to[1]= 0;
|
|
dir=to;
|
|
}
|
|
else if (*end == FN_DEVCHAR)
|
|
{ /* Get current dir for drive */
|
|
_fullpath(temp,dir,FN_REFLEN);
|
|
dir=to;
|
|
}
|
|
else if (*end == FN_LIBCHAR && dir < end && end[-1] != FN_DEVCHAR)
|
|
{
|
|
strmake(to,dir,(uint) (end-dir)); /* Copy and remove last '\' */
|
|
dir=to;
|
|
}
|
|
environ=temp_env; /* Force use of dir (dir not checked) */
|
|
temp_env[0]=0;
|
|
}
|
|
if ((res=tempnam((char*) dir,(char *) prefix)))
|
|
{
|
|
strnmov(to,res,FN_REFLEN);
|
|
(*free)(res);
|
|
file=my_create(to,0, mode, MyFlags);
|
|
}
|
|
environ=old_env;
|
|
}
|
|
#elif defined(_ZTC__)
|
|
if (!dir)
|
|
dir=getenv("TMPDIR");
|
|
if ((res=tempnam((char*) dir,(char *) prefix)))
|
|
{
|
|
strnmov(to,res,FN_REFLEN);
|
|
(*free)(res);
|
|
file=my_create(to, 0, mode, MyFlags);
|
|
}
|
|
#elif defined(HAVE_MKSTEMP)
|
|
{
|
|
char prefix_buff[30];
|
|
uint pfx_len;
|
|
File org_file;
|
|
|
|
pfx_len=(strmov(strnmov(prefix_buff,
|
|
prefix ? prefix : "tmp.",
|
|
sizeof(prefix_buff)-7),"XXXXXX") - prefix_buff);
|
|
if (!dir && ! (dir =getenv("TMPDIR")))
|
|
dir=P_tmpdir;
|
|
if (strlen(dir)+ pfx_len > FN_REFLEN-2)
|
|
{
|
|
errno=my_errno= ENAMETOOLONG;
|
|
return 1;
|
|
}
|
|
strmov(to,dir);
|
|
strmov(convert_dirname(to),prefix_buff);
|
|
org_file=mkstemp(to);
|
|
file=my_register_filename(org_file, to, FILE_BY_MKSTEMP,
|
|
EE_CANTCREATEFILE, MyFlags);
|
|
/* If we didn't manage to register the name, remove the temp file */
|
|
if (org_file >= 0 && file < 0)
|
|
{
|
|
int tmp=my_errno;
|
|
(void) my_delete(to, MYF(MY_WME | ME_NOINPUT));
|
|
my_errno=tmp;
|
|
}
|
|
}
|
|
#elif defined(HAVE_TEMPNAM)
|
|
{
|
|
char *res,**old_env,*temp_env[1];
|
|
if (dir && !dir[0])
|
|
{ /* Change empty string to current dir */
|
|
to[0]= FN_CURLIB;
|
|
to[1]= 0;
|
|
dir=to;
|
|
}
|
|
old_env=environ;
|
|
if (dir)
|
|
{ /* Don't use TMPDIR if dir is given */
|
|
environ=temp_env;
|
|
temp_env[0]=0;
|
|
}
|
|
if ((res=tempnam((char*) dir, (char*) prefix)))
|
|
{
|
|
strnmov(to,res,FN_REFLEN);
|
|
(*free)(res);
|
|
file=my_create(to,0,
|
|
(int) (O_RDWR | O_BINARY | O_TRUNC |
|
|
O_TEMPORARY | O_SHORT_LIVED),
|
|
MYF(MY_WME));
|
|
|
|
}
|
|
else
|
|
{
|
|
DBUG_PRINT("error",("Got error: %d from tempnam",errno));
|
|
}
|
|
environ=old_env;
|
|
}
|
|
#else
|
|
{
|
|
register long uniq;
|
|
register int length;
|
|
my_string pos,end_pos;
|
|
/* Make an unique number */
|
|
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 (length+8+sizeof(TMP_EXT)+1 > FN_REFLENGTH)
|
|
errno=my_errno= ENAMETOOLONG;
|
|
else
|
|
{
|
|
end_pos=strmov(to,dir);
|
|
if (end_pos != to && 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);
|
|
file=my_create(to,0,
|
|
(int) (O_RDWR | O_BINARY | O_TRUNC |
|
|
O_TEMPORARY | O_SHORT_LIVED),
|
|
MYF(MY_WME));
|
|
}
|
|
}
|
|
#endif
|
|
if (file >= 0)
|
|
thread_safe_increment(my_tmp_file_created,&THR_LOCK_open);
|
|
DBUG_RETURN(file);
|
|
}
|