Changeset 833

Timestamp:

Oct 12, 2003, 6:42:46 PM (22 years ago)

Author:

zap

Message:

.

Location:

trunk/src/emx

Files:

• libonly.gmk (modified) (1 diff, 1 prop)
• src/emxomf/emxomf.c (modified) (1 diff, 1 prop)
• src/lib/time/tzset.c (modified) (1 diff, 1 prop)
• toolonly.gmk (modified) (2 diffs, 1 prop)

trunk/src/emx/libonly.gmk

@@ -3 +3 @@
 MAKEFILE := libonly.gmk
 GENRULES  = $.genrules-libonly.smak
-SUBMAK   := version.smak $(wildcard src/lib/*.smak) include/include.smak $(wildcard bsd/*/*.smak) $(wildcard gnu/*/*.smak)
+SUBMAK   := version.smak $(wildcard src/lib/*.smak) include/include.smak \
+  $(wildcard bsd/*/*.smak) $(wildcard gnu/*/*.smak)
 
 include Makefile

trunk/src/emx/src/emxomf/emxomf.c

@@ -3796 +3796 @@
           int calculated_page_size = page_size;
           if (calculated_page_size <= 0)
-            { /* For a better calculation we would need the file count. */
+            {
+              /* For a better calculation we would need the file count. */
               calculated_page_size = 16;
               if (!stat(src_fname, &s))
                 {
                   int cbPage = (s.st_size * 2) / 65536;
-                  while (calculated_page_size < cbPage)
+                  /* Don't allow page size larger than 32K since omflib
+                     won't allow that ... */
+                  while ((calculated_page_size < cbPage)
+                      && (calculated_page_size <= 16384))
                       calculated_page_size <<= 1;
                 }

trunk/src/emx/src/lib/time/tzset.c

@@ -87 +87 @@
 
   p = *pp;
-
-  /* Check the supposed timezone name for validity.
-     See ISO 9945-1, 8.1.1 for details. */
-  if (!(i = strcspn (p, ":,+-")))
-    return 0;
-
-  /* The timezone name is valid. */
+  i = 0;
+
+  /* Skip the characters making up base timezone name */
+  while ((p [i] >= 'A' && p [i] <= 'Z') || (p [i] >= 'a' && p [i] <= 'z'))
+    i++;
+
   *pp = p + i;
   if (i > __MAX_TZ_STANDARD_LEN)

trunk/src/emx/toolonly.gmk

@@ -3 +3 @@
 MAKEFILE := toolonly.gmk
 GENRULES  = $.genrules-toolonly.smak
-SUBMAK   := version.smak $(filter-out src/regexp/%, $(filter-out src/lib/%, $(wildcard src/*/*.smak))) \
+SUBMAK   := version.smak $(filter-out src/regexp/%, \
+        $(filter-out src/lib/%, $(wildcard src/*/*.smak))) \
         $(wildcard src/lib/moddef/*.smak) \
         $(wildcard src/lib/omflib/*.smak) \
@@ -9 +10 @@
 NO_LOCAL_HEADERS=1
 include Makefile
-