\f
+/* _POSIX_C_SOURCE is not defined always, because it causes problems on some
+ systems, notably
+
+ - FreeBSD loses all BSD and XOPEN defines.
+ - glibc loses some things like CLK_TCK.
+ - On MINGW it conflicts with the pthread headers.
+
+ But on HP-UX _POSIX_C_SOURCE is needed, as noted, for gmtime_r.
+
+ Perhaps a configure test could figure out what _POSIX_C_SOURCE gives and
+ what it takes away, and decide from that whether to use it, instead of
+ hard coding __hpux. */
+
#define _GNU_SOURCE /* ask glibc for everything, in particular strptime */
+#ifdef __hpux
#define _POSIX_C_SOURCE 199506L /* for gmtime_r prototype */
+#endif
#if HAVE_CONFIG_H
# include <config.h>
#include "libguile/feature.h"
#include "libguile/strings.h"
#include "libguile/vectors.h"
+#include "libguile/dynwind.h"
#include "libguile/validate.h"
#include "libguile/stime.h"
SCM tmp;
ftime (&time_buffer);
time_buffer.time -= scm_your_base.time;
- tmp = scm_long2num (time_buffer.millitm - scm_your_base.millitm);
+ tmp = scm_from_long (time_buffer.millitm - scm_your_base.millitm);
tmp = scm_sum (tmp,
- scm_product (SCM_I_MAKINUM (1000),
- SCM_I_MAKINUM (time_buffer.time)));
- return scm_quotient (scm_product (tmp, SCM_I_MAKINUM (SCM_TIME_UNITS_PER_SECOND)),
- SCM_I_MAKINUM (1000));
+ scm_product (scm_from_int (1000),
+ scm_from_int (time_buffer.time)));
+ return scm_quotient (scm_product (tmp,
+ scm_from_int (SCM_TIME_UNITS_PER_SECOND)),
+ scm_from_int (1000));
#else
- return scm_long2num((time((timet*)0) - scm_your_base) * (int)SCM_TIME_UNITS_PER_SECOND);
+ return scm_from_long ((time((timet*)0) - scm_your_base)
+ * (int)SCM_TIME_UNITS_PER_SECOND);
#endif /* HAVE_FTIME */
}
#undef FUNC_NAME
rv = times (&t);
if (rv == -1)
SCM_SYSERROR;
- SCM_VECTOR_SET (result, 0, scm_long2num (rv));
- SCM_VECTOR_SET (result, 1, scm_long2num (t.tms_utime));
- SCM_VECTOR_SET (result, 2, scm_long2num (t.tms_stime));
- SCM_VECTOR_SET (result ,3, scm_long2num (t.tms_cutime));
- SCM_VECTOR_SET (result, 4, scm_long2num (t.tms_cstime));
+ SCM_VECTOR_SET (result, 0, scm_from_long (rv));
+ SCM_VECTOR_SET (result, 1, scm_from_long (t.tms_utime));
+ SCM_VECTOR_SET (result, 2, scm_from_long (t.tms_stime));
+ SCM_VECTOR_SET (result ,3, scm_from_long (t.tms_cutime));
+ SCM_VECTOR_SET (result, 4, scm_from_long (t.tms_cstime));
return result;
}
#undef FUNC_NAME
"included but subprocesses are not.")
#define FUNC_NAME s_scm_get_internal_run_time
{
- return scm_long2num (scm_c_get_internal_run_time ());
+ return scm_from_long (scm_c_get_internal_run_time ());
}
#undef FUNC_NAME
timet timv;
SCM_DEFER_INTS;
- if ((timv = time (0)) == -1)
- SCM_MISC_ERROR ("current time not available", SCM_EOL);
+ timv = time (NULL);
SCM_ALLOW_INTS;
- return scm_long2num((long) timv);
+ if (timv == -1)
+ SCM_MISC_ERROR ("current time not available", SCM_EOL);
+ return scm_from_long (timv);
}
#undef FUNC_NAME
{
#ifdef HAVE_GETTIMEOFDAY
struct timeval time;
+ int ret, err;
SCM_DEFER_INTS;
- if (gettimeofday (&time, NULL) == -1)
- SCM_SYSERROR;
+ ret = gettimeofday (&time, NULL);
+ err = errno;
SCM_ALLOW_INTS;
- return scm_cons (scm_long2num ((long) time.tv_sec),
- scm_long2num ((long) time.tv_usec));
+ if (ret == -1)
+ {
+ errno = err;
+ SCM_SYSERROR;
+ }
+ return scm_cons (scm_from_long (time.tv_sec),
+ scm_from_long (time.tv_usec));
#else
# ifdef HAVE_FTIME
struct timeb time;
ftime(&time);
- return scm_cons (scm_long2num ((long) time.time),
- SCM_I_MAKINUM (time.millitm * 1000));
+ return scm_cons (scm_from_long (time.time),
+ scm_from_int (time.millitm * 1000));
# else
timet timv;
+ int err;
SCM_DEFER_INTS;
- if ((timv = time (0)) == -1)
- SCM_SYSERROR;
+ timv = time (NULL);
+ err = errno;
SCM_ALLOW_INTS;
- return scm_cons (scm_long2num (timv), SCM_I_MAKINUM (0));
+ if (timv == -1)
+ {
+ errno = err;
+ SCM_SYSERROR;
+ }
+ return scm_cons (scm_from_long (timv), scm_from_int (0));
# endif
#endif
}
{
SCM result = scm_c_make_vector (11, SCM_UNDEFINED);
- SCM_VECTOR_SET (result,0, SCM_I_MAKINUM (bd_time->tm_sec));
- SCM_VECTOR_SET (result,1, SCM_I_MAKINUM (bd_time->tm_min));
- SCM_VECTOR_SET (result,2, SCM_I_MAKINUM (bd_time->tm_hour));
- SCM_VECTOR_SET (result,3, SCM_I_MAKINUM (bd_time->tm_mday));
- SCM_VECTOR_SET (result,4, SCM_I_MAKINUM (bd_time->tm_mon));
- SCM_VECTOR_SET (result,5, SCM_I_MAKINUM (bd_time->tm_year));
- SCM_VECTOR_SET (result,6, SCM_I_MAKINUM (bd_time->tm_wday));
- SCM_VECTOR_SET (result,7, SCM_I_MAKINUM (bd_time->tm_yday));
- SCM_VECTOR_SET (result,8, SCM_I_MAKINUM (bd_time->tm_isdst));
- SCM_VECTOR_SET (result,9, SCM_I_MAKINUM (zoff));
- SCM_VECTOR_SET (result,10, zname ? scm_makfrom0str (zname) : SCM_BOOL_F);
+ SCM_VECTOR_SET (result,0, scm_from_int (bd_time->tm_sec));
+ SCM_VECTOR_SET (result,1, scm_from_int (bd_time->tm_min));
+ SCM_VECTOR_SET (result,2, scm_from_int (bd_time->tm_hour));
+ SCM_VECTOR_SET (result,3, scm_from_int (bd_time->tm_mday));
+ SCM_VECTOR_SET (result,4, scm_from_int (bd_time->tm_mon));
+ SCM_VECTOR_SET (result,5, scm_from_int (bd_time->tm_year));
+ SCM_VECTOR_SET (result,6, scm_from_int (bd_time->tm_wday));
+ SCM_VECTOR_SET (result,7, scm_from_int (bd_time->tm_yday));
+ SCM_VECTOR_SET (result,8, scm_from_int (bd_time->tm_isdst));
+ SCM_VECTOR_SET (result,9, scm_from_int (zoff));
+ SCM_VECTOR_SET (result,10, (zname
+ ? scm_from_locale_string (zname)
+ : SCM_BOOL_F));
return result;
}
{
static char *tmpenv[2];
char *buf;
-
- SCM_ASSERT (SCM_STRINGP (zone), zone, pos, subr);
- buf = scm_malloc (SCM_STRING_LENGTH (zone) + sizeof (tzvar) + 1);
- sprintf (buf, "%s=%s", tzvar, SCM_STRING_CHARS (zone));
+ size_t zone_len;
+
+ zone_len = scm_to_locale_stringbuf (zone, NULL, 0);
+ buf = scm_malloc (zone_len + sizeof (tzvar) + 1);
+ strcpy (buf, tzvar);
+ buf[sizeof(tzvar)-1] = '=';
+ scm_to_locale_stringbuf (zone, buf+sizeof(tzvar), zone_len);
+ buf[sizeof(tzvar)+zone_len] = '\0';
oldenv = environ;
tmpenv[0] = buf;
tmpenv[1] = 0;
velts = SCM_VELTS (sbd_time);
for (i = 0; i < 10; i++)
{
- SCM_ASSERT (SCM_INUMP (velts[i]), sbd_time, pos, subr);
+ SCM_ASSERT (scm_is_integer (velts[i]), sbd_time, pos, subr);
}
- SCM_ASSERT (scm_is_false (velts[10]) || SCM_STRINGP (velts[10]),
+ SCM_ASSERT (scm_is_false (velts[10]) || scm_is_string (velts[10]),
sbd_time, pos, subr);
- lt->tm_sec = SCM_INUM (velts[0]);
- lt->tm_min = SCM_INUM (velts[1]);
- lt->tm_hour = SCM_INUM (velts[2]);
- lt->tm_mday = SCM_INUM (velts[3]);
- lt->tm_mon = SCM_INUM (velts[4]);
- lt->tm_year = SCM_INUM (velts[5]);
- lt->tm_wday = SCM_INUM (velts[6]);
- lt->tm_yday = SCM_INUM (velts[7]);
- lt->tm_isdst = SCM_INUM (velts[8]);
+ lt->tm_sec = scm_to_int (velts[0]);
+ lt->tm_min = scm_to_int (velts[1]);
+ lt->tm_hour = scm_to_int (velts[2]);
+ lt->tm_mday = scm_to_int (velts[3]);
+ lt->tm_mon = scm_to_int (velts[4]);
+ lt->tm_year = scm_to_int (velts[5]);
+ lt->tm_wday = scm_to_int (velts[6]);
+ lt->tm_yday = scm_to_int (velts[7]);
+ lt->tm_isdst = scm_to_int (velts[8]);
#ifdef HAVE_TM_ZONE
- lt->tm_gmtoff = SCM_INUM (velts[9]);
+ lt->tm_gmtoff = scm_to_int (velts[9]);
if (scm_is_false (velts[10]))
lt->tm_zone = NULL;
else
- lt->tm_zone = SCM_STRING_CHARS (velts[10]);
+ lt->tm_zone = scm_to_locale_string (velts[10]);
#endif
}
char **oldenv;
int err;
+ scm_frame_begin (0);
+
bdtime2c (sbd_time, <, SCM_ARG1, FUNC_NAME);
+#if HAVE_STRUCT_TM_TM_ZONE
+ scm_frame_free ((char *)lt.tm_zone);
+#endif
SCM_DEFER_INTS;
oldenv = setzone (zone, SCM_ARG2, FUNC_NAME);
else if (utc->tm_yday > lt.tm_yday)
zoff += 24 * 60 * 60;
- result = scm_cons (scm_long2num ((long) itime),
+ result = scm_cons (scm_from_long (itime),
filltime (<, zoff, zname));
SCM_ALLOW_INTS;
if (zname)
free (zname);
+
+ scm_frame_end ();
return result;
}
#undef FUNC_NAME
char *tbuf;
int size = 50;
- char *fmt, *myfmt;
+ const char *fmt;
+ char *myfmt;
int len;
SCM result;
SCM_VALIDATE_STRING (1, format);
bdtime2c (stime, &t, SCM_ARG2, FUNC_NAME);
- fmt = SCM_STRING_CHARS (format);
- len = SCM_STRING_LENGTH (format);
+ fmt = scm_i_string_chars (format);
+ len = scm_i_string_length (format);
/* Ugly hack: strftime can return 0 if its buffer is too small,
but some valid time strings (e.g. "%p") can sometimes produce
some OSs, e.g., Solaris. */
SCM zone =
scm_string_append (scm_cons (velts[10],
- scm_cons (scm_makfrom0str ("0"),
+ scm_cons (scm_from_locale_string ("0"),
SCM_EOL)));
have_zone = 1;
#endif
}
- result = scm_mem2string (tbuf + 1, len - 1);
+ result = scm_from_locale_stringn (tbuf + 1, len - 1);
free (tbuf);
free (myfmt);
return result;
#define FUNC_NAME s_scm_strptime
{
struct tm t;
- char *fmt, *str, *rest;
+ const char *fmt, *str, *rest;
SCM_VALIDATE_STRING (1, format);
SCM_VALIDATE_STRING (2, string);
- fmt = SCM_STRING_CHARS (format);
- str = SCM_STRING_CHARS (string);
+ fmt = scm_i_string_chars (format);
+ str = scm_i_string_chars (string);
/* initialize the struct tm */
#define tm_init(field) t.field = 0
fields, hence the use of SCM_DEFER_INTS. */
t.tm_isdst = -1;
SCM_DEFER_INTS;
- if ((rest = strptime (str, fmt, &t)) == NULL)
+ rest = strptime (str, fmt, &t);
+ SCM_ALLOW_INTS;
+ if (rest == NULL)
{
/* POSIX doesn't say strptime sets errno, and on glibc 2.3.2 for
instance it doesn't. Force a sensible value for our error
SCM_SYSERROR;
}
- SCM_ALLOW_INTS;
- return scm_cons (filltime (&t, 0, NULL), SCM_I_MAKINUM (rest - str));
+ return scm_cons (filltime (&t, 0, NULL),
+ scm_from_signed_integer (rest - str));
}
#undef FUNC_NAME
#endif /* HAVE_STRPTIME */
scm_init_stime()
{
scm_c_define ("internal-time-units-per-second",
- scm_long2num((long) SCM_TIME_UNITS_PER_SECOND));
+ scm_from_long (SCM_TIME_UNITS_PER_SECOND));
#ifdef HAVE_FTIME
if (!scm_your_base.time) ftime(&scm_your_base);
HCoop / bpt / guile.git / blobdiff