@@ -249,7 +249,7 @@ AC_CHECK_FUNCS(chdir strerror getlogin gethostname kill link symlink perror)
AC_CHECK_FUNCS(sleep time ttyname signal alarm ctime clock access fork execl)
AC_CHECK_FUNCS(wait setmode execvp pipe dup2 close fdopen strcasestr getrlimit)
AC_CHECK_FUNCS(gettimeofday stat fstat lstat getpwuid vsnprintf dup getcwd)
-AC_CHECK_FUNCS(localtime_r gmtime_r strerror_r)
+AC_CHECK_FUNCS(localtime_r gmtime_r strerror_r ctime_r)
# Check for glibc backtrace functions
AC_CHECK_FUNCS(backtrace backtrace_symbols)
@@ -1,8 +1,8 @@
/* Implementation of the CTIME and FDATE g77 intrinsics.
- Copyright (C) 2005, 2007, 2009 Free Software Foundation, Inc.
+ Copyright (C) 2005, 2007, 2009, 2011 Free Software Foundation, Inc.
Contributed by François-Xavier Coudert <coudert@clipper.ens.fr>
-This file is part of the GNU Fortran 95 runtime library (libgfortran).
+This file is part of the GNU Fortran runtime library (libgfortran).
Libgfortran is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public
@@ -41,16 +41,28 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#include <string.h>
+#ifndef HAVE_CTIME_R
+static char *
+ctime_r (const time_t * timep, char * buf __attribute__((unused)))
+{
+ return ctime (timep);
+}
+#endif
+
+/* ctime_r() buffer size needs to be at least 26 bytes. */
+#define CSZ 26
+
extern void fdate (char **, gfc_charlen_type *);
export_proto(fdate);
void
fdate (char ** date, gfc_charlen_type * date_len)
{
-#if defined(HAVE_TIME) && defined(HAVE_CTIME)
+#if defined(HAVE_TIME) && (defined(HAVE_CTIME) || defined(HAVE_CTIME_R))
+ char cbuf[CSZ];
int i;
time_t now = time(NULL);
- *date = ctime (&now);
+ *date = ctime_r (&now, cbuf);
if (*date != NULL)
{
*date = strdup (*date);
@@ -78,15 +90,16 @@ export_proto(fdate_sub);
void
fdate_sub (char * date, gfc_charlen_type date_len)
{
-#if defined(HAVE_TIME) && defined(HAVE_CTIME)
+#if defined(HAVE_TIME) && (defined(HAVE_CTIME) || defined(HAVE_CTIME_R))
+ char cbuf[CSZ];
int i;
char *d;
time_t now = time(NULL);
#endif
memset (date, ' ', date_len);
-#if defined(HAVE_TIME) && defined(HAVE_CTIME)
- d = ctime (&now);
+#if defined(HAVE_TIME) && (defined(HAVE_CTIME) || defined(HAVE_CTIME_R))
+ d = ctime_r (&now, cbuf);
if (d != NULL)
{
i = 0;
@@ -104,10 +117,11 @@ export_proto_np(PREFIX(ctime));
void
PREFIX(ctime) (char ** date, gfc_charlen_type * date_len, GFC_INTEGER_8 t)
{
-#if defined(HAVE_CTIME)
+#if defined(HAVE_CTIME) || defined(HAVE_CTIME_R)
+ char cbuf[CSZ];
time_t now = t;
int i;
- *date = ctime (&now);
+ *date = ctime_r (&now, cbuf);
if (*date != NULL)
{
*date = strdup (*date);
@@ -135,15 +149,16 @@ export_proto(ctime_sub);
void
ctime_sub (GFC_INTEGER_8 * t, char * date, gfc_charlen_type date_len)
{
-#if defined(HAVE_CTIME)
+#if defined(HAVE_CTIME) || defined(HAVE_CTIME_R)
+ char cbuf[CSZ];
int i;
char *d;
time_t now = *t;
#endif
memset (date, ' ', date_len);
-#if defined(HAVE_CTIME)
- d = ctime (&now);
+#if defined(HAVE_CTIME) || defined(HAVE_CTIME_R)
+ d = ctime_r (&now, cbuf);
if (d != NULL)
{
i = 0;