Windows: Use secure ctime and strncpy in afs_ctime

[openafs.git] / src / util / afsutil.h

diff --git a/src/util/afsutil.h b/src/util/afsutil.h
index 413f2f1..5b73ad4 100644 (file)
--- a/src/util/afsutil.h
+++ b/src/util/afsutil.h
@@ -31,6 +31,7 @@
 
 #include <stdio.h>
 #include <stdarg.h>
+#include <string.h>
 
 extern int LogLevel;
 extern int mrafsStyleLogs;
@@ -56,17 +57,28 @@ afs_vsnprintf( /*@out@ */ char *p, size_t avail, const char *fmt,
     /*@requires maxSet(p) >= (avail-1)@ */
     /*@modifies p@ */ ;
 
-     extern /*@printflike@ */ int
-       afs_snprintf( /*@out@ */ char *p, size_t avail,
+extern /*@printflike@ */ int
+afs_snprintf( /*@out@ */ char *p, size_t avail,
                    const char *fmt, ...)
     /*@requires maxSet(p) >= (avail-1)@ */
     /*@modifies p@ */ ;
 
+extern int
+afs_vasnprintf (char **ret, size_t max_sz, const char *format, va_list args);
+
+extern int
+afs_vasprintf (char **ret, const char *format, va_list args);
+
+extern int
+afs_asprintf (char **ret, const char *format, ...);
+
+extern int
+afs_asnprintf (char **ret, size_t max_sz, const char *format, ...);
 
 /* special version of ctime that clobbers a *different static variable, so
  * that ViceLog can call ctime and not cause buffer confusion.
  */
-     extern char *vctime(const time_t * atime);
+extern char *vctime(const time_t * atime);
 
 /* Need a thead safe ctime for pthread builds. Use std ctime for LWP */
 #if defined(AFS_PTHREAD_ENV) && !defined(AFS_NT40_ENV)
@@ -77,8 +89,19 @@ afs_vsnprintf( /*@out@ */ char *p, size_t avail, const char *fmt,
 #define afs_ctime(C, B, L) (char*)ctime_r(C, B)
 #endif /* AFS_SUN5_ENV */
 #else /* AFS_PTHREAD_ENV && !AFS_NT40_ENV */
-#define afs_ctime(C, B, S) \
-       ((void)strncpy(B, ctime(C), (S-1)), (B)[S-1] = '\0', (B))
+static_inline char *
+afs_ctime(const time_t *C, char *B, size_t S) {
+#if !defined(AFS_NT40_ENV) || (_MSC_VER < 1400)
+    strncpy(B, ctime(C), (S-1));
+    B[S-1] = '\0';
+#else
+    char buf[32];
+    if (ctime_s(buf, sizeof(buf), C) ||
+        strncpy_s(B, S, buf, _TRUNCATE))
+         B[0] = '\0';
+#endif
+    return B;
+}
 #endif /* AFS_PTHREAD_ENV && !AFS_NT40_ENV */
 
 
@@ -109,18 +132,27 @@ afs_vsnprintf( /*@out@ */ char *p, size_t avail, const char *fmt,
 /* Unbuffer output when Un*x would do line buffering. */
 #define setlinebuf(S) setvbuf(S, NULL, _IONBF, 0)
 
-/* regular expression parser for NT */
-     extern char *re_comp(char *sp);
-     extern int rc_exec(char *p);
-
 /* Abort on error, possibly trapping to debugger or dumping a trace. */
      void afs_NTAbort(void);
-#endif /* NT40 */
+#endif /* AFS_NT40_ENV */
+
+#ifndef HAVE_POSIX_REGEX
+extern char *re_comp(const char *sp);
+extern int re_exec(const char *p1);
+#endif
 
      typedef char b32_string_t[8];
 /* b64_string_t is 8 bytes, in stds.h */
      typedef char lb64_string_t[12];
 
+#ifndef HAVE_STRLCAT
+extern size_t strlcat(char *dst, const char *src, size_t siz);
+#endif
+
+#ifndef HAVE_STRLCPY
+extern size_t strlcpy(char *dst, const char *src, size_t siz);
+#endif
+
 #ifndef UKERNEL
 #include "afs/ktime.h"
 #endif