Sort all includes in src/gromacs

[alexxy/gromacs.git] / src / gromacs / utility / cstringutil.c

diff --git a/src/gromacs/utility/cstringutil.c b/src/gromacs/utility/cstringutil.c
index 3f7fd492b110c4038f0f41bd634f0331e12bca8a..14f010c077cc26bf34b63c065e43ff22c560ecc1 100644 (file)
--- a/src/gromacs/utility/cstringutil.c
+++ b/src/gromacs/utility/cstringutil.c
@@ -35,11 +35,11 @@
  * the research papers on the package. Check out http://www.gromacs.org.
  */
 /* This file is completely threadsafe - keep it that way! */
+#include "gmxpre.h"
+
 #include "cstringutil.h"
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <assert.h>
 #include <ctype.h>
@@ -49,6 +49,7 @@
 #include <time.h>
 
 #include <sys/types.h>
+
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
@@ -192,20 +193,22 @@ void trim (char *str)
 char *
 gmx_ctime_r(const time_t *clock, char *buf, int n)
 {
-    char tmpbuf[STRLEN];
-
-#ifdef GMX_NATIVE_WINDOWS
+#ifdef _MSC_VER
     /* Windows */
-    ctime_s( tmpbuf, STRLEN, clock );
+    ctime_s( buf, n, clock );
+#elif defined(GMX_NATIVE_WINDOWS)
+    char *tmpbuf = ctime( clock );
+    strncpy(buf, tmpbuf, n-1);
+    buf[n-1] = '\0';
 #elif (defined(__sun))
     /*Solaris*/
-    ctime_r(clock, tmpbuf, n);
+    ctime_r(clock, buf, n);
 #else
+    char tmpbuf[STRLEN];
     ctime_r(clock, tmpbuf);
-#endif
     strncpy(buf, tmpbuf, n-1);
     buf[n-1] = '\0';
-
+#endif
     return buf;
 }
 
@@ -213,7 +216,7 @@ void nice_header (FILE *out, const char *fn)
 {
     const char    *unk = "onbekend";
     time_t         clock;
-    const char    *user = unk;
+    const char    *user;
     int            gh;
 #ifdef HAVE_PWD_H
     uid_t          uid;
@@ -238,8 +241,9 @@ void nice_header (FILE *out, const char *fn)
     /* pw returns null on error (e.g. compute nodes lack /etc/passwd) */
     user = pw ? pw->pw_name : unk;
 #else
-    uid = 0;
-    gh  = -1;
+    uid  = 0;
+    gh   = -1;
+    user = unk;
 #endif
 
     gmx_ctime_r(&clock, timebuf, STRLEN);