diff options
| author | unknown <monty@mashka.mysql.fi> | 2004-02-20 17:43:02 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2004-02-20 17:43:02 +0200 |
| commit | 8b2b219fb5e1374abdd816d9d0911d37087c86a5 (patch) | |
| tree | e13a23a1c9f28ed5eb2d903ba59a153cda3355ac /mysys/mf_tempfile.c | |
| parent | 51a6b4f47ad03031105b0f8ac810d522a804695e (diff) | |
| parent | 9bc5cdba41a0d2bc3c391469b14168f82e636a6b (diff) | |
| download | mariadb-git-8b2b219fb5e1374abdd816d9d0911d37087c86a5.tar.gz | |
merge with 4.0 to get security fixes and latest bug fixes
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183:
Auto merged
VC++Files/mysql.dsw:
Auto merged
VC++Files/mysys/mysys.dsp:
Auto merged
innobase/buf/buf0buf.c:
Auto merged
innobase/include/srv0start.h:
Auto merged
innobase/lock/lock0lock.c:
Auto merged
innobase/mem/mem0dbg.c:
Auto merged
innobase/que/que0que.c:
Auto merged
innobase/srv/srv0start.c:
Auto merged
innobase/sync/sync0rw.c:
Auto merged
innobase/sync/sync0sync.c:
Auto merged
innobase/trx/trx0trx.c:
Auto merged
libmysql/manager.c:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/unireg.cc:
Auto merged
VC++Files/sql/mysqld.dsp:
Removed wrong define USE_SYMLINK
include/config-win.h:
Use original code
innobase/srv/srv0srv.c:
merge
innobase/usr/usr0sess.c:
merge
libmysql/libmysql.c:
merge
mysql-test/r/func_test.result:
merge
mysql-test/t/func_test.test:
merge
sql/log.cc:
merge
sql/mysqld.cc:
merge
Diffstat (limited to 'mysys/mf_tempfile.c')
| -rw-r--r-- | mysys/mf_tempfile.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/mysys/mf_tempfile.c b/mysys/mf_tempfile.c index cca80dcd552..14b8fdc430c 100644 --- a/mysys/mf_tempfile.c +++ b/mysys/mf_tempfile.c @@ -123,12 +123,13 @@ File create_temp_file(char *to, const char *dir, const char *prefix, } #ifdef OS2 /* changing environ variable doesn't work with VACPP */ - char buffer[256]; - sprintf( buffer, "TMP=%s", dir); + char buffer[256], *end; + buffer[sizeof[buffer)-1]= 0; + end= strxnmov(buffer, sizeof(buffer)-1, (char*) "TMP=", dir, NullS); /* remove ending backslash */ - if (buffer[strlen(buffer)-1] == '\\') - buffer[strlen(buffer)-1] = '\0'; - putenv( buffer); + if (end[-1] == '\\') + end[-1]= 0; + putenv(buffer); #elif !defined(__NETWARE__) old_env= (char**) environ; if (dir) @@ -138,7 +139,7 @@ File create_temp_file(char *to, const char *dir, const char *prefix, } #endif if ((res=tempnam((char*) dir, (char*) prefix))) - { + { strmake(to,res,FN_REFLEN-1); (*free)(res); file=my_create(to,0, |