diff options
| -rwxr-xr-x | Configure | 8 | ||||
| -rw-r--r-- | Porting/Glossary | 4 | ||||
| -rw-r--r-- | Porting/config.sh | 11 | ||||
| -rw-r--r-- | Porting/config_H | 8 | ||||
| -rw-r--r-- | config_h.SH | 6 | ||||
| -rw-r--r-- | configure.com | 1 | ||||
| -rw-r--r-- | embed.h | 4 | ||||
| -rwxr-xr-x | embed.pl | 1 | ||||
| -rw-r--r-- | epoc/config.sh | 1 | ||||
| -rw-r--r-- | ext/POSIX/POSIX.xs | 62 | ||||
| -rw-r--r-- | proto.h | 1 | ||||
| -rw-r--r-- | uconfig.h | 6 | ||||
| -rwxr-xr-x | uconfig.sh | 1 | ||||
| -rw-r--r-- | util.c | 66 | ||||
| -rw-r--r-- | vos/config.alpha.def | 1 | ||||
| -rw-r--r-- | vos/config.alpha.h | 6 | ||||
| -rw-r--r-- | vos/config.ga.def | 1 | ||||
| -rw-r--r-- | vos/config.ga.h | 6 | ||||
| -rw-r--r-- | win32/config.bc | 1 | ||||
| -rw-r--r-- | win32/config.gc | 1 | ||||
| -rw-r--r-- | win32/config.vc | 1 |
21 files changed, 131 insertions, 66 deletions
@@ -20,7 +20,7 @@ # $Id: Head.U,v 3.0.1.9 1997/02/28 15:02:09 ram Exp $ # -# Generated on Sun Apr 8 02:03:47 EET DST 2001 [metaconfig 3.0 PL70] +# Generated on Thu Apr 19 03:28:20 EET DST 2001 [metaconfig 3.0 PL70] # (with additional metaconfig patches by perlbug@perl.org) cat >c1$$ <<EOF @@ -567,6 +567,7 @@ d_strerrm='' d_strerror='' d_sysernlst='' d_syserrlst='' +d_strftime='' d_strtod='' d_strtol='' d_strtold='' @@ -12229,6 +12230,10 @@ if test "X$d_strerror" = X -o "X$d_syserrlst" = X; then fi fi +: see if strftime exists +set strftime d_strftime +eval $inlibc + : see if strtod exists set strtod d_strtod eval $inlibc @@ -16407,6 +16412,7 @@ d_strcoll='$d_strcoll' d_strctcpy='$d_strctcpy' d_strerrm='$d_strerrm' d_strerror='$d_strerror' +d_strftime='$d_strftime' d_strtod='$d_strtod' d_strtol='$d_strtol' d_strtold='$d_strtold' diff --git a/Porting/Glossary b/Porting/Glossary index d621d2fea1..4507f19af1 100644 --- a/Porting/Glossary +++ b/Porting/Glossary @@ -1584,6 +1584,10 @@ d_strerror (d_strerror.U): This variable conditionally defines HAS_STRERROR if strerror() is available to translate error numbers to strings. +d_strftime (d_strftime.U): + This variable conditionally defines the HAS_STRFTIME symbol, which + indicates to the C program that the strftime() routine is available. + d_strtod (d_strtod.U): This variable conditionally defines the HAS_STRTOD symbol, which indicates to the C program that the strtod() routine is available diff --git a/Porting/config.sh b/Porting/config.sh index 05bbeb7ab4..415fa44af2 100644 --- a/Porting/config.sh +++ b/Porting/config.sh @@ -8,7 +8,7 @@ # Package name : perl5 # Source directory : . -# Configuration time: Sun Apr 8 02:05:27 EET DST 2001 +# Configuration time: Thu Apr 19 03:59:37 EET DST 2001 # Configured by : jhi # Target system : osf1 alpha.hut.fi v4.0 878 alpha @@ -62,7 +62,7 @@ ccsymbols='__alpha=1 __LANGUAGE_C__=1 __osf__=1 __unix__=1 _LONGLONG=1 _SYSTYPE_ ccversion='V5.6-082' cf_by='jhi' cf_email='yourname@yourhost.yourplace.com' -cf_time='Sun Apr 8 02:05:27 EET DST 2001' +cf_time='Thu Apr 19 03:59:37 EET DST 2001' charsize='1' chgrp='' chmod='' @@ -360,6 +360,7 @@ d_strcoll='define' d_strctcpy='define' d_strerrm='strerror(e)' d_strerror='define' +d_strftime='define' d_strtod='define' d_strtol='define' d_strtold='undef' @@ -415,7 +416,7 @@ dlext='so' dlsrc='dl_dlopen.xs' doublesize='8' drand01='drand48()' -dynamic_ext='B ByteLoader Cwd DB_File Data/Dumper Devel/DProf Devel/Peek Digest/MD5 Encode Fcntl File/Glob Filter/Util/Call IO IPC/SysV MIME/Base64 NDBM_File ODBM_File Opcode POSIX PerlIO/Scalar PerlIO/Via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Thread XS/Typemap attrs re' +dynamic_ext='B ByteLoader Cwd DB_File Data/Dumper Devel/DProf Devel/Peek Digest/MD5 Encode Fcntl File/Glob Filter/Util/Call IO IPC/SysV List/Util MIME/Base64 NDBM_File ODBM_File Opcode POSIX PerlIO/Scalar PerlIO/Via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Thread Time/HiRes XS/Typemap attrs re' eagain='EAGAIN' ebcdic='undef' echo='echo' @@ -424,7 +425,7 @@ emacs='' eunicefix=':' exe_ext='' expr='expr' -extensions='B ByteLoader Cwd DB_File Data/Dumper Devel/DProf Devel/Peek Digest/MD5 Encode Fcntl File/Glob Filter/Util/Call IO IPC/SysV MIME/Base64 NDBM_File ODBM_File Opcode POSIX PerlIO/Scalar PerlIO/Via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Thread XS/Typemap attrs re Errno' +extensions='B ByteLoader Cwd DB_File Data/Dumper Devel/DProf Devel/Peek Digest/MD5 Encode Fcntl File/Glob Filter/Util/Call IO IPC/SysV List/Util MIME/Base64 NDBM_File ODBM_File Opcode POSIX PerlIO/Scalar PerlIO/Via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Thread Time/HiRes XS/Typemap attrs re Errno' fflushNULL='define' fflushall='undef' find='' @@ -564,7 +565,7 @@ issymlink='test -h' ivdformat='"ld"' ivsize='8' ivtype='long' -known_extensions='B ByteLoader Cwd DB_File Data/Dumper Devel/DProf Devel/Peek Digest/MD5 Encode Fcntl File/Glob Filter/Util/Call GDBM_File IO IPC/SysV MIME/Base64 NDBM_File ODBM_File Opcode POSIX PerlIO/Scalar PerlIO/Via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Thread XS/Typemap attrs re' +known_extensions='B ByteLoader Cwd DB_File Data/Dumper Devel/DProf Devel/Peek Digest/MD5 Encode Fcntl File/Glob Filter/Util/Call GDBM_File IO IPC/SysV List/Util MIME/Base64 NDBM_File ODBM_File Opcode POSIX PerlIO/Scalar PerlIO/Via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Thread Time/HiRes XS/Typemap attrs re' ksh='' ld='ld' lddlflags='-shared -expect_unresolved "*" -msym -std -s' diff --git a/Porting/config_H b/Porting/config_H index 7f3f8abfa0..98150fcfba 100644 --- a/Porting/config_H +++ b/Porting/config_H @@ -17,7 +17,7 @@ /* * Package name : perl5 * Source directory : . - * Configuration time: Sun Apr 8 02:05:27 EET DST 2001 + * Configuration time: Thu Apr 19 03:59:37 EET DST 2001 * Configured by : jhi * Target system : osf1 alpha.hut.fi v4.0 878 alpha */ @@ -3326,6 +3326,12 @@ */ /*#define HAS_SOCKATMARK / **/ +/* HAS_STRFTIME: + * This symbol, if defined, indicates that the strftime routine is + * available to do time formatting. + */ +#define HAS_STRFTIME /**/ + /* U32_ALIGNMENT_REQUIRED: * This symbol, if defined, indicates that you must access * character data through U32-aligned pointers. diff --git a/config_h.SH b/config_h.SH index 0b828e6fa1..9188b7991c 100644 --- a/config_h.SH +++ b/config_h.SH @@ -3346,6 +3346,12 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un */ #$d_sockatmark HAS_SOCKATMARK /**/ +/* HAS_STRFTIME: + * This symbol, if defined, indicates that the strftime routine is + * available to do time formatting. + */ +#$d_strftime HAS_STRFTIME /**/ + /* U32_ALIGNMENT_REQUIRED: * This symbol, if defined, indicates that you must access * character data through U32-aligned pointers. diff --git a/configure.com b/configure.com index fa06d20efb..ff86731ff2 100644 --- a/configure.com +++ b/configure.com @@ -5158,6 +5158,7 @@ $ WC "d_strcoll='" + d_strcoll + "'" $ WC "d_strctcpy='define'" $ WC "d_strerrm='strerror((e),vaxc$errno)'" $ WC "d_strerror='define'" +$ WC "d_strftime='define'" $ WC "d_strtod='define'" $ WC "d_strtol='define'" $ WC "d_strtold='" + d_strtold + "'" @@ -439,6 +439,7 @@ #endif #define my_setenv Perl_my_setenv #define my_stat Perl_my_stat +#define my_strftime Perl_my_strftime #if defined(MYSWAP) #define my_swap Perl_my_swap #define my_htonl Perl_my_htonl @@ -1934,6 +1935,7 @@ #endif #define my_setenv(a,b) Perl_my_setenv(aTHX_ a,b) #define my_stat() Perl_my_stat(aTHX) +#define my_strftime(a,b,c,d,e,f,g,h,i,j) Perl_my_strftime(aTHX_ a,b,c,d,e,f,g,h,i,j) #if defined(MYSWAP) #define my_swap(a) Perl_my_swap(aTHX_ a) #define my_htonl(a) Perl_my_htonl(aTHX_ a) @@ -3786,6 +3788,8 @@ #define my_setenv Perl_my_setenv #define Perl_my_stat CPerlObj::Perl_my_stat #define my_stat Perl_my_stat +#define Perl_my_strftime CPerlObj::Perl_my_strftime +#define my_strftime Perl_my_strftime #if defined(MYSWAP) #define Perl_my_swap CPerlObj::Perl_my_swap #define my_swap Perl_my_swap @@ -1778,6 +1778,7 @@ Ap |PerlIO*|my_popen_list |char* mode|int n|SV ** args #endif Ap |void |my_setenv |char* nam|char* val Ap |I32 |my_stat +p |char * |my_strftime |char *fmt|int sec|int min|int hour|int mday|int mon|int year|int wday|int yday|int isdst #if defined(MYSWAP) Ap |short |my_swap |short s Ap |long |my_htonl |long l diff --git a/epoc/config.sh b/epoc/config.sh index 90b7e70db4..0b5fa90281 100644 --- a/epoc/config.sh +++ b/epoc/config.sh @@ -347,6 +347,7 @@ d_strcoll='define' d_strctcpy='define' d_strerrm='strerror(e)' d_strerror='define' +d_strftime='define' d_strtod='define' d_strtol='define' d_strtoq='undef' diff --git a/ext/POSIX/POSIX.xs b/ext/POSIX/POSIX.xs index 7658b39269..3e273b0792 100644 --- a/ext/POSIX/POSIX.xs +++ b/ext/POSIX/POSIX.xs @@ -3665,65 +3665,9 @@ strftime(fmt, sec, min, hour, mday, mon, year, wday = -1, yday = -1, isdst = -1) int isdst CODE: { - char tmpbuf[128]; - struct tm mytm; - int len; - init_tm(&mytm); /* XXX workaround - see init_tm() above */ - mytm.tm_sec = sec; - mytm.tm_min = min; - mytm.tm_hour = hour; - mytm.tm_mday = mday; - mytm.tm_mon = mon; - mytm.tm_year = year; - mytm.tm_wday = wday; - mytm.tm_yday = yday; - mytm.tm_isdst = isdst; - mini_mktime(&mytm); - len = strftime(tmpbuf, sizeof tmpbuf, fmt, &mytm); - /* - ** The following is needed to handle to the situation where - ** tmpbuf overflows. Basically we want to allocate a buffer - ** and try repeatedly. The reason why it is so complicated - ** is that getting a return value of 0 from strftime can indicate - ** one of the following: - ** 1. buffer overflowed, - ** 2. illegal conversion specifier, or - ** 3. the format string specifies nothing to be returned(not - ** an error). This could be because format is an empty string - ** or it specifies %p that yields an empty string in some locale. - ** If there is a better way to make it portable, go ahead by - ** all means. - */ - if ((len > 0 && len < sizeof(tmpbuf)) || (len == 0 && *fmt == '\0')) - ST(0) = sv_2mortal(newSVpv(tmpbuf, len)); - else { - /* Possibly buf overflowed - try again with a bigger buf */ - int fmtlen = strlen(fmt); - int bufsize = fmtlen + sizeof(tmpbuf); - char* buf; - int buflen; - - New(0, buf, bufsize, char); - while (buf) { - buflen = strftime(buf, bufsize, fmt, &mytm); - if (buflen > 0 && buflen < bufsize) - break; - /* heuristic to prevent out-of-memory errors */ - if (bufsize > 100*fmtlen) { - Safefree(buf); - buf = NULL; - break; - } - bufsize *= 2; - Renew(buf, bufsize, char); - } - if (buf) { - ST(0) = sv_2mortal(newSVpvn(buf, buflen)); - Safefree(buf); - } - else - ST(0) = sv_2mortal(newSVpvn(tmpbuf, len)); - } + char *buf = my_strftime(fmt, sec, min, hour, mday, mon, year, wday, yday, isdst); + ST(0) = sv_2mortal(newSVpv(buf, 0)); + free(buf); } void @@ -505,6 +505,7 @@ PERL_CALLCONV PerlIO* Perl_my_popen_list(pTHX_ char* mode, int n, SV ** args); #endif PERL_CALLCONV void Perl_my_setenv(pTHX_ char* nam, char* val); PERL_CALLCONV I32 Perl_my_stat(pTHX); +PERL_CALLCONV char * Perl_my_strftime(pTHX_ char *fmt, int sec, int min, int hour, int mday, int mon, int year, int wday, int yday, int isdst); #if defined(MYSWAP) PERL_CALLCONV short Perl_my_swap(pTHX_ short s); PERL_CALLCONV long Perl_my_htonl(pTHX_ long l); @@ -3322,6 +3322,12 @@ */ /*#define HAS_SOCKATMARK / **/ +/* HAS_STRFTIME: + * This symbol, if defined, indicates that the strftime routine is + * available to do time formatting. + */ +/*#define HAS_STRFTIME / **/ + /* U32_ALIGNMENT_REQUIRED: * This symbol, if defined, indicates that you must access * character data through U32-aligned pointers. diff --git a/uconfig.sh b/uconfig.sh index 9ded43bed0..ed31a3daf3 100755 --- a/uconfig.sh +++ b/uconfig.sh @@ -291,6 +291,7 @@ d_strcoll='undef' d_strctcpy='undef' d_strerrm='strerror(e)' d_strerror='undef' +d_strftime='undef' d_strtod='undef' d_strtol='undef' d_strtold='undef' @@ -4361,3 +4361,69 @@ mini_mktime(struct tm *ptm) if ((unsigned)ptm->tm_wday > 6) ptm->tm_wday = (jday + WEEKDAY_BIAS) % 7; } + +char * +my_strftime(char *fmt, int sec, int min, int hour, int mday, int mon, int year, int wday, int yday, int isdst) +{ +#ifdef HAS_STRFTIME + char *buf; + int buflen; + struct tm mytm; + int len; + + init_tm(&mytm); /* XXX workaround - see init_tm() above */ + mytm.tm_sec = sec; + mytm.tm_min = min; + mytm.tm_hour = hour; + mytm.tm_mday = mday; + mytm.tm_mon = mon; + mytm.tm_year = year; + mytm.tm_wday = wday; + mytm.tm_yday = yday; + mytm.tm_isdst = isdst; + mini_mktime(&mytm); + buflen = 64; + New(0, buf, buflen, char); + len = strftime(buf, buflen, fmt, &mytm); + /* + ** The following is needed to handle to the situation where + ** tmpbuf overflows. Basically we want to allocate a buffer + ** and try repeatedly. The reason why it is so complicated + ** is that getting a return value of 0 from strftime can indicate + ** one of the following: + ** 1. buffer overflowed, + ** 2. illegal conversion specifier, or + ** 3. the format string specifies nothing to be returned(not + ** an error). This could be because format is an empty string + ** or it specifies %p that yields an empty string in some locale. + ** If there is a better way to make it portable, go ahead by + ** all means. + */ + if ((len > 0 && len < buflen) || (len == 0 && *fmt == '\0')) + return buf; + else { + /* Possibly buf overflowed - try again with a bigger buf */ + int fmtlen = strlen(fmt); + int bufsize = fmtlen + buflen; + + New(0, buf, bufsize, char); + while (buf) { + buflen = strftime(buf, bufsize, fmt, &mytm); + if (buflen > 0 && buflen < bufsize) + break; + /* heuristic to prevent out-of-memory errors */ + if (bufsize > 100*fmtlen) { + Safefree(buf); + buf = NULL; + break; + } + bufsize *= 2; + Renew(buf, bufsize, char); + } + return buf; + } +#else + Perl_croak(aTHX_ "panic: no strftime"); +#endif +} + diff --git a/vos/config.alpha.def b/vos/config.alpha.def index 1242114a1f..a6f03b341c 100644 --- a/vos/config.alpha.def +++ b/vos/config.alpha.def @@ -258,6 +258,7 @@ $d_strcoll='define' $d_strctcpy='define' $d_strerrm='strerror(e)' $d_strerror='define' +$d_strftime='define' $d_strtod='define' $d_strtol='define' $d_strtold='undef' diff --git a/vos/config.alpha.h b/vos/config.alpha.h index c4291f9fa2..774abae1e6 100644 --- a/vos/config.alpha.h +++ b/vos/config.alpha.h @@ -3329,4 +3329,10 @@ */ #define U32_ALIGNMENT_REQUIRED /**/ +/* HAS_STRFTIME: + * This symbol, if defined, indicates that the strftime routine is + * available to do time formatting. + */ +#define HAS_STRFTIME /**/ + #endif diff --git a/vos/config.ga.def b/vos/config.ga.def index 63d2aa9882..402428dc3a 100644 --- a/vos/config.ga.def +++ b/vos/config.ga.def @@ -258,6 +258,7 @@ $d_strcoll='define' $d_strctcpy='define' $d_strerrm='strerror(e)' $d_strerror='define' +$d_strftime='define' $d_strtod='define' $d_strtol='define' $d_strtold='undef' diff --git a/vos/config.ga.h b/vos/config.ga.h index 642b65b26d..da40b86011 100644 --- a/vos/config.ga.h +++ b/vos/config.ga.h @@ -3329,4 +3329,10 @@ */ #define U32_ALIGNMENT_REQUIRED /**/ +/* HAS_STRFTIME: + * This symbol, if defined, indicates that the strftime routine is + * available to do time formatting. + */ +#define HAS_STRFTIME /**/ + #endif diff --git a/win32/config.bc b/win32/config.bc index b859846f97..81722b57bf 100644 --- a/win32/config.bc +++ b/win32/config.bc @@ -343,6 +343,7 @@ d_strcoll='define' d_strctcpy='define' d_strerrm='strerror(e)' d_strerror='define' +d_strftime='define' d_strtod='define' d_strtol='define' d_strtold='undef' diff --git a/win32/config.gc b/win32/config.gc index e3bd4683ac..de62f2be09 100644 --- a/win32/config.gc +++ b/win32/config.gc @@ -343,6 +343,7 @@ d_strcoll='define' d_strctcpy='define' d_strerrm='strerror(e)' d_strerror='define' +d_strftime='define' d_strtod='define' d_strtol='define' d_strtold='undef' diff --git a/win32/config.vc b/win32/config.vc index 0495fd5b50..6ae23cbc9d 100644 --- a/win32/config.vc +++ b/win32/config.vc @@ -343,6 +343,7 @@ d_strcoll='define' d_strctcpy='define' d_strerrm='strerror(e)' d_strerror='define' +d_strftime='define' d_strtod='define' d_strtol='define' d_strtold='undef' |