mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-20 19:50:24 +02:00
Code Activity

(scm_localtime, scm_gmtime, scm_mktime): Provide a default

Browse source 
errno EINVAL in case localtime and gmtime don't set it.
(scm_mktime, scm_strptime): Forcibly use errno EINVAL for our
SCM_SYSERROR, since mktime and strptime generally don't set errno.
This commit is contained in:
Kevin Ryde 2004-02-17 23:37:06 +00:00
parent afe199fe64
commit 73ae3b4cb5
1 changed files with 21 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

23
libguile/stime.c
View file

@ -327,6 +327,9 @@ SCM_DEFINE (scm_localtime, "localtime", 1, 1, 0,
#ifdef LOCALTIME_CACHE #ifdef LOCALTIME_CACHE
tzset (); tzset ();
#endif #endif
/* POSIX says localtime sets errno, but C99 doesn't say that.
Give a sensible default value in case localtime doesn't set it. */
errno = EINVAL;
ltptr = localtime (&itime); ltptr = localtime (&itime);
err = errno; err = errno;
if (ltptr) if (ltptr)
@ -347,6 +350,9 @@ SCM_DEFINE (scm_localtime, "localtime", 1, 1, 0,
/* the struct is copied in case localtime and gmtime share a buffer. */ /* the struct is copied in case localtime and gmtime share a buffer. */
if (ltptr) if (ltptr)
lt = *ltptr; lt = *ltptr;
/* POSIX says gmtime sets errno, but C99 doesn't say that.
Give a sensible default value in case gmtime doesn't set it. */
errno = EINVAL;
utc = gmtime (&itime); utc = gmtime (&itime);
if (utc == NULL) if (utc == NULL)
err = errno; err = errno;
@ -389,6 +395,9 @@ SCM_DEFINE (scm_gmtime, "gmtime", 1, 0, 0,
itime = SCM_NUM2LONG (1, time); itime = SCM_NUM2LONG (1, time);
SCM_DEFER_INTS; SCM_DEFER_INTS;
/* POSIX says gmtime sets errno, but C99 doesn't say that.
Give a sensible default value in case gmtime doesn't set it. */
errno = EINVAL;
bd_time = gmtime (&itime); bd_time = gmtime (&itime);
if (bd_time == NULL) if (bd_time == NULL)
SCM_SYSERROR; SCM_SYSERROR;
@ -461,7 +470,9 @@ SCM_DEFINE (scm_mktime, "mktime", 1, 1, 0,
tzset (); tzset ();
#endif #endif
itime = mktime (&lt); itime = mktime (&lt);
err = errno; /* POSIX doesn't say mktime sets errno, and on glibc 2.3.2 for instance it
doesn't. Force a sensible value for our error message. */
err = EINVAL;
if (itime != -1) if (itime != -1)
{ {
@ -480,6 +491,8 @@ SCM_DEFINE (scm_mktime, "mktime", 1, 1, 0,
} }
/* get timezone offset in seconds west of UTC. */ /* get timezone offset in seconds west of UTC. */
/* POSIX says gmtime sets errno, but C99 doesn't say that.
Give a sensible default value in case gmtime doesn't set it. */
utc = gmtime (&itime); utc = gmtime (&itime);
if (utc == NULL) if (utc == NULL)
err = errno; err = errno;
@ -660,7 +673,13 @@ SCM_DEFINE (scm_strptime, "strptime", 2, 0, 0,
t.tm_isdst = -1; t.tm_isdst = -1;
SCM_DEFER_INTS; SCM_DEFER_INTS;
if ((rest = strptime (str, fmt, &t)) == NULL) if ((rest = strptime (str, fmt, &t)) == NULL)
SCM_SYSERROR; {
/* 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
message. */
errno = EINVAL;
SCM_SYSERROR;
}
SCM_ALLOW_INTS; SCM_ALLOW_INTS;
return scm_cons (filltime (&t, 0, NULL), SCM_MAKINUM (rest - str)); return scm_cons (filltime (&t, 0, NULL), SCM_MAKINUM (rest - str));