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

1 files changed, 5 insertions, 4 deletions

diff --git a/mysys/mf_tempfile.c b/mysys/mf_tempfile.c
index 187f459a8ab..14b8fdc430c 100644
--- a/mysys/mf_tempfile.c
+++ b/mysys/mf_tempfile.c
@@ -123,11 +123,12 @@ 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];
-    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';
+    if (end[-1] == '\\')
+      end[-1]= 0;
     putenv(buffer);
 #elif !defined(__NETWARE__)
     old_env= (char**) environ;