]> sourceware.org Git - newlib-cygwin.git/commitdiff
* libc: Add subdirectory.
authorCorinna Vinschen <corinna@vinschen.de>
Fri, 18 Nov 2005 17:48:23 +0000 (17:48 +0000)
committerCorinna Vinschen <corinna@vinschen.de>
Fri, 18 Nov 2005 17:48:23 +0000 (17:48 +0000)
* Makefile.in (VPATH): Add libc subdir.
(DLL_OFILES): Add strptime.o and timelocal.o.
* cygwin.din: Export timelocal and timegm.
* localtime.cc: Define STD_INSPIRED unconditionally.
* include/cygwin/time.h (timelocal): Add declaration.
(timegm): Ditto.
* include/cygwin/version.h: Bump API minor version.
* libc/strptime.cc: New file.
* libc/timelocal.cc: New file.
* libc/timelocal.h: New file.

winsup/cygwin/ChangeLog
winsup/cygwin/Makefile.in
winsup/cygwin/cygwin.din
winsup/cygwin/include/cygwin/time.h
winsup/cygwin/include/cygwin/version.h
winsup/cygwin/libc/strptime.cc [new file with mode: 0644]
winsup/cygwin/libc/timelocal.cc [new file with mode: 0644]
winsup/cygwin/libc/timelocal.h [new file with mode: 0644]
winsup/cygwin/localtime.cc

index 24d7b182c966c44a18989618b42869128745af84..c8c73679ef0b3b2999a21b7ebb91f5af7f61fe1f 100644 (file)
@@ -1,3 +1,17 @@
+2005-11-18  Corinna Vinschen  <corinna@vinschen.de>
+
+       * libc: Add subdirectory.
+       * Makefile.in (VPATH): Add libc subdir.
+       (DLL_OFILES): Add strptime.o and timelocal.o.
+       * cygwin.din: Export timelocal and timegm.
+       * localtime.cc: Define STD_INSPIRED unconditionally.
+       * include/cygwin/time.h (timelocal): Add declaration.
+       (timegm): Ditto.
+       * include/cygwin/version.h: Bump API minor version.
+       * libc/strptime.cc: New file.
+       * libc/timelocal.cc: New file.
+       * libc/timelocal.h: New file.
+
 2005-11-18  Christopher Faylor  <cgf@timesys.com>
 
        * include/cygwin/sys_time.h: Move futimes and lutimes declaration here
index f0711acc44eccb55b215103594ea318ca7ec08ac..665257c631e61ea32d6ce8e16bd2c59e948b51dc 100644 (file)
@@ -14,7 +14,7 @@ srcdir:=@srcdir@
 objdir:=.
 
 CONFIG_DIR:=$(srcdir)/config/@CONFIG_DIR@
-VPATH:=$(srcdir):$(CONFIG_DIR):$(srcdir)/regex:$(srcdir)/regexp:$(srcdir)/lib
+VPATH:=$(srcdir):$(CONFIG_DIR):$(srcdir)/regex:$(srcdir)/regexp:$(srcdir)/lib:$(srcdir)/libc
 
 target_alias:=@target_alias@
 build_alias:=@build_alias@
@@ -138,10 +138,10 @@ DLL_OFILES:=assert.o autoload.o bsdlib.o ctype.o cxx.o cygheap.o cygthread.o \
        nftw.o ntea.o passwd.o path.o pinfo.o pipe.o poll.o pthread.o regcomp.o \
        regerror.o regexec.o regfree.o registry.o resource.o scandir.o sched.o \
        sec_acl.o sec_helper.o security.o select.o sem.o shared.o shm.o \
-       sigfe.o signal.o sigproc.o smallprint.o spawn.o strace.o strsep.o \
-       strsig.o sync.o syscalls.o sysconf.o syslog.o termios.o thread.o \
-       timer.o times.o tty.o uinfo.o uname.o v8_regexp.o v8_regerror.o \
-       v8_regsub.o wait.o wincap.o window.o \
+       sigfe.o signal.o sigproc.o smallprint.o spawn.o strace.o strptime.o \
+       strsep.o strsig.o sync.o syscalls.o sysconf.o syslog.o termios.o thread.o \
+       timelocal.o timer.o times.o tty.o uinfo.o uname.o v8_regexp.o \
+       v8_regerror.o v8_regsub.o wait.o wincap.o window.o \
        $(EXTRA_DLL_OFILES) $(EXTRA_OFILES) $(MALLOC_OFILES) $(MT_SAFE_OBJECTS)
 
 GMON_OFILES:=gmon.o mcount.o profil.o
index 82fea5f02e9ebcd7a21ff851fe77bb00684ca26e..33cda29284c7f062de12a1637c293b122189e431 100644 (file)
@@ -1470,6 +1470,8 @@ tfind NOSIGFE
 tgamma NOSIGFE
 tgammaf NOSIGFE
 time SIGFE
+timelocal SIGFE
+timegm SIGFE
 _time = time SIGFE
 timer_create SIGFE
 timer_delete SIGFE
index 238f779f3fa58a4620cfd03f631e500be2c71d76..83a8e62f84ac6958015367b9d3b6065a89f8f49b 100644 (file)
@@ -19,6 +19,10 @@ int nanosleep (const struct timespec  *, struct timespec *);
 int clock_setres (clockid_t, struct timespec *);
 int clock_getres (clockid_t, struct timespec *);
 
+/* GNU extensions. */
+time_t timelocal (struct tm *);
+time_t timegm (struct tm *);
+
 #define TIMER_RELTIME  0 /* For compatibility with HP/UX, Solaris, others? */
 
 #ifndef __STRICT_ANSI__
index 057ea091beb94b3a673b3ff7b3400418595e026f..403d7921b1bd00d5d2d185e4a0367095d5bb51dd 100644 (file)
@@ -281,12 +281,13 @@ details. */
       141: Export futimes, lutimes.
       142: Export memmem
       143: Export clock_getres, clock_setres
+      144: Export timelocal, timegm.
      */
 
      /* Note that we forgot to bump the api for ualarm, strtoll, strtoull */
 
 #define CYGWIN_VERSION_API_MAJOR 0
-#define CYGWIN_VERSION_API_MINOR 143
+#define CYGWIN_VERSION_API_MINOR 144
 
      /* There is also a compatibity version number associated with the
        shared memory regions.  It is incremented when incompatible
diff --git a/winsup/cygwin/libc/strptime.cc b/winsup/cygwin/libc/strptime.cc
new file mode 100644 (file)
index 0000000..007815c
--- /dev/null
@@ -0,0 +1,543 @@
+/*
+ * Powerdog Industries kindly requests feedback from anyone modifying
+ * this function:
+ *
+ * Date: Thu, 05 Jun 1997 23:17:17 -0400  
+ * From: Kevin Ruddy <kevin.ruddy@powerdog.com>
+ * To: James FitzGibbon <james@nexis.net>
+ * Subject: Re: Use of your strptime(3) code (fwd)
+ * 
+ * The reason for the "no mod" clause was so that modifications would
+ * come back and we could integrate them and reissue so that a wider 
+ * audience could use it (thereby spreading the wealth).  This has   
+ * made it possible to get strptime to work on many operating systems.
+ * I'm not sure why that's "plain unacceptable" to the FreeBSD team.
+ * 
+ * Anyway, you can change it to "with or without modification" as
+ * you see fit.  Enjoy.                                          
+ * 
+ * Kevin Ruddy
+ * Powerdog Industries, Inc.
+ */
+/*
+ * Copyright (c) 1994 Powerdog Industries.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer
+ *    in the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgement:
+ *      This product includes software developed by Powerdog Industries.
+ * 4. The name of Powerdog Industries may not be used to endorse or
+ *    promote products derived from this software without specific prior
+ *    written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY POWERDOG INDUSTRIES ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE POWERDOG INDUSTRIES BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+#ifdef __CYGWIN__
+#include "winsup.h"
+#else
+#ifndef lint
+#ifndef NOID
+static char copyright[] __unused =
+"@(#) Copyright (c) 1994 Powerdog Industries.  All rights reserved.";
+static char sccsid[] __unused = "@(#)strptime.c        0.1 (Powerdog) 94/03/27";
+#endif /* !defined NOID */
+#endif /* not lint */
+__FBSDID("$FreeBSD: /repoman/r/ncvs/src/lib/libc/stdtime/strptime.c,v 1.35 2003/11/17 04:19:15 nectar Exp $");
+
+#include "namespace.h"
+#endif
+#include <time.h>
+#include <ctype.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#ifndef __CYGWIN__
+#include <pthread.h>
+#include "un-namespace.h"
+#include "libc_private.h"
+#endif
+#include "timelocal.h"
+
+static char * _strptime(const char *, const char *, struct tm *, int *);
+
+#define asizeof(a)     ((int)(sizeof (a) / sizeof ((a)[0])))
+
+static char *
+_strptime(const char *buf, const char *fmt, struct tm *tm, int *GMTp)
+{
+       char    c;
+       const char *ptr;
+       int     i,
+               len;
+       int Ealternative, Oalternative;
+       struct lc_time_T *tptr = __get_current_time_locale();
+
+       ptr = fmt;
+       while (*ptr != 0) {
+               if (*buf == 0)
+                       break;
+
+               c = *ptr++;
+
+               if (c != '%') {
+                       if (isspace((unsigned char)c))
+                               while (*buf != 0 && isspace((unsigned char)*buf))
+                                       buf++;
+                       else if (c != *buf++)
+                               return 0;
+                       continue;
+               }
+
+               Ealternative = 0;
+               Oalternative = 0;
+label:
+               c = *ptr++;
+               switch (c) {
+               case 0:
+               case '%':
+                       if (*buf++ != '%')
+                               return 0;
+                       break;
+
+               case '+':
+                       buf = _strptime(buf, tptr->date_fmt, tm, GMTp);
+                       if (buf == 0)
+                               return 0;
+                       break;
+
+               case 'C':
+                       if (!isdigit((unsigned char)*buf))
+                               return 0;
+
+                       /* XXX This will break for 3-digit centuries. */
+                       len = 2;
+                       for (i = 0; len && *buf != 0 && isdigit((unsigned char)*buf); buf++) {
+                               i *= 10;
+                               i += *buf - '0';
+                               len--;
+                       }
+                       if (i < 19)
+                               return 0;
+
+                       tm->tm_year = i * 100 - 1900;
+                       break;
+
+               case 'c':
+                       buf = _strptime(buf, tptr->c_fmt, tm, GMTp);
+                       if (buf == 0)
+                               return 0;
+                       break;
+
+               case 'D':
+                       buf = _strptime(buf, "%m/%d/%y", tm, GMTp);
+                       if (buf == 0)
+                               return 0;
+                       break;
+
+               case 'E':
+                       if (Ealternative || Oalternative)
+                               break;
+                       Ealternative++;
+                       goto label;
+
+               case 'O':
+                       if (Ealternative || Oalternative)
+                               break;
+                       Oalternative++;
+                       goto label;
+
+               case 'F':
+                       buf = _strptime(buf, "%Y-%m-%d", tm, GMTp);
+                       if (buf == 0)
+                               return 0;
+                       break;
+
+               case 'R':
+                       buf = _strptime(buf, "%H:%M", tm, GMTp);
+                       if (buf == 0)
+                               return 0;
+                       break;
+
+               case 'r':
+                       buf = _strptime(buf, tptr->ampm_fmt, tm, GMTp);
+                       if (buf == 0)
+                               return 0;
+                       break;
+
+               case 'T':
+                       buf = _strptime(buf, "%H:%M:%S", tm, GMTp);
+                       if (buf == 0)
+                               return 0;
+                       break;
+
+               case 'X':
+                       buf = _strptime(buf, tptr->X_fmt, tm, GMTp);
+                       if (buf == 0)
+                               return 0;
+                       break;
+
+               case 'x':
+                       buf = _strptime(buf, tptr->x_fmt, tm, GMTp);
+                       if (buf == 0)
+                               return 0;
+                       break;
+
+               case 'j':
+                       if (!isdigit((unsigned char)*buf))
+                               return 0;
+
+                       len = 3;
+                       for (i = 0; len && *buf != 0 && isdigit((unsigned char)*buf); buf++) {
+                               i *= 10;
+                               i += *buf - '0';
+                               len--;
+                       }
+                       if (i < 1 || i > 366)
+                               return 0;
+
+                       tm->tm_yday = i - 1;
+                       break;
+
+               case 'M':
+               case 'S':
+                       if (*buf == 0 || isspace((unsigned char)*buf))
+                               break;
+
+                       if (!isdigit((unsigned char)*buf))
+                               return 0;
+
+                       len = 2;
+                       for (i = 0; len && *buf != 0 && isdigit((unsigned char)*buf); buf++) {
+                               i *= 10;
+                               i += *buf - '0';
+                               len--;
+                       }
+
+                       if (c == 'M') {
+                               if (i > 59)
+                                       return 0;
+                               tm->tm_min = i;
+                       } else {
+                               if (i > 60)
+                                       return 0;
+                               tm->tm_sec = i;
+                       }
+
+                       if (*buf != 0 && isspace((unsigned char)*buf))
+                               while (*ptr != 0 && !isspace((unsigned char)*ptr))
+                                       ptr++;
+                       break;
+
+               case 'H':
+               case 'I':
+               case 'k':
+               case 'l':
+                       /*
+                        * Of these, %l is the only specifier explicitly
+                        * documented as not being zero-padded.  However,
+                        * there is no harm in allowing zero-padding.
+                        *
+                        * XXX The %l specifier may gobble one too many
+                        * digits if used incorrectly.
+                        */
+                       if (!isdigit((unsigned char)*buf))
+                               return 0;
+
+                       len = 2;
+                       for (i = 0; len && *buf != 0 && isdigit((unsigned char)*buf); buf++) {
+                               i *= 10;
+                               i += *buf - '0';
+                               len--;
+                       }
+                       if (c == 'H' || c == 'k') {
+                               if (i > 23)
+                                       return 0;
+                       } else if (i > 12)
+                               return 0;
+
+                       tm->tm_hour = i;
+
+                       if (*buf != 0 && isspace((unsigned char)*buf))
+                               while (*ptr != 0 && !isspace((unsigned char)*ptr))
+                                       ptr++;
+                       break;
+
+               case 'p':
+                       /*
+                        * XXX This is bogus if parsed before hour-related
+                        * specifiers.
+                        */
+                       len = strlen(tptr->am);
+                       if (strncasecmp(buf, tptr->am, len) == 0) {
+                               if (tm->tm_hour > 12)
+                                       return 0;
+                               if (tm->tm_hour == 12)
+                                       tm->tm_hour = 0;
+                               buf += len;
+                               break;
+                       }
+
+                       len = strlen(tptr->pm);
+                       if (strncasecmp(buf, tptr->pm, len) == 0) {
+                               if (tm->tm_hour > 12)
+                                       return 0;
+                               if (tm->tm_hour != 12)
+                                       tm->tm_hour += 12;
+                               buf += len;
+                               break;
+                       }
+
+                       return 0;
+
+               case 'A':
+               case 'a':
+                       for (i = 0; i < asizeof(tptr->weekday); i++) {
+                               len = strlen(tptr->weekday[i]);
+                               if (strncasecmp(buf, tptr->weekday[i],
+                                               len) == 0)
+                                       break;
+                               len = strlen(tptr->wday[i]);
+                               if (strncasecmp(buf, tptr->wday[i],
+                                               len) == 0)
+                                       break;
+                       }
+                       if (i == asizeof(tptr->weekday))
+                               return 0;
+
+                       tm->tm_wday = i;
+                       buf += len;
+                       break;
+
+               case 'U':
+               case 'W':
+                       /*
+                        * XXX This is bogus, as we can not assume any valid
+                        * information present in the tm structure at this
+                        * point to calculate a real value, so just check the
+                        * range for now.
+                        */
+                       if (!isdigit((unsigned char)*buf))
+                               return 0;
+
+                       len = 2;
+                       for (i = 0; len && *buf != 0 && isdigit((unsigned char)*buf); buf++) {
+                               i *= 10;
+                               i += *buf - '0';
+                               len--;
+                       }
+                       if (i > 53)
+                               return 0;
+
+                       if (*buf != 0 && isspace((unsigned char)*buf))
+                               while (*ptr != 0 && !isspace((unsigned char)*ptr))
+                                       ptr++;
+                       break;
+
+               case 'w':
+                       if (!isdigit((unsigned char)*buf))
+                               return 0;
+
+                       i = *buf - '0';
+                       if (i > 6)
+                               return 0;
+
+                       tm->tm_wday = i;
+
+                       if (*buf != 0 && isspace((unsigned char)*buf))
+                               while (*ptr != 0 && !isspace((unsigned char)*ptr))
+                                       ptr++;
+                       break;
+
+               case 'd':
+               case 'e':
+                       /*
+                        * The %e specifier is explicitly documented as not
+                        * being zero-padded but there is no harm in allowing
+                        * such padding.
+                        *
+                        * XXX The %e specifier may gobble one too many
+                        * digits if used incorrectly.
+                        */
+                       if (!isdigit((unsigned char)*buf))
+                               return 0;
+
+                       len = 2;
+                       for (i = 0; len && *buf != 0 && isdigit((unsigned char)*buf); buf++) {
+                               i *= 10;
+                               i += *buf - '0';
+                               len--;
+                       }
+                       if (i > 31)
+                               return 0;
+
+                       tm->tm_mday = i;
+
+                       if (*buf != 0 && isspace((unsigned char)*buf))
+                               while (*ptr != 0 && !isspace((unsigned char)*ptr))
+                                       ptr++;
+                       break;
+
+               case 'B':
+               case 'b':
+               case 'h':
+                       for (i = 0; i < asizeof(tptr->month); i++) {
+                               if (Oalternative) {
+                                       if (c == 'B') {
+                                               len = strlen(tptr->alt_month[i]);
+                                               if (strncasecmp(buf,
+                                                               tptr->alt_month[i],
+                                                               len) == 0)
+                                                       break;
+                                       }
+                               } else {
+                                       len = strlen(tptr->month[i]);
+                                       if (strncasecmp(buf, tptr->month[i],
+                                                       len) == 0)
+                                               break;
+                                       len = strlen(tptr->mon[i]);
+                                       if (strncasecmp(buf, tptr->mon[i],
+                                                       len) == 0)
+                                               break;
+                               }
+                       }
+                       if (i == asizeof(tptr->month))
+                               return 0;
+
+                       tm->tm_mon = i;
+                       buf += len;
+                       break;
+
+               case 'm':
+                       if (!isdigit((unsigned char)*buf))
+                               return 0;
+
+                       len = 2;
+                       for (i = 0; len && *buf != 0 && isdigit((unsigned char)*buf); buf++) {
+                               i *= 10;
+                               i += *buf - '0';
+                               len--;
+                       }
+                       if (i < 1 || i > 12)
+                               return 0;
+
+                       tm->tm_mon = i - 1;
+
+                       if (*buf != 0 && isspace((unsigned char)*buf))
+                               while (*ptr != 0 && !isspace((unsigned char)*ptr))
+                                       ptr++;
+                       break;
+
+               case 's':
+                       {
+                       char *cp;
+                       int sverrno;
+                       long n;
+                       time_t t;
+
+                       sverrno = errno;
+                       errno = 0;
+                       n = strtol(buf, &cp, 10);
+                       if (errno == ERANGE || (long)(t = n) != n) {
+                               errno = sverrno;
+                               return 0;
+                       }
+                       errno = sverrno;
+                       buf = cp;
+                       gmtime_r(&t, tm);
+                       *GMTp = 1;
+                       }
+                       break;
+
+               case 'Y':
+               case 'y':
+                       if (*buf == 0 || isspace((unsigned char)*buf))
+                               break;
+
+                       if (!isdigit((unsigned char)*buf))
+                               return 0;
+
+                       len = (c == 'Y') ? 4 : 2;
+                       for (i = 0; len && *buf != 0 && isdigit((unsigned char)*buf); buf++) {
+                               i *= 10;
+                               i += *buf - '0';
+                               len--;
+                       }
+                       if (c == 'Y')
+                               i -= 1900;
+                       if (c == 'y' && i < 69)
+                               i += 100;
+                       if (i < 0)
+                               return 0;
+
+                       tm->tm_year = i;
+
+                       if (*buf != 0 && isspace((unsigned char)*buf))
+                               while (*ptr != 0 && !isspace((unsigned char)*ptr))
+                                       ptr++;
+                       break;
+
+               case 'Z':
+                       {
+                       const char *cp;
+                       char *zonestr;
+
+                       for (cp = buf; *cp && isupper((unsigned char)*cp); ++cp) {/*empty*/}
+                       if (cp - buf) {
+                               zonestr = (char *) alloca(cp - buf + 1);
+                               strncpy(zonestr, buf, cp - buf);
+                               zonestr[cp - buf] = '\0';
+                               tzset();
+                               if (0 == strcmp(zonestr, "GMT")) {
+                                   *GMTp = 1;
+                               } else if (0 == strcmp(zonestr, tzname[0])) {
+                                   tm->tm_isdst = 0;
+                               } else if (0 == strcmp(zonestr, tzname[1])) {
+                                   tm->tm_isdst = 1;
+                               } else {
+                                   return 0;
+                               }
+                               buf += cp - buf;
+                       }
+                       }
+                       break;
+               }
+       }
+       return (char *)buf;
+}
+
+extern "C" char *
+strptime(const char * __restrict buf, const char * __restrict fmt,
+    struct tm * __restrict tm)
+{
+       char *ret;
+       int gmt;
+
+       gmt = 0;
+       ret = _strptime(buf, fmt, tm, &gmt);
+       if (ret && gmt) {
+               time_t t = timegm(tm);
+               localtime_r(&t, tm);
+       }
+
+       return (ret);
+}
diff --git a/winsup/cygwin/libc/timelocal.cc b/winsup/cygwin/libc/timelocal.cc
new file mode 100644 (file)
index 0000000..c268a29
--- /dev/null
@@ -0,0 +1,125 @@
+/*-
+ * Copyright (c) 2001 Alexey Zelkin <phantom@FreeBSD.org>
+ * Copyright (c) 1997 FreeBSD Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+//__FBSDID("$FreeBSD: /repoman/r/ncvs/src/lib/libc/stdtime/timelocal.c,v 1.25 2003/06/13 00:14:07 jkh Exp $");
+
+#include <stddef.h>
+
+//#include "ldpart.h"
+#include "timelocal.h"
+
+#ifndef __CYGWIN__
+static struct lc_time_T _time_locale;
+static int _time_using_locale;
+static char *time_locale_buf;
+#endif
+
+#define LCTIME_SIZE (sizeof(struct lc_time_T) / sizeof(char *))
+
+static const struct lc_time_T  _C_time_locale = {
+       {
+               "Jan", "Feb", "Mar", "Apr", "May", "Jun",
+               "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
+       }, {
+               "January", "February", "March", "April", "May", "June",
+               "July", "August", "September", "October", "November", "December"
+       }, {
+               "Sun", "Mon", "Tue", "Wed",
+               "Thu", "Fri", "Sat"
+       }, {
+               "Sunday", "Monday", "Tuesday", "Wednesday",
+               "Thursday", "Friday", "Saturday"
+       },
+
+       /* X_fmt */
+       "%H:%M:%S",
+
+       /*
+        * x_fmt
+        * Since the C language standard calls for
+        * "date, using locale's date format," anything goes.
+        * Using just numbers (as here) makes Quakers happier;
+        * it's also compatible with SVR4.
+        */
+       "%m/%d/%y",
+
+       /*
+        * c_fmt
+        */
+       "%a %b %e %H:%M:%S %Y",
+
+       /* am */
+       "AM",
+
+       /* pm */
+       "PM",
+
+       /* date_fmt */
+       "%a %b %e %H:%M:%S %Z %Y",
+       
+       /* alt_month
+        * Standalone months forms for %OB
+        */
+       {
+               "January", "February", "March", "April", "May", "June",
+               "July", "August", "September", "October", "November", "December"
+       },
+
+       /* md_order
+        * Month / day order in dates
+        */
+       "md",
+
+       /* ampm_fmt
+        * To determine 12-hour clock format time (empty, if N/A)
+        */
+       "%I:%M:%S %p"
+};
+
+extern "C" struct lc_time_T *
+__get_current_time_locale(void)
+{
+#ifdef __CYGWIN__
+       return (struct lc_time_T *)&_C_time_locale;
+#else
+       return (_time_using_locale
+               ? &_time_locale
+               : (struct lc_time_T *)&_C_time_locale);
+#endif
+}
+
+#ifndef __CYGWIN__
+extern "C" int
+__time_load_locale(const char *name)
+{
+       return (__part_load_locale(name, &_time_using_locale,
+                       &time_locale_buf, "LC_TIME",
+                       LCTIME_SIZE, LCTIME_SIZE,
+                       (const char **)&_time_locale));
+}
+#endif
diff --git a/winsup/cygwin/libc/timelocal.h b/winsup/cygwin/libc/timelocal.h
new file mode 100644 (file)
index 0000000..e7d5152
--- /dev/null
@@ -0,0 +1,65 @@
+/*-
+ * Copyright (c) 1997-2002 FreeBSD Project.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD: /repoman/r/ncvs/src/lib/libc/stdtime/timelocal.h,v 1.11 2002/01/24 15:07:44 phantom Exp $
+ */
+
+#ifndef _TIMELOCAL_H_
+#define        _TIMELOCAL_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * Private header file for the strftime and strptime localization
+ * stuff.
+ */
+struct lc_time_T {
+       const char      *mon[12];
+       const char      *month[12];
+       const char      *wday[7];
+       const char      *weekday[7];
+       const char      *X_fmt;
+       const char      *x_fmt;
+       const char      *c_fmt;
+       const char      *am;
+       const char      *pm;
+       const char      *date_fmt;
+       const char      *alt_month[12];
+       const char      *md_order;
+       const char      *ampm_fmt;
+};
+
+struct lc_time_T *__get_current_time_locale(void);
+#ifndef __CYGWIN__
+int    __time_load_locale(const char *);
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* !_TIMELOCAL_H_ */
index 58c96c0e6c3e694f7a8e7defe6f95620c5370e43..b8b1a6013a28f6d8fd0425f4c864b0feaa2ff05e 100644 (file)
@@ -7,6 +7,7 @@
 #include "winsup.h"
 #include "cygerrno.h"
 #include <windows.h>
+#define STD_INSPIRED
 #define lint
 
 #define USG_COMPAT
This page took 0.0585 seconds and 5 git commands to generate.