comparison libpurple/util.c @ 22896:8dadddab10ed

Fix purple_str_to_time() to not break the returned value when we have given it a string with a GMT offset (like a log filename). We were setting tm_isdst to 0 when we knew the offset. Apparently, mktime() said, "Umm, yes, it is DST." and fixed it by shifting the hour. The fix is to tell the C library (by setting tm_isdst to -1) that we're sure of the time, but not the DST status. Hopefully this doesn't break any other code path. Fixes #3550

22895:0bd86dae2734

			     (sscanf(c, "%02d%02d", &tzhrs, &tzmins) == 2 && (c = c + 4))))
			{
				tzoff = tzhrs*60*60 + tzmins*60;
				if (offset_positive)
					tzoff *= -1;
				/* We don't want the C library doing DST calculations
				 * if we know the UTC offset already. */
				t.tm_isdst = 0;
			}
			else if (utc)
			{
				static struct tm tmptm;
				time_t tmp;

			if (rest != NULL && *c != '\0')
				*rest = c;
		}
	}

	if (tm != NULL)
	{
		*tm = t;
		tm->tm_isdst = -1;
		mktime(tm);
	}

	retval = mktime(&t);
	if (tzoff != PURPLE_NO_TZ_OFF)
		retval += tzoff;

	if (tz_off != NULL)
		*tz_off = tzoff;

22896:8dadddab10ed

			     (sscanf(c, "%02d%02d", &tzhrs, &tzmins) == 2 && (c = c + 4))))
			{
				tzoff = tzhrs*60*60 + tzmins*60;
				if (offset_positive)
					tzoff *= -1;
			}
			else if (utc)
			{
				static struct tm tmptm;
				time_t tmp;

			if (rest != NULL && *c != '\0')
				*rest = c;
		}
	}

	retval = mktime(&t);

	if (tm != NULL)
		*tm = t;

	if (tzoff != PURPLE_NO_TZ_OFF)
		retval += tzoff;

	if (tz_off != NULL)
		*tz_off = tzoff;