Add locale support for selecting timezones from C armsys.c

  Ammended time() to match ISO9899 and just return UTC like it says.
  Inlined the single use of _bbctime() macro.
locale.c
  The timezone within a territory can now be specified as part of the setlocale() function.
  This uses a qualifier to the already accepted territory name, for an example see test/tzones.c
  Shock addition of some comments to the locale parsing function.
  To avoid needing to mess about with C library workspace the timezone and territory are encoded internally into 1 word, with 10 bits allowing up to 1024 territories worldwide.
  Ripple through to strftime().
time.c
  localtime() updated to respect locale selection.
test/file,gen_inputs,test64
  Copyright headers added.

Output compared with Windows XP using setlocale versus tzset to shift the program into Pacific time.

Version 5.68. Tagged as 'RISC_OSLib-5_68'

VersionASM

@@ -11,13 +11,13 @@
                         GBLS    Module_HelpVersion
                         GBLS    Module_ComponentName
                         GBLS    Module_ComponentPath
-Module_MajorVersion     SETS    "5.67"
-Module_Version          SETA    567
+Module_MajorVersion     SETS    "5.68"
+Module_Version          SETA    568
 Module_MinorVersion     SETS    ""
-Module_Date             SETS    "16 Feb 2012"
-Module_ApplicationDate  SETS    "16-Feb-12"
+Module_Date             SETS    "28 May 2012"
+Module_ApplicationDate  SETS    "28-May-12"
 Module_ComponentName    SETS    "RISC_OSLib"
 Module_ComponentPath    SETS    "castle/RiscOS/Sources/Lib/RISC_OSLib"
-Module_FullVersion      SETS    "5.67"
-Module_HelpVersion      SETS    "5.67 (16 Feb 2012)"
+Module_FullVersion      SETS    "5.68"
+Module_HelpVersion      SETS    "5.68 (28 May 2012)"
                         END

VersionNum

-/* (5.67)
+/* (5.68)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  * Last processed by srccommit version: 1.1.
  *
  */
-#define Module_MajorVersion_CMHG        5.67
+#define Module_MajorVersion_CMHG        5.68
 #define Module_MinorVersion_CMHG        
-#define Module_Date_CMHG                16 Feb 2012
+#define Module_Date_CMHG                28 May 2012
 
-#define Module_MajorVersion             "5.67"
-#define Module_Version                  567
+#define Module_MajorVersion             "5.68"
+#define Module_Version                  568
 #define Module_MinorVersion             ""
-#define Module_Date                     "16 Feb 2012"
+#define Module_Date                     "28 May 2012"
 
-#define Module_ApplicationDate          "16-Feb-12"
+#define Module_ApplicationDate          "28-May-12"
 
 #define Module_ComponentName            "RISC_OSLib"
 #define Module_ComponentPath            "castle/RiscOS/Sources/Lib/RISC_OSLib"
 
-#define Module_FullVersion              "5.67"
-#define Module_HelpVersion              "5.67 (16 Feb 2012)"
-#define Module_LibraryVersionInfo       "5:67"
+#define Module_FullVersion              "5.68"
+#define Module_HelpVersion              "5.68 (28 May 2012)"
+#define Module_LibraryVersionInfo       "5:68"

c/armsys

@@ -77,13 +77,11 @@ static int unused[3];
 
 struct bbctime {unsigned int l,h;};
 
-#define _bbctime(bt) _kernel_osword(1, (int *)(bt))
-
 static clock_t _time0;
 
 static clock_t _clock(void)
 {   struct bbctime bt;
-    _bbctime(&bt);
+    _kernel_osword(1, (int *)&bt);
     return bt.l;
 }
 
@@ -102,47 +100,37 @@ clock_t clock(void)
 {   return _clock() - _time0;     /* clock runs even if date not set */
 }
 
-#define unbcd(a) (((a) & 0xf) + 10 * (((a)>>4) & 0xf))
-
 time_t time(time_t *timer)
-/* this version gives the UNIX result of secs since 1-Jan-1970 */
-{ time_t result;
-  /*int mctype;*/
-  struct bbctime bt, w, w2;
-  unsigned v;
-  _kernel_swi_regs r;
-
-  bt.l = 3;                 /* 'request time' arg */
-  _kernel_osword(14, (int *)&bt); /* read timer as 5 byte integer  */
-  /* OS_Byte 0, 1 returns 6!!! so must look up Utility Module
-   * version no. to find version of kernel.
-   */
-  v = 0;          /* Default to UTC if read timezone fails */
-  if (!_kernel_swi(Territory_ReadCurrentTimeZone, &r, &r))
-      v = r.r[1]; /* Offset from UTC to current TZ in cs */
-  bt.l += v;      /* Unsigned addition */
-  if (bt.l < v)   /* Carry == NOT Borrow */
-      bt.h++;
-  if (v & (1u << 31))
-      bt.h--;     /* Sign extend */
-/* to two 3-byte things - for divide */
-  w.h = ((bt.h & 255) << 8) | (bt.l >> 24);
-  w.l = bt.l & 0xffffff;
-/* turn csecs to secs */
-  w2.h = w.h / 100;
-  w2.l = ((w.h % 100 << 24) | w.l) / 100;
-/* back to 8 byte binary */
-  bt.h = w2.h >> 8;
-  bt.l = (w2.h << 24) | w2.l;
-/* normalise to Jan70 instead of Jan00... */
+{
+    /* ISO9899 7.23.1 (1) defines either 'calendar time' or 'local time'           */
+    /* Local time is further defined as incorporating timezone and daylight saving */
+    /* information, therefore calendar time is implicitly taken to mean UTC.       */
+    /* ISO9899 7.23.2.4 (3) this function determines the calendar time.            */
+    /* This implementation uses seconds since the UNIX epoch 01-Jan-1970.          */
+    time_t result;
+    struct bbctime bt, w, w2;
+
+    bt.l = 3;                       /* 'request time' arg */
+    _kernel_osword(14, (int *)&bt); /* read time as UTC 5 byte integer  */
+
+    /* to two 3-byte things - for divide */
+    w.h = ((bt.h & 255) << 8) | (bt.l >> 24);
+    w.l = bt.l & 0xffffff;
+    /* turn csecs to secs */
+    w2.h = w.h / 100;
+    w2.l = ((w.h % 100 << 24) | w.l) / 100;
+    /* back to 8 byte binary */
+    bt.h = w2.h >> 8;
+    bt.l = (w2.h << 24) | w2.l;
+    /* normalise to Jan70 instead of Jan00... */
 #define secs0070 (((unsigned)86400)*(365*70+17))  /* less than 2^32 */
-  if (bt.l < secs0070) bt.h--;
-  bt.l -= secs0070;
-/* if high word is non-zero then date is unset/out of unix range... */
-  result = bt.h ? -1 : bt.l;
+    if (bt.l < secs0070) bt.h--;
+    bt.l -= secs0070;
+    /* if high word is non-zero then date is unset/out of unix range... */
+    result = bt.h ? -1 : bt.l;
 
-  if (timer) *timer = result;
-  return result;
+    if (timer) *timer = result;
+    return result;
 }
 
 /* system dependent I/O routines ... */

c/locale

@@ -44,12 +44,12 @@
 #define N_LC_MONETARY 2
 #define N_LC_NUMERIC  3
 #define N_LC_TIME     4
-#define N_LC_ALL      5
+#define N_LC_MAX      5
 
 extern int _sprintf_lf(char *buff, const char *fmt, ...);
 
-extern int __locales[5];
-int __locales[5] = {0, 0, 0, 0, 0};
+extern int __locales[N_LC_MAX];
+int __locales[N_LC_MAX] = {0, 0, 0, 0, 0};
 
 /* lc initialised to C for default */
 static struct lconv lc =
@@ -152,16 +152,16 @@ static void setlconv(int category, int *values)
 char *setlocale(int category, const char *locale)
 {
     static char lc_str[LC_STR_SIZE];
-    int tmp_locales[5] = {0, 0, 0, 0, 0};
+    int tmp_locales[N_LC_MAX] = {0, 0, 0, 0, 0};
     _kernel_swi_regs r;
     char *s;
-    int i, n;
+    int i, n, tz;
 
     /* I expect the category to be a bit-map - complain if out of range  */
     if (((unsigned)category > LC_ALL) || (category == 0))
       /* no can do... */
       return NULL;
-    if (locale == 0) {
+    if (locale == NULL) {
       /* get locale */
       _sprintf_lf(lc_str, "=%d,%d,%d,%d,%d",
                   __locales[0], __locales[1], __locales[2], __locales[3], __locales[4]);
@@ -171,8 +171,9 @@ char *setlocale(int category, const char *locale)
       if (strcmp(locale, "ISO8859-1") == 0)
         locale = "UK";
       if (*locale == '=') {
+        /* ISO9899 7.11.1.1 Parse the string as given by get locale */
         s = (char *)(locale + 1);
-        for (i = 0; i < 5; i++) {
+        for (i = 0; i < N_LC_MAX; i++) {
             n = 0;
             while (*s >= '0' && *s <= '9') {
                 n = n * 10 + *s - '0';
@@ -183,23 +184,52 @@ char *setlocale(int category, const char *locale)
         }
       } else {
         if (*locale == 0 || strcmp(locale, "C") == 0) {
-          n = 0;
-          if (!*locale && !_kernel_swi(Territory_Number, &r, &r)) {
+          /* ISO9899 7.11.1.1 Use "" for current locale, "C" for minimal locale */
+          n = 0; tz = 0;
+          if (!*locale && (_kernel_swi(Territory_Number, &r, &r) == NULL)) {
             n = r.r[0];
             r.r[1] = (int)lc_str;
             r.r[2] = LC_STR_SIZE;
-            if (!_kernel_swi(Territory_NumberToName, &r, &r))
+            if (_kernel_swi(Territory_NumberToName, &r, &r) == NULL)
               locale = lc_str;
           }
         } else {
-          r.r[0] = TERRITORY_UK;
-          r.r[1] = (int)locale;
-          if (_kernel_swi(Territory_NameToNumber, &r, &r) || r.r[0] == 0)
-            return NULL;
-          n = r.r[0];
+          /* Platform specific, permit the territory name and (optional) standard timezone */
+          strncpy(lc_str, locale, LC_STR_SIZE - 1);
+          s = strchr(lc_str, '/'); /* eg. "USA/PST" */
+          if (s != NULL) *s = 0;
+          r.r[0] = TERRITORY_UK;   /* Names must be in english */
+          r.r[1] = (int)lc_str;
+          if ((_kernel_swi(Territory_NameToNumber, &r, &r) != NULL) || (r.r[0] == 0))
+            return NULL;           /* Don't know that name */
+          n = r.r[0]; tz = 0;
+          if (_kernel_swi(Territory_WriteDirection, &r, &r) != NULL)
+            return NULL;           /* Check it's loaded (avoids Territory_Exists Z flag faff) */
+          if (s != NULL) {
+            locale = lc_str;       /* eg. "USA" */
+            s++;                   /* eg. "PST" */
+            if (*s) {              /* Null timezone taken as 0th */
+              while (1) {
+                r.r[0] = n;
+                r.r[1] = tz;
+                r.r[4] = (int)TERRITORY_TZ_API_EXT;
+                if (_kernel_swi(Territory_ReadTimeZones, &r, &r) != NULL)
+                  return NULL;     /* No more timezones to match */
+                if (strcmp((char *)r.r[0], s) == 0)
+                  break;           /* Exact match */
+                if (r.r[4])
+                  break;           /* Extended API not supported, use 0th */
+                tz++;
+              }
+            }
+          }
+        }
+        for (i = 0; i < N_LC_MAX; i++) {
+          if (i == N_LC_TIME)
+            tmp_locales[i] = TERRITORY_ENCODE(n, tz); /* Packed format */
+          else
+            tmp_locales[i] = n;
         }
-        for (i = 0; i < 5; i++)
-          tmp_locales[i] = n;
       }
       setlocales(category, tmp_locales);
       setlconv(category, tmp_locales);
@@ -233,9 +263,17 @@ static int findweek(int yday, int startday, int today)
 static char *getterritorytimeinfo(int territory, const struct tm *tt, char *fmt, char *buff, int swi)
 {
     _kernel_swi_regs r;
-    int tm_block[7];
-    char utc_block[5];
-
+    int  tm_block[7];
+    long long utc_block;
+
+    /* The tm struct came from either gmtime() or localtime() and therefore already     */
+    /* has any timezone and daylight saving applied to it as implied by the choice of   */
+    /* the 2 functions called. Therefore it needs converting as though it's UTC         */
+    /* already. Note that Territory_ConvertOrdinalsToTime applies its own correction    */
+    /* based on the active territory (not necessarily the same as the locale set for    */
+    /* our client) and since there isn't a UTC equivalent of that SWI until             */
+    /* Territory_ConvertTimeFormats comes along (which might not be available on the    */
+    /* host OS) we must do the opposite correction to the calculated time. Sigh.        */
     tm_block[0] = 0;
     tm_block[1] = tt->tm_sec;
     tm_block[2] = tt->tm_min;
@@ -244,16 +282,21 @@ static char *getterritorytimeinfo(int territory, const struct tm *tt, char *fmt,
     tm_block[5] = tt->tm_mon + 1;
     tm_block[6] = tt->tm_year + 1900;
     r.r[0] = TERRITORY_UK;
-    r.r[1] = (int)utc_block;
+    r.r[1] = (int)&utc_block;
     r.r[2] = (int)tm_block;
-    if (_kernel_swi(Territory_ConvertOrdinalsToTime, &r, &r))
+    if (_kernel_swi(Territory_ConvertOrdinalsToTime, &r, &r) != NULL)
         return "???";
-    r.r[0] = territory;
-    r.r[1] = (int)utc_block;
+    if (_kernel_swi(Territory_ReadCurrentTimeZone, &r, &r) != NULL)
+        return "???";
+    utc_block = utc_block + r.r[1];
+
+    r.r[0] = TERRITORY_EXTRACT(territory);
+    r.r[1] = (int)&utc_block;
     r.r[2] = (int)buff;
-    r.r[3] = CDT_BUFFSIZE;
+    r.r[3] = CDT_BUFFSIZE | (1<<30) | (1<<31); /* No DST, R5 cs offset */
     r.r[4] = (int)fmt;
-    if (_kernel_swi(swi, &r, &r))
+    r.r[5] = 0;
+    if (_kernel_swi(swi, &r, &r) != NULL)
         return "???";
     return buff;
 }
@@ -265,30 +308,39 @@ static char *gettimeinfo(int territory, const struct tm *tt, char *fmt, char *bu
 
 static char *gettimedate(int territory, const struct tm *tt, char *buff, int swi)
 {
-    return getterritorytimeinfo(territory, tt, "", buff, swi);
+    return getterritorytimeinfo(territory, tt, NULL, buff, swi);
 }
 
-static char *gettimezone(int territory, char *buff)
+static char *gettimezone(int territory, const struct tm *tt, char *buff, int numeric)
 {
     _kernel_swi_regs r;
-    int dst, offset;
-    r.r[0] = 161;
-    dst = _kernel_osbyte(161, 220, 0);
-    if (dst < 0) return "";
-    r.r[0] = territory;
-    if (_kernel_swi(Territory_ReadTimeZones, &r, &r))
-        return "";
-    offset = dst & 0x8000 ? r.r[3] : r.r[2];
-    if (offset < 0)
-       offset = -offset, buff[0] = '-';
+
+    if (tt->tm_isdst < 0)
+        return ""; /* Undetermined */
+    r.r[0] = TERRITORY_EXTRACT(territory);
+    r.r[1] = TERRITORY_TZ_EXTRACT(territory);
+    r.r[4] = (int)TERRITORY_TZ_API_EXT;
+    if (_kernel_swi(Territory_ReadTimeZones, &r, &r) != NULL)
+        return ""; /* Undetermined */
+    if (numeric)
+    {
+        int offset = tt->tm_isdst ? r.r[3] : r.r[2];
+
+        if (offset < 0)
+            offset = -offset, buff[0] = '-';
+        else
+            buff[0] = '+';
+        offset = (offset + 3000) / 6000; /* centiseconds -> minutes */
+        sprintf(buff+1, "%.2d%.2d", offset / 60, offset % 60);
+    }
     else
-       buff[0] = '+';
-    offset = (offset + 3000) / 6000; /* centiseconds -> minutes */
-    sprintf(buff+1, "%.2d%.2d", offset / 60, offset % 60);
+    {
+        strcpy(buff, tt->tm_isdst ? (char *)r.r[1] : (char *)r.r[0]);
+    }
     return buff;
 }
 
-static int daysinyear(int year)
+static int getdaysinyear(int year)
 {
     if (year % 4 != 0) return 365;
     if (year % 100 != 0) return 366;
@@ -308,9 +360,9 @@ static void getiso8601week(char *buff, int spec, int year, int wday, int yday)
         if (week == 0)
         {
             /* This week belongs to last year - go round again */
-            start_of_week += daysinyear(--year);
+            start_of_week += getdaysinyear(--year);
         }
-        else if (week == 53 && start_of_week >= daysinyear(year)-3)
+        else if (week == 53 && start_of_week >= getdaysinyear(year)-3)
         {
             /* <=3 days of week 53 fall in this year, so we treat it as week 1 of next year */
             week = 1;
@@ -356,37 +408,38 @@ size_t strftime(char *s, size_t maxsize, const char *fmt, const struct tm *tt)
                 fmt--;
                 continue;
         case 'a':
-                ss = abbrweek[tt->tm_wday];
                 if (territory)
                     ss = gettimeinfo(territory, tt, "%W3", buff);
+                else
+                    ss = abbrweek[tt->tm_wday];
                 break;
         case 'A':
-                ss = fullweek[tt->tm_wday];
                 if (territory)
                     ss = gettimeinfo(territory, tt, "%WE", buff);
+                else
+                    ss = fullweek[tt->tm_wday];
                 break;
         case 'b': case 'h':
-                ss = abbrmonth[tt->tm_mon];
                 if (territory)
                     ss = gettimeinfo(territory, tt, "%M3", buff);
+                else
+                    ss = abbrmonth[tt->tm_mon];
                 break;
         case 'B':
-                ss = fullmonth[tt->tm_mon];
                 if (territory)
                     ss = gettimeinfo(territory, tt, "%MO", buff);
+                else
+                    ss = fullmonth[tt->tm_mon];
                 break;
         case 'c':
-                /* Format for "C" locale changed as per C99 */
-                if (!territory)
+                if (territory)
+                    ss = gettimedate(territory, tt, ss, Territory_ConvertStandardDateAndTime);
+                else
+                    /* Format for "C" locale changed as per C99 "%a %b %e %T %Y" */
                     sprintf(ss, "%s %s %2d %.2d:%.2d:%.2d %d",
                                 tt->tm_wday < 7U ? abbrweek[tt->tm_wday] : "???",
                                 abbrmonth[tt->tm_mon], tt->tm_mday,
                                 tt->tm_hour, tt->tm_min, tt->tm_sec, tt->tm_year + 1900);
-                    /*sprintf(ss, "%02d %s %d %02d:%02d:%02d",
-                        tt->tm_mday, abbrmonth[tt->tm_mon], tt->tm_year + 1900,
-                        tt->tm_hour, tt->tm_min, tt->tm_sec);*/
-                else
-                    ss = gettimedate(territory, tt, ss, Territory_ConvertStandardDateAndTime);
                 break;
         case 'C':
                 sprintf(ss, "%.2d", (tt->tm_year + 1900) / 100);
@@ -426,17 +479,18 @@ size_t strftime(char *s, size_t maxsize, const char *fmt, const struct tm *tt)
                 break;
         case 'p':
 /* I am worried here re 12.00 AM/PM and times near same.                 */
-                ss = ampmname[tt->tm_hour >= 12];
                 if (territory)
                     ss = gettimeinfo(territory, tt, "%AM", buff);
+                else
+                    ss = ampmname[tt->tm_hour >= 12];
                 break;
         case 'r':
-                if (!territory)
+                if (territory)
+                    ss = gettimeinfo(territory, tt, "%12:%MI:%SE %AM", buff);
+                else
                     sprintf(ss, "%.2d:%.2d:%.2d %s",
                             (tt->tm_hour + 11) % 12 + 1, tt->tm_min, tt->tm_sec,
                             ampmname[tt->tm_hour >= 12]);
-                else
-                    ss = gettimeinfo(territory, tt, "%12:%MI:%SE %AM", buff);
                 break;
         case 'R':
                 sprintf(ss, "%.2d:%.2d", tt->tm_hour, tt->tm_min);
@@ -463,21 +517,19 @@ size_t strftime(char *s, size_t maxsize, const char *fmt, const struct tm *tt)
                 sprintf(ss, "%.2d", findweek(tt->tm_yday, 1, tt->tm_wday));
                 break;
         case 'x':
-/* The next two had better agree with %c conversions                     */
-                /* Format for "C" locale changed as per C99 */
-                if (!territory)
-                    /*sprintf(ss, "%02d %s %d",
-                            tt->tm_mday, abbrmonth[tt->tm_mon], tt->tm_year + 1900);*/
-                    sprintf(ss, "%.2d/%.2d/%.2d", tt->tm_mon + 1, tt->tm_mday, tt->tm_year % 100);
-                else
+                if (territory)
                     ss = gettimedate(territory, tt, ss, Territory_ConvertStandardDate);
+                else
+                    /* Format for "C" locale changed as per C99 */
+                    sprintf(ss, "%.2d/%.2d/%.2d",
+                            tt->tm_mon + 1, tt->tm_mday, tt->tm_year % 100);
                 break;
         case 'X':
-                if (!territory)
+                if (territory)
+                    ss = gettimedate(territory, tt, ss, Territory_ConvertStandardTime);
+                else
                     sprintf(ss, "%.2d:%.2d:%.2d",
                             tt->tm_hour, tt->tm_min, tt->tm_sec);
-                else
-                    ss = gettimedate(territory, tt, ss, Territory_ConvertStandardTime);
                 break;
         case 'y':
                 sprintf(ss, "%.2d", tt->tm_year % 100);
@@ -485,16 +537,11 @@ size_t strftime(char *s, size_t maxsize, const char *fmt, const struct tm *tt)
         case 'Y':
                 sprintf(ss, "%d", tt->tm_year + 1900);
                 break;
-        case 'z':
-                ss = "";
-                if (territory)
-                    ss = gettimezone(territory, buff);
-                break;
-        case 'Z':
-                /* No timezone exists here */
-                ss = "";
+        case 'z': case 'Z':
                 if (territory)
-                    ss = gettimeinfo(territory, tt, "%TZ", buff);
+                    ss = gettimezone(territory, tt, buff, c == 'z');
+                else
+                    ss = "";
                 break;
         case '%':
                 push('%');

c/time

@@ -42,7 +42,7 @@ extern int __locales[5];
 /* seconds since 1 Jan 1970.                                              */
 /* clock() returns an unsigned int with ticks of cpu time.                */
 
-/* N.B. clock() and time() are defined in opsys.c                         */
+/* N.B. clock() and time() are defined in armsys.c                        */
 
 static int monlen[13] = { 31,29,31,30,31,30,31,31,30,31,30,31,0x40000000 };
 
@@ -192,7 +192,7 @@ static struct tm *time_to_tm(struct tm *_tms, time_t t, int dst)
     while (t >= monlen[i]) t -= monlen[i++];
     _tms->tm_mday = t+1;
     _tms->tm_mon = i;
-    _tms->tm_isdst = dst;                  /* unavailable */
+    _tms->tm_isdst = dst;
     return _tms;
 }
 
@@ -200,26 +200,15 @@ struct tm *gmtime(const time_t *timer)
 {
     static struct tm _tms;
     time_t t;
-    int territory, dst;
-    int v;
-    _kernel_swi_regs r;
 
     t = *timer;
-    territory = __locales[N_LC_TIME];
-    if (!territory)
-        territory = -1;
-    /* Read CMOS Ram for DST flag in bit 7 of loc 0xdc */
-    v = _kernel_osbyte(161, 0xdc, 0);
-    dst = v & (1 << 15);
-    r.r[0] = territory;
-    _kernel_swi(Territory_ReadTimeZones, &r, &r);
-    t -= (dst ? r.r[3] : r.r[2]) / 100;
     if (t == (time_t)-1) {
         memset(&_tms, 0, sizeof(_tms));
-        _tms.tm_mday = 1;
+        _tms.tm_mday = 1; /* 1st day of 1900 */
         return &_tms;
     }
-    return time_to_tm(&_tms, t, 0); /* No DST component */
+
+    return time_to_tm(&_tms, t, 0); /* Gregorian calendar, no DST */
 }
 
 struct tm *localtime(const time_t *timer)
@@ -227,59 +216,38 @@ struct tm *localtime(const time_t *timer)
     time_t t;
     static struct tm _tms;
     int dst;
-    int ordblock[9];
-    unsigned bt[2];
     int territory;
-    int i, v;
+    int v;
     _kernel_swi_regs r;
 
-/* treat unset dates as 1-Jan-1900 - any better ideas? */
     t = *timer;
     if (t == (time_t)-1) {
         memset(&_tms, 0, sizeof(_tms));
-        _tms.tm_mday = 1;
+        _tms.tm_mday = 1; /* 1st day of 1900 */
         return &_tms;
     }
-    territory = __locales[N_LC_TIME];
-    if (!territory)        /* If C locale use current configured territory */
-        territory = -1;
+
+    /* Read CMOS for DST flag in bit 7 */
     dst = -1;
-    /* Read CMOS Ram for DST flag in bit 7 of loc 0xdc */
-    v = _kernel_osbyte(161, 0xdc, 0);
+    v = _kernel_osbyte(161, 220 /* AlarmAndTimeCMOS */, 0);
     if (v >= 0)
-        dst = ((v >> 8) >> 7) & 1;
-    r.r[0] = territory;
-    if (!_kernel_swi(Territory_ReadTimeZones, &r, &r)) {
-        v = r.r[2];
-        if (dst) v = r.r[3];
-        t -= v / 100;
-    }
-    bt[0] = 0;
-    bt[1] = 0;
-#define secs0070 (((unsigned)86400)*(365*70+17))  /* less than 2^32 */
-    for (i = 0; i < 100; i++) {
-        bt[0] += t;
-        if (bt[0] < (unsigned)t)
-            bt[1]++;
-        bt[0] += secs0070;
-        if (bt[0] < (unsigned)secs0070)
-            bt[1]++;
+        dst = dst & 0x8000;
+
+    territory = __locales[N_LC_TIME];
+    if (!territory) {
+        r.r[0] = -1; /* If C locale use current configured territory */
+    } else {
+        r.r[0] = TERRITORY_EXTRACT(territory);
+        r.r[1] = TERRITORY_TZ_EXTRACT(territory);
+        r.r[4] = TERRITORY_TZ_API_EXT; /* If not supported, never mind */
     }
-    r.r[0] = territory;
-    r.r[1] = (int)bt;
-    r.r[2] = (int)ordblock;
-    if (!_kernel_swi(Territory_ConvertTimeToOrdinals, &r, &r)) {
-        _tms.tm_sec = ordblock[1];
-        _tms.tm_min = ordblock[2];
-        _tms.tm_hour = ordblock[3];
-        _tms.tm_mday = ordblock[4];
-        _tms.tm_mon = ordblock[5] - 1;
-        _tms.tm_year = ordblock[6] - 1900;
-        _tms.tm_wday = ordblock[7] - 1;
-        _tms.tm_yday = ordblock[8] - 1;
-        _tms.tm_isdst = dst;
-        return &_tms;
+    if (_kernel_swi(Territory_ReadTimeZones, &r, &r) == NULL) {
+        v = (dst == 0x8000) ? r.r[3] : r.r[2];
+        t += v / 100; /* centiseconds -> seconds */
     }
+
+    /* Already corrected for locale, so just need to mangle it */
+    /* into a suitable structure                               */
     return time_to_tm(&_tms, t, dst);
 }
 

h/territory

@@ -14,7 +14,13 @@
  */
 /* Territory reason codes for use in C Library */
 
-#define TERRITORY_UK 1
+#define TERRITORY_UK                1
+#define TERRITORY_TZ_API_EXT        0x454E4F5AuL
+
+/* Packed locale integer which encodes the territory and timezone */
+#define TERRITORY_EXTRACT(loc)      ((loc) & 0x3FF)
+#define TERRITORY_TZ_EXTRACT(loc)   ((loc) >> 10)
+#define TERRITORY_ENCODE(terr,tz)   ((terr) | ((tz) << 10))
 
 #define TERRITORY_DECIMAL_POINT     0
 #define TERRITORY_THOUSANDS_SEP     1
@@ -43,5 +49,3 @@
 #define TERRITORY_PROPERTY_SPACE       5
 #define TERRITORY_PROPERTY_DIGIT       6
 #define TERRITORY_PROPERTY_XDIGIT      7
-
-#define Territory_TransformString 0x43061

test/c/file

+/* Copyright 2011 Castle Technology Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 /* Test harness for large file extensions
  * Intended for use in debug builds where the file size check in fopen_common()
  * has been disabled, and where OFF32_MAX has been reduced to 31

test/c/gen_inputs

+/* Copyright 2008 Castle Technology Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 // Generate test data for long long support
 // Run this on a known good C library
 

test/c/test64

-// Test long long support
+/* Copyright 2008 Castle Technology Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/* Test long long support */
 
 #include <stdio.h>
 #include <stdint.h>

test/c/tzones

+/* Copyright 2012 Castle Technology Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <locale.h>
+#include <stdio.h>
+#include <time.h>
+
+int main(void)
+{
+	const char *result;
+	time_t      now;
+	struct tm  *local;
+	struct tm  *utc;
+	char        buffer[256];
+
+#ifdef __CC_NORCROFT
+	/* Expect 1,1,1,1,1 */
+	result = setlocale(LC_ALL, "");
+	printf("Set locale to empty string => '%s'\n", result == NULL ? "NULL" : result);
+	if (result != NULL) printf("Locale read back %s\n", setlocale(LC_ALL, NULL));
+
+	/* Expect 0,0,0,0,0 */
+	result = setlocale(LC_ALL, "C");
+	printf("Set locale to 'C' => %s\n", result == NULL ? "NULL" : result);
+	if (result != NULL) printf("Locale read back %s\n", setlocale(LC_ALL, NULL));
+
+	/* Expect 17,17,17,17,17 if Canada1 is loaded */
+	result = setlocale(LC_ALL, "Canada1");
+	printf("Set locale to fr-ca => %s\n", result == NULL ? "NULL" : result);
+	if (result != NULL) printf("Locale read back %s\n", setlocale(LC_ALL, NULL));
+
+	/* Expect 17,17,17,17,5137 if Canada1 is loaded */
+	result = setlocale(LC_ALL, "Canada1/HNP");
+	printf("Set locale to fr-ca Pacific => %s\n", result == NULL ? "NULL" : result);
+	if (result != NULL) printf("Locale read back %s\n", setlocale(LC_ALL, NULL));
+#else
+	/* Probably on a Windows PC then, use rough equivalent tzset() */
+	putenv("TZ=PST8PDT");
+	tzset();
+#endif
+	/* Expect the UTC time now and Pacific standard time (UTC-0800)
+	 * remembering that if you run this with DST on it'll be UTC-0700
+	 */
+	now = time(NULL);
+
+	utc = gmtime(&now);
+	printf("Time at UTC              %d-%02d-%02d %02d:%02d:%02d\n",
+	        utc->tm_year + 1900, utc->tm_mon + 1, utc->tm_mday,
+	        utc->tm_hour, utc->tm_min, utc->tm_sec);
+
+	local = localtime(&now);
+	strftime(buffer, 256, "%x %X %z %Z", local);
+	printf("in this program's locale %s\n", buffer);
+
+	return 0;
+}