From 68242939d818cf5d091d5dcf13e312994f423f9f Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 19 Feb 2004 22:04:31 +0200 Subject: Fixed usage of strxnmov() in recent changesets libmysql/libmysql.c: szPipeName -> pipe_name fixed usage of strxnmov() mysys/mf_tempfile.c: Fixed usage of strnxmov() Simple optimization mysys/my_tempnam.c: Fixed usage of strnxmov() Simple optimization sql/log.cc: simple optimization sql/mini_client.cc: szPipeName -> pipe_name fixed usage of strxnmov() sql/mysqld.cc: szPipeName -> pipe_name fixed usage of strxnmov() Fixed indentation --- mysys/my_tempnam.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'mysys/my_tempnam.c') diff --git a/mysys/my_tempnam.c b/mysys/my_tempnam.c index 4cf483d22cf..b4f76727ee0 100644 --- a/mysys/my_tempnam.c +++ b/mysys/my_tempnam.c @@ -105,12 +105,13 @@ my_string my_tempnam(const char *dir, const char *pfx, } #ifdef OS2 /* changing environ variable doesn't work with VACPP */ - char buffer[256]; - strxnmov(buffer, sizeof(buffer), "TMP=", 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) -- cgit v1.2.1