mirror of
https://github.com/MariaDB/server.git
synced 2026-05-16 20:07:13 +02:00
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
This commit is contained in:
parent
a01a3dd5ef
commit
68242939d8
6 changed files with 59 additions and 49 deletions
|
|
@ -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)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue