libical r640 - in trunk: . src/libical

[jedywang svn gnome org]

Author: jedywang
Date: Mon Mar 17 03:59:19 2008
New Revision: 640
URL: http://svn.gnome.org/viewvc/libical?rev=640&view=rev

Log:
2008-03-17  Wang Xin  <jedy wang sun com>

	Fixes #520253

	* src/libical/icaltimezone.c: Handle WET, MET and EET timezones
	in zone_sun.tab on Solaris.



Modified:
   trunk/ChangeLog
   trunk/src/libical/icaltimezone.c

Modified: trunk/src/libical/icaltimezone.c
==============================================================================
--- trunk/src/libical/icaltimezone.c	(original)
+++ trunk/src/libical/icaltimezone.c	Mon Mar 17 03:59:19 2008
@@ -1567,7 +1567,21 @@
 	len = sptr - loc;
 	location = strncpy (location, loc, len);
 	location [len] = '\0';
-	
+
+#if defined(sun) && defined(__SVR4)
+    /* Handle EET, MET and WET in zone_sun.tab. */
+    if (!strcmp (location, "Europe/")) {
+        while (*sptr != '\t')
+            sptr++;
+        loc = ++sptr;
+        while (!isspace (*sptr))
+            sptr++;
+        len = sptr - loc;
+        location = strncpy (location, loc, len);
+        location [len] = '\0';
+    }
+#endif
+
 	lon = lat + 1;
 	while (*lon != '+' && *lon != '-')
 		lon++;